From 072169e3c5446f94e2cf4e570e5c7952bb5b15b9 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期二, 27 七月 2021 14:47:44 +0800
Subject: [PATCH] 今日开发 考勤规则里增加 公司安排加班 调整请假时间计算 加班日考勤计算
---
zhengcaioa/Services/AdmPieceCheckService.cs | 19 ++++++++++++++++---
1 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/zhengcaioa/Services/AdmPieceCheckService.cs b/zhengcaioa/Services/AdmPieceCheckService.cs
index 963a1fc..a404d55 100644
--- a/zhengcaioa/Services/AdmPieceCheckService.cs
+++ b/zhengcaioa/Services/AdmPieceCheckService.cs
@@ -47,7 +47,7 @@
updateproject.WorkPro = entity.WorkPro;
updateproject.Remark = entity.Remark;
updateproject.Gongzi = entity.Gongzi;
-
+ updateproject.Shuliang = entity.Shuliang;
updateproject.Remark = entity.Remark;
updateproject.RecStatus = entity.RecStatus;
@@ -184,7 +184,7 @@
WorkProName = ccc.Project,
Gongzi = a.Gongzi ?? 0,
Remark = a.Remark,
-
+ Shuliang = a.Shuliang ?? 0,
Creater = a.Creater,
Createtime = a.Createtime,
@@ -197,7 +197,7 @@
- if (searchEntity.totalrows == 0)
+ //if (searchEntity.totalrows == 0)
searchEntity.totalrows = query.Count();
var lianlist = query.Skip((searchEntity.page - 1) * searchEntity.rows).Take(searchEntity.rows).ToList();
data.LoadData(searchEntity, lianlist);
@@ -231,5 +231,18 @@
return result;
}
+
+ public List<AdmPieceCheckDTO> GetList(string userid, DateTime datemin, DateTime datemax)
+ {
+
+ var entity = _context.AdmPieceChecks.Where(x=> x.RecStatus == "A" && x.UserId == userid && x.WorkTime >= datemin && x.WorkTime < datemax).ToList();
+
+
+
+ var result = _mapper.Map<List<AdmPieceCheckDTO>>(entity);
+
+
+ return result;
+ }
}
}
--
Gitblit v1.9.1