From 5e048a93c48244f2959a5b47ef9ba8b6dacbe527 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期五, 10 九月 2021 15:46:28 +0800
Subject: [PATCH] 提交
---
zhengcaioa/Services/AdmPieceCheckService.cs | 25 +++++++++++++++++++------
1 files changed, 19 insertions(+), 6 deletions(-)
diff --git a/zhengcaioa/Services/AdmPieceCheckService.cs b/zhengcaioa/Services/AdmPieceCheckService.cs
index caddbfe..3f3b384 100644
--- a/zhengcaioa/Services/AdmPieceCheckService.cs
+++ b/zhengcaioa/Services/AdmPieceCheckService.cs
@@ -47,7 +47,7 @@
updateproject.WorkPro = entity.WorkPro;
updateproject.Remark = entity.Remark;
updateproject.Gongzi = entity.Gongzi;
-
+ updateproject.Shuliang = entity.Shuliang;
updateproject.Remark = entity.Remark;
updateproject.RecStatus = entity.RecStatus;
@@ -130,13 +130,13 @@
- join k in _context.PltUsers.Where(x => x.RecStatus == "A" && x.Zhiwustatus == "A")
+ join k in _context.PltUsers.Where(x => x.RecStatus == "A")
on a.UserId equals k.Id
into ksssss
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()))
@@ -184,7 +184,7 @@
WorkProName = ccc.Project,
Gongzi = a.Gongzi ?? 0,
Remark = a.Remark,
-
+ Shuliang = a.Shuliang ?? 0,
Creater = a.Creater,
Createtime = a.Createtime,
@@ -197,7 +197,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);
@@ -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