From 67a0042c5f29e4bb0e0b82f6190f2bc51480b45c Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期二, 28 二月 2023 13:25:09 +0800
Subject: [PATCH] 工资绩效改版
---
zhengcaioa/Services/AdmBreakPrecedentService.cs | 92 ++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 89 insertions(+), 3 deletions(-)
diff --git a/zhengcaioa/Services/AdmBreakPrecedentService.cs b/zhengcaioa/Services/AdmBreakPrecedentService.cs
index 018ed71..5c96997 100644
--- a/zhengcaioa/Services/AdmBreakPrecedentService.cs
+++ b/zhengcaioa/Services/AdmBreakPrecedentService.cs
@@ -133,8 +133,8 @@
&& (string.IsNullOrWhiteSpace(searchEntity.DeptId) || bbb.DeptId == searchEntity.DeptId.Trim())
&& (string.IsNullOrWhiteSpace(searchEntity.UserName) || bbb.UserName.Contains(searchEntity.UserName.Trim()))
&& (string.IsNullOrWhiteSpace(searchEntity.BreakThing) || a.BreakThing.Contains(searchEntity.BreakThing.Trim()))
-
-
+ && (string.IsNullOrWhiteSpace(searchEntity.UserId) || a.UserId == searchEntity.UserId.Trim())
+
@@ -166,7 +166,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);
@@ -213,5 +213,91 @@
return result;
}
+
+
+ public ResultDataEntity<AdmAskGoodDTO> SearchByPagingGoods(AdmBreakPrecedentDTOSearch searchEntity)
+ {
+
+
+
+ ResultDataEntity<AdmAskGoodDTO> data = new ResultDataEntity<AdmAskGoodDTO>();
+ List<AdmAskGoodDTO> list = new List<AdmAskGoodDTO>();
+
+
+
+
+
+ DateTime BreakTimestart = DateTime.Now;
+ DateTime BreakTimeend = DateTime.Now;
+ if (!string.IsNullOrWhiteSpace(searchEntity.BreakTime))
+ {
+ string[] BreakTimes = searchEntity.BreakTime.Split("|");
+ DateTime.TryParse(BreakTimes[0], out BreakTimestart);
+ DateTime.TryParse(BreakTimes[1], out BreakTimeend);
+ BreakTimeend = BreakTimeend.AddDays(1);
+ }
+
+ ///AdmBreakPrecedents
+ var query = (from a in _context.AdmAskGoods
+
+
+
+
+
+ join b in _context.AdmGoodsManages
+ on a.GoodsId equals b.Id
+ into bsssss
+ from bbb in bsssss.DefaultIfEmpty()
+
+ join k in _context.PltUsers
+ on a.Creater equals k.Id
+ into ksssss
+ from kkk in ksssss.DefaultIfEmpty()
+
+ join c in _context.HrDepts
+ on kkk.DeptId equals c.Id
+ into csssss
+ from ccc in csssss.DefaultIfEmpty()
+
+
+
+ where a.RecStatus == "A" && a.ShenpiStatus == "A"
+ && (string.IsNullOrWhiteSpace(searchEntity.BreakTime) || (a.Createtime >= BreakTimestart && a.Createtime <= BreakTimeend))
+ && (string.IsNullOrWhiteSpace(searchEntity.Goods) || bbb.GoodsName.Contains(searchEntity.Goods.Trim()))
+ && (string.IsNullOrWhiteSpace(searchEntity.UserId) || a.Creater == searchEntity.UserId.Trim())
+
+
+
+
+
+ select new AdmAskGoodDTO
+ {
+ Id = a.Id,
+ Createtime = a.Createtime,
+ CreatetimeName = a.Createtime.ToString("yyyy-MM-dd"),
+ GoodsId = a.GoodsId,
+ GoodsName = bbb.GoodsName,
+ Shuliang = a.Shuliang,
+ ShuliangName = a.Shuliang.HasValue? a.Shuliang.Value.ToString("F2"):"0",
+
+
+
+ Creater = a.Creater,
+
+
+ RecStatus = a.RecStatus,
+ Modifier = a.Modifier,
+ Modifytime = a.Modifytime,
+ }
+ ).OrderByDescending(x => x.Createtime).ToList();
+
+
+
+ //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);
+ return data;
+ }
}
}
--
Gitblit v1.9.1