From 11e11a51839529b17f70927524e086e90adf692d Mon Sep 17 00:00:00 2001
From: LR-20210131IOQH\Administrator <jackcold@163.com>
Date: 星期二, 10 八月 2021 15:31:19 +0800
Subject: [PATCH] 工资核对修改
---
zhengcaioa/Services/AdmPieceCheckService.cs | 17 +++++++++++++++--
1 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/zhengcaioa/Services/AdmPieceCheckService.cs b/zhengcaioa/Services/AdmPieceCheckService.cs
index caddbfe..d6f3fca 100644
--- a/zhengcaioa/Services/AdmPieceCheckService.cs
+++ b/zhengcaioa/Services/AdmPieceCheckService.cs
@@ -136,7 +136,7 @@
from kkk in ksssss.DefaultIfEmpty()
join h in _context.HrDepts.Where(x => x.RecStatus == "A" && x.QiyongStatus == "A")
- on kkk.DeptId equals h.Id
+ on a.DeptId equals h.Id
into hsss
from hhh in hsss.DefaultIfEmpty()
@@ -160,7 +160,7 @@
where a.RecStatus == "A"
&& (string.IsNullOrWhiteSpace(searchEntity.WorkTime) || (a.WorkTime >= WorkTimestart && a.WorkTime <= WorkTimeend))
&& (string.IsNullOrWhiteSpace(searchEntity.PayType) || ccc.Pieceratetype == searchEntity.PayType.Trim())
- && (string.IsNullOrWhiteSpace(searchEntity.DeptId) || kkk.DeptId == searchEntity.DeptId.Trim())
+ && (string.IsNullOrWhiteSpace(searchEntity.DeptId) || a.DeptId == searchEntity.DeptId.Trim())
&& (string.IsNullOrWhiteSpace(searchEntity.UserName) || kkk.UserName.Contains(searchEntity.UserName.Trim()))
@@ -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