From 15eb82df2d6ec539e9d4245bfe08d531e8eb6379 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期日, 27 四月 2025 14:33:26 +0800
Subject: [PATCH] 修改培训订单占多个座位
---
zhengcaioa/Services/AdmSigninService.cs | 40 ++++++++++++++++++++++++++++++++++++++--
1 files changed, 38 insertions(+), 2 deletions(-)
diff --git a/zhengcaioa/Services/AdmSigninService.cs b/zhengcaioa/Services/AdmSigninService.cs
index 8fed0f5..8ce3646 100644
--- a/zhengcaioa/Services/AdmSigninService.cs
+++ b/zhengcaioa/Services/AdmSigninService.cs
@@ -38,6 +38,12 @@
switch (signinType)
{
case 10:
+ if (signIn.MorningIn.HasValue)
+ {
+ resultEntity.Result = false;
+ resultEntity.Message = "宸茬粡鎵撲笂鍗堜笂鐝紝璇蜂笉瑕侀噸澶嶆墦鍗�";
+ return resultEntity;
+ }
signIn.MorningIn = DateTime.Now;
break;
case 11:
@@ -45,12 +51,24 @@
break;
case 20:
+ if (signIn.AfternoonIn.HasValue)
+ {
+ resultEntity.Result = false;
+ resultEntity.Message = "宸茬粡鎵撲笅鍗堜笂鐝崱锛岃涓嶈閲嶅鎵撳崱";
+ return resultEntity;
+ }
signIn.AfternoonIn = DateTime.Now;
break;
case 21:
signIn.AfternoonOut = DateTime.Now;
break;
case 30:
+ if (signIn.AfternoonIn.HasValue)
+ {
+ resultEntity.Result = false;
+ resultEntity.Message = "宸茬粡鎵撳姞鐝崱锛岃涓嶈閲嶅鎵撳崱";
+ return resultEntity;
+ }
signIn.OvertimeIn = DateTime.Now;
break;
case 31:
@@ -285,7 +303,7 @@
entity.Remark = admAsk.Remark;
entity.Lavetype = admAsk.Lavetype;
entity.StratTime = admAsk.StratTime;
- entity.EndTime = admAsk.StratTime;
+ entity.EndTime = admAsk.EndTime;
entity.Modifier = admAsk.Modifier;
entity.Modifytime = DateTime.Now;
}
@@ -330,7 +348,7 @@
entity.Remark = leaveOff.Remark;
entity.Lavetype = leaveOff.Lavetype;
entity.StratTime = leaveOff.StratTime;
- entity.EndTime = leaveOff.StratTime;
+ entity.EndTime = leaveOff.EndTime;
entity.Modifier = leaveOff.Modifier;
entity.Modifytime = DateTime.Now;
}
@@ -369,6 +387,15 @@
}
+ public List<AdmAskLeaveDTO> GetAskLeaveChongdie(string UserId, DateTime StratTime, DateTime EndTime)
+ {
+ List<AdmAskLeave> admAskLeaveDTOs = _context.AdmAskLeaves.Where(e => e.RecStatus == "A" && e.Creater == UserId && (( e.StratTime <= StratTime && e.EndTime > StratTime) || (e.StratTime < EndTime && e.EndTime >= EndTime) )).ToList();
+
+ List<AdmAskLeaveDTO> leaveDTOs = _mapper.Map<List<AdmAskLeaveDTO>>(admAskLeaveDTOs);
+ return leaveDTOs;
+
+ }
+
public List<AdmAskLeaveOffDTO> GetAskLeaveOffByUserId(string UserId)
{
List<AdmAskLeaveOff> admAskLeaveOffs = _context.AdmAskLeaveOffs.Where(e => e.RecStatus == "A" && e.ShenpiStatus == "A" && e.Creater == UserId).ToList();
@@ -378,6 +405,15 @@
}
+ public List<AdmAskLeaveOffDTO> GetAskLeaveOffChongdie(string UserId, DateTime StratTime, DateTime EndTime)
+ {
+ List<AdmAskLeaveOff> admAskLeaveOffs = _context.AdmAskLeaveOffs.Where(e => e.RecStatus == "A" && e.Creater == UserId && ((e.StratTime <= StratTime && e.EndTime > StratTime) || (e.StratTime < EndTime && e.EndTime >= EndTime))).ToList();
+
+ List<AdmAskLeaveOffDTO> leaveDTOs = _mapper.Map<List<AdmAskLeaveOffDTO>>(admAskLeaveOffs);
+ return leaveDTOs;
+
+ }
+
public AdmAskLeaveOffDTO GetAskLeaveOff(string Id)
{
AdmAskLeaveOff entity = _context.AdmAskLeaveOffs.Where(e => e.RecStatus == "A" && e.Id == Id ).FirstOrDefault();
--
Gitblit v1.9.1