From 3b9bf8c309d77d9817e973aa036e045695c78d70 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期一, 26 七月 2021 16:17:45 +0800
Subject: [PATCH] 今日开发 加班申请· 统计报表：没有任何工作的人，不显示。显示人员的 部门 职位 姓名 工作时间 在计算考勤的时候只有有加班申请的加班才算加班
---
zhengcaioa/Services/AdmBreakPrecedentService.cs | 15 ++++++++++++++-
1 files changed, 14 insertions(+), 1 deletions(-)
diff --git a/zhengcaioa/Services/AdmBreakPrecedentService.cs b/zhengcaioa/Services/AdmBreakPrecedentService.cs
index 5aa9b76..f0ce951 100644
--- a/zhengcaioa/Services/AdmBreakPrecedentService.cs
+++ b/zhengcaioa/Services/AdmBreakPrecedentService.cs
@@ -166,7 +166,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);
@@ -200,5 +200,18 @@
return result;
}
+
+ public List<AdmBreakPrecedentDTO> GetList(string userid, DateTime datemin, DateTime datemax)
+ {
+
+ var entity = _context.AdmBreakPrecedents.Where(x=>x.RecStatus=="A" && x.UserId == userid && x.BreakTime >= datemin && x.BreakTime < datemax);
+
+
+
+ var result = _mapper.Map<List<AdmBreakPrecedentDTO>>(entity);
+
+
+ return result;
+ }
}
}
--
Gitblit v1.9.1