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/CooperVisitService.cs | 19 ++++++++++++++++++-
1 files changed, 18 insertions(+), 1 deletions(-)
diff --git a/zhengcaioa/Services/CooperVisitService.cs b/zhengcaioa/Services/CooperVisitService.cs
index 6ecfc8c..c093088 100644
--- a/zhengcaioa/Services/CooperVisitService.cs
+++ b/zhengcaioa/Services/CooperVisitService.cs
@@ -192,7 +192,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);
@@ -248,5 +248,22 @@
return result;
}
+
+ public List<CooperVisitDTO> GetListsalary(string userid, DateTime datemin, DateTime datemax)
+ {
+
+
+ // var listCooperVisits = _context.CooperVisits.Where(r => id.Contains(r.Id) && r.RecStatus == "A").Select(x => x.Viscustomer).ToList();
+
+ var listCooperatecustomCustomers = _context.CooperVisits.Where(r => r.RecStatus == "A"&& r.Creater == userid && r.Vistime >= datemin && r.Vistime < datemax).ToList();
+
+ var result = _mapper.Map<List<CooperVisitDTO>>(listCooperatecustomCustomers);
+
+
+
+
+
+ return result;
+ }
}
}
--
Gitblit v1.9.1