From d4a6d65f5e449c3e5464aa18ae97bf8953987217 Mon Sep 17 00:00:00 2001
From: LR-20210131IOQH\Administrator <jackcold@163.com>
Date: 星期二, 10 八月 2021 15:44:14 +0800
Subject: [PATCH] Merge branch 'master' of http://47.108.235.38:8080/r/zhengcaioa
---
zhengcaioa/Services/CooperatecustomCustomerService.cs | 78 ++++++++++++++++++++++++++++++++++-----
1 files changed, 68 insertions(+), 10 deletions(-)
diff --git a/zhengcaioa/Services/CooperatecustomCustomerService.cs b/zhengcaioa/Services/CooperatecustomCustomerService.cs
index fa900d8..0f51554 100644
--- a/zhengcaioa/Services/CooperatecustomCustomerService.cs
+++ b/zhengcaioa/Services/CooperatecustomCustomerService.cs
@@ -93,7 +93,11 @@
updateproject.RecStatus = cooperatecustomCustomer.RecStatus;
updateproject.Modifier = cooperatecustomCustomer.Modifier;
updateproject.Modifytime = cooperatecustomCustomer.Modifytime;
-
+ updateproject.Weixin = cooperatecustomCustomer.Weixin;
+ updateproject.HuiyuanId = cooperatecustomCustomer.HuiyuanId;
+ updateproject.Shifoutianjiaweixin = cooperatecustomCustomer.Shifoutianjiaweixin;
+ updateproject.Weixintime = cooperatecustomCustomer.Weixintime;
+ updateproject.Weixiner = cooperatecustomCustomer.Weixiner;
}
_context.SaveChanges();
@@ -169,14 +173,26 @@
var query = (from a in _context.CooperatecustomCustomers
join b in listCode.Where(x => x.CodeTable == "CooperatecustomCustomer" && x.CodeField == "khly")
on a.Khly equals b.CodeSn
+ into bsss
+ from bbb in bsss.DefaultIfEmpty()
+
join c in listCode.Where(x => x.CodeTable == "CooperatecustomCustomer" && x.CodeField == "hyfl")
on a.Hyfl equals c.CodeSn
+ into csss
+ from ccc in csss.DefaultIfEmpty()
+
join d in listCode.Where(x => x.CodeTable == "CooperatecustomCustomer" && x.CodeField == "khlx")
on a.Khlx equals d.CodeSn
+ into dsss
+ from ddd in dsss.DefaultIfEmpty()
+
+
join e in _context.PltUsers.Where(x => x.RecStatus == "A" && x.Zhiwustatus == "A" && x.IsYwjl == "A")
on a.Ywjl equals e.Id
into esss
from abi in esss.DefaultIfEmpty()
+
+
join i in _context.CooperOrders.Where(x => x.RecStatus == "A" && x.ChedanStatus !="A" ).GroupBy(q => new { q.Khdw }).Select(q => new
{
Khdw = q.Key.Khdw,
@@ -187,9 +203,24 @@
on a.Id equals i.Khdw
into isss
from iii in isss.DefaultIfEmpty()
+
+
+
join f in _context.Areas on a.Sheng equals f.CodeId
+ into fsss
+ from fff in fsss.DefaultIfEmpty()
+
+
join g in _context.Areas on a.City equals g.CodeId
+ into gsss
+ from ggg in gsss.DefaultIfEmpty()
+
+
join h in _context.Areas on a.AreaId equals h.CodeId
+ into hsss
+ from hhh in hsss.DefaultIfEmpty()
+
+
where a.RecStatus == "A"
&& (string.IsNullOrWhiteSpace(searchEntity.Createtime) || (a.Createtime >= Createtimestart && a.Createtime <= Createtimeend))
@@ -201,6 +232,8 @@
&& (string.IsNullOrWhiteSpace(searchEntity.Sheng) || a.Sheng == searchEntity.Sheng.Trim())
&& (string.IsNullOrWhiteSpace(searchEntity.City) || a.City == searchEntity.City.Trim())
&& (string.IsNullOrWhiteSpace(searchEntity.AreaId) || a.AreaId == searchEntity.AreaId.Trim())
+ && (string.IsNullOrWhiteSpace(searchEntity.Shifouweixin) || a.Shifoutianjiaweixin == searchEntity.Shifouweixin.Trim())
+ && (string.IsNullOrWhiteSpace(searchEntity.HuiyuanId) || a.HuiyuanId == searchEntity.HuiyuanId.Trim())
select new CooperatecustomCustomerDTO
{
@@ -212,12 +245,12 @@
Hyfl = a.Hyfl,
Khlx = a.Khlx,
Ywjl = a.Ywjl,
- ShengName = f.Name + "-" + g.Name+ "-" + h.Name,
- CityName = g.Name,
- AreaIdName = h.Name,
- KhlyName = b.Comments,
- HyflName = c.Comments,
- KhlxName = d.Comments,
+ ShengName = fff.Name + "-" + ggg.Name+ "-" + hhh.Name,
+ CityName = ggg.Name,
+ AreaIdName = hhh.Name,
+ KhlyName = bbb.Comments,
+ HyflName = ccc.Comments,
+ KhlxName = ddd.Comments,
YwjlName = abi.UserName,
Name = a.Name,
Postal = a.Postal,
@@ -248,12 +281,17 @@
Modifier = a.Modifier,
Modifytime = a.Modifytime,
CreatetimeName = a.Createtime.ToString("yyyy-MM-dd"),
+ Weixin = a.Weixin,
+ Shifoutianjiaweixin = a.Shifoutianjiaweixin,
+ HuiyuanId = a.HuiyuanId,
+ Weixiner = a.Weixiner,
+ Weixintime = a.Weixintime,
}
).OrderByDescending(x => x.Modifytime).ToList();
- 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);
@@ -292,11 +330,21 @@
/// 鑾峰彇鎵�鏈夋湁鏁堝悎浣滃鎴�
/// </summary>
/// <returns></returns>
- public List<CooperatecustomCustomerDTO> GetList()
+ public List<CooperatecustomCustomerDTO> GetList(string HuiyuanId = "", string Name = "")
{
var listPosition = _context.CooperatecustomCustomers.Where(r => r.RecStatus == "A").ToList();
+
+ if (!string.IsNullOrEmpty(HuiyuanId))
+ {
+ listPosition = listPosition.Where(x => x.HuiyuanId == HuiyuanId).ToList();
+ }
+
+ if (!string.IsNullOrEmpty(Name))
+ {
+ listPosition = listPosition.Where(x => x.Name == Name).ToList();
+ }
var list = _mapper.Map<List<CooperatecustomCustomerDTO>>(listPosition);
return list;
@@ -317,7 +365,7 @@
var listPosition =( from a in _context.CooperatecustomCustomers.Where(r => r.RecStatus == "A" && r.Creater == userid)
- join b in _context.CooperOrders.Where(x => x.RecStatus == "A" && x.Shoulitime >= datemin && x.Shoulitime < datemax)
+ join b in _context.CooperOrders.Where(x => x.RecStatus == "A" && x.Createtime >= datemin && x.Createtime < datemax)
on a.Id equals b.Khdw
select a
@@ -326,5 +374,15 @@
var list = _mapper.Map<List<CooperatecustomCustomerDTO>>(listPosition);
return list;
}
+
+ public List<CooperatecustomCustomerDTO> GetListsalaryweixin(string userid, DateTime datemin, DateTime datemax)
+ {
+
+
+ var listPosition = _context.CooperatecustomCustomers.Where(r => r.RecStatus == "A" && r.Weixiner == userid && r.Weixintime >= datemin && r.Weixintime < datemax).ToList();
+
+ var list = _mapper.Map<List<CooperatecustomCustomerDTO>>(listPosition);
+ return list;
+ }
}
}
--
Gitblit v1.9.1