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/SimService.cs | 18 +++++++++++++++---
1 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/zhengcaioa/Services/SimService.cs b/zhengcaioa/Services/SimService.cs
index 674535e..4b49961 100644
--- a/zhengcaioa/Services/SimService.cs
+++ b/zhengcaioa/Services/SimService.cs
@@ -142,7 +142,7 @@
dt = dt.Where(c => !string.IsNullOrEmpty(c.username) && c.username.Contains(searchEntity.username)).ToList();
}
- if (searchEntity.totalrows == 0)
+ //if (searchEntity.totalrows == 0)
searchEntity.totalrows = dt.Count();
var signinList = dt.Skip((searchEntity.page - 1) * searchEntity.rows).Take(searchEntity.rows).ToList();
@@ -374,14 +374,26 @@
year = int.Parse(searchEntity.searchtime);
}
- var dt = (from c in _context.SimCostYearView where c.bill_year==year orderby c.sim select c).ToList();
+ var dt = (from c in _context.SimCostYearView where c.bill_year==year select c).ToList();
+ //娣诲姞鏈湁璁板綍鐨�
+ var stringId = dt.Select(c => c.sim_id).ToList();
+ var nolog = (from c in _context.SimBindView where !stringId.Contains(c.Id) select c).ToList();
+ foreach(var item in nolog)
+ {
+ SimCostYearView ss = new SimCostYearView();
+ ss.bill_year = year;
+ ss.sim_id = item.Id;
+ ss.sim = item.simcard;
+ dt.Add(ss);
+ }
+ dt = dt.OrderBy(c => c.sim).ToList();
if (!string.IsNullOrEmpty(searchEntity.searchsim))
{
dt = dt.Where(c => c.sim==searchEntity.searchsim).ToList();
}
- if (searchEntity.totalrows == 0)
+ //if (searchEntity.totalrows == 0)
searchEntity.totalrows = dt.Count();
var signinList = dt.Skip((searchEntity.page - 1) * searchEntity.rows).Take(searchEntity.rows).ToList();
--
Gitblit v1.9.1