From efad4f05e52c89f3b42774e313144abd039370e4 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期五, 10 二月 2023 11:26:06 +0800
Subject: [PATCH] 考勤怎么加带薪假的计算
---
zhengcaioa/Services/AdmAttendanceService.cs | 21 +++++++++++++++++++--
1 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/zhengcaioa/Services/AdmAttendanceService.cs b/zhengcaioa/Services/AdmAttendanceService.cs
index f5e84d7..58c498f 100644
--- a/zhengcaioa/Services/AdmAttendanceService.cs
+++ b/zhengcaioa/Services/AdmAttendanceService.cs
@@ -54,7 +54,7 @@
updatepltRole.Createtime = AdmAttendance.Createtime;
updatepltRole.Modifier = AdmAttendance.Modifier;
updatepltRole.Modifytime = AdmAttendance.Modifytime;
-
+ updatepltRole.Daixinjia = AdmAttendance.Daixinjia;
updatepltRole.Chidao = AdmAttendance.Chidao;
updatepltRole.Zaotui = AdmAttendance.Zaotui;
updatepltRole.Kuanggong = AdmAttendance.Kuanggong;
@@ -87,6 +87,19 @@
return AdmAttendanceDTO;
}
+ public AdmAttendanceDTO GetByUserAndDate(string userid, int year, int month)
+ {
+ var entity = _context.AdmAttendances.Where(x=>x.RecStatus=="A" && x.Userid == userid && x.Year == year && x.Month == month).FirstOrDefault();
+ AdmAttendanceDTO dto = null;
+ if (entity != null)
+ {
+ dto = _mapper.Map<AdmAttendanceDTO>(entity);
+ }
+
+ return dto;
+ }
+
+
public ResultDataEntity<AdmAttendanceDTO> SearchByPaging(AdmAttendanceDTOSearch searchEntity)
{
ResultDataEntity<AdmAttendanceDTO> data = new ResultDataEntity<AdmAttendanceDTO>();
@@ -105,6 +118,8 @@
&& (string.IsNullOrWhiteSpace(searchEntity.DeptId) || b.DeptId == searchEntity.DeptId.Trim())
&& (string.IsNullOrWhiteSpace(searchEntity.Userid) || b.DeptId == searchEntity.Userid.Trim())
&& (string.IsNullOrWhiteSpace(searchEntity.UserName) || b.UserName.Contains(searchEntity.UserName.Trim()))
+ && (string.IsNullOrWhiteSpace(searchEntity.YearMonth) || a.Year == DateTime.Parse(searchEntity.YearMonth.Trim()+"-01").Year)
+ && (string.IsNullOrWhiteSpace(searchEntity.YearMonth) || a.Month == DateTime.Parse(searchEntity.YearMonth.Trim() + "-01").Month)
select new AdmAttendanceDTO
{
Id = a.Id,
@@ -118,6 +133,7 @@
Shijichuqin = a.Shijichuqin,
Qingjia = a.Qingjia,
Jiaban = a.Jiaban,
+ Daixinjia = a.Daixinjia,
Xiaojia = a.Xiaojia,
Islock = a.Islock,
RecStatus = a.RecStatus,
@@ -137,7 +153,7 @@
- if (searchEntity.totalrows == 0)
+ //if (searchEntity.totalrows == 0)
searchEntity.totalrows = query.Count();
var rolelist = query.Skip((searchEntity.page - 1) * searchEntity.rows).Take(searchEntity.rows).ToList();
@@ -197,6 +213,7 @@
Shijichuqin = a.Shijichuqin,
Qingjia = a.Qingjia,
Jiaban = a.Jiaban,
+ Daixinjia = a.Daixinjia,
Xiaojia = a.Xiaojia,
Islock = a.Islock,
RecStatus = a.RecStatus,
--
Gitblit v1.9.1