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/CooperOrderService.cs | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/zhengcaioa/Services/CooperOrderService.cs b/zhengcaioa/Services/CooperOrderService.cs
index 3025329..eeb41f8 100644
--- a/zhengcaioa/Services/CooperOrderService.cs
+++ b/zhengcaioa/Services/CooperOrderService.cs
@@ -154,7 +154,7 @@
string[] XdTimes = searchEntity.XdTime.Split("|");
DateTime.TryParse(XdTimes[0], out XdTimestart);
DateTime.TryParse(XdTimes[1], out XdTimeend);
- //XdTimeend = XdTimeend.AddDays(1);
+ XdTimeend = XdTimeend.AddDays(1);
}
@@ -315,7 +315,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);
--
Gitblit v1.9.1