From 57556b16aafbafebc7f9fc86745ac2ea83e7616d Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期四, 01 七月 2021 14:26:35 +0800
Subject: [PATCH] 流程 请假 销假 待办 已办 我得申请
---
zhengcaioa/Services/IntentionCustomerService.cs | 44 +++++++++++++++++++++++++++++++++++++-------
1 files changed, 37 insertions(+), 7 deletions(-)
diff --git a/zhengcaioa/Services/IntentionCustomerService.cs b/zhengcaioa/Services/IntentionCustomerService.cs
index d935679..73e8090 100644
--- a/zhengcaioa/Services/IntentionCustomerService.cs
+++ b/zhengcaioa/Services/IntentionCustomerService.cs
@@ -90,7 +90,12 @@
updateproject.Modifier = intentionCustomer.Modifier;
updateproject.Modifytime = intentionCustomer.Modifytime;
- }
+ updateproject.Yixiangtime = intentionCustomer.Yixiangtime;
+ updateproject.Yixiang = intentionCustomer.Yixiang;
+ updateproject.Dianxiaozhuanyuan = intentionCustomer.Dianxiaozhuanyuan;
+ updateproject.Zuijinzhuizongtime = intentionCustomer.Zuijinzhuizongtime;
+
+ }
_context.SaveChanges();
resultEntity.ReturnID = intentionCustomer.Id;
@@ -175,10 +180,18 @@
DateTime.TryParse(Createtimes[1], out Createtimeend);
Createtimeend = Createtimeend.AddDays(1);
}
-
+ DateTime Yixiangtimestart = DateTime.Now;
+ DateTime Yixiangtimeend = DateTime.Now;
+ if (!string.IsNullOrWhiteSpace(searchEntity.Yixiangtime))
+ {
+ string[] Yixiangtimes = searchEntity.Yixiangtime.Split("|");
+ DateTime.TryParse(Yixiangtimes[0], out Yixiangtimestart);
+ DateTime.TryParse(Yixiangtimes[1], out Yixiangtimeend);
+ // Yixiangtimeend = Yixiangtimeend.AddDays(1);
+ }
- var query = (from a in _context.IntentionCustomers
- join b in listCode.Where(x => x.CodeTable == "CooperatecustomCustomer" && x.CodeField == "khly")
+ var query = (from a in _context.IntentionCustomers
+ join b in listCode.Where(x => x.CodeTable == "IntentionCustomer" && x.CodeField == "khly")
on a.Khly equals b.CodeSn
join c in listCode.Where(x => x.CodeTable == "CooperatecustomCustomer" && x.CodeField == "hyfl")
on a.Hyfl equals c.CodeSn
@@ -188,7 +201,13 @@
on a.Ywjl equals e.Id
into esss
from abi in esss.DefaultIfEmpty()
- join f in _context.Areas on a.Sheng equals f.CodeId
+
+ join f in _context.PltUsers.Where(x => x.RecStatus == "A" && x.Zhiwustatus == "A" )
+ on a.Dianxiaozhuanyuan equals f.Id
+ into fsss
+ from fff in fsss.DefaultIfEmpty()
+
+ join f in _context.Areas on a.Sheng equals f.CodeId
join g in _context.Areas on a.City equals g.CodeId
join h in _context.Areas on a.AreaId equals h.CodeId
@@ -204,7 +223,11 @@
&& (string.IsNullOrWhiteSpace(searchEntity.AreaId) || a.AreaId == searchEntity.AreaId.Trim())
&& (string.IsNullOrWhiteSpace(searchEntity.Creater) || a.Creater == searchEntity.Creater.Trim())
- select new IntentionCustomerDTO
+ && (string.IsNullOrWhiteSpace(searchEntity.Dianxiaozhuanyuan) || a.Dianxiaozhuanyuan == searchEntity.Dianxiaozhuanyuan.Trim())
+
+ && (string.IsNullOrWhiteSpace(searchEntity.Yixiangtime) || (a.Yixiangtime >= Yixiangtimestart && a.Yixiangtime <= Yixiangtimeend))
+ && (string.IsNullOrWhiteSpace(searchEntity.Yixiang) || ( a.Yixiang == searchEntity.Yixiang.Trim() && (a.Ywjl == null || a.Ywjl == searchEntity.YwjlYx) ))
+ select new IntentionCustomerDTO
{
Id = a.Id,
Sheng = a.Sheng,
@@ -249,7 +272,14 @@
Modifier = a.Modifier,
Modifytime = a.Modifytime,
CreatetimeName = a.Createtime.ToString("yyyy-MM-dd"),
- }
+ Yixiangtime = a.Yixiangtime,
+ YixiangtimeName = a.Yixiangtime.HasValue? a.Yixiangtime.Value.ToString("yyyy-MM-dd"):"",
+ Yixiang = a.Yixiang,
+ Dianxiaozhuanyuan = a.Dianxiaozhuanyuan,
+ DianxiaozhuanyuanName = fff.UserName,
+ Zuijinzhuizongtime = a.Zuijinzhuizongtime,
+ ZuijinzhuizongtimeName = a.Zuijinzhuizongtime.HasValue ? a.Zuijinzhuizongtime.Value.ToString("yyyy-MM-dd") : "",
+ }
).OrderByDescending(x => x.Modifytime).ToList();
--
Gitblit v1.9.1