From 6e2b929cf381e2320ba6e7dec56c0371124d2b51 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期六, 27 八月 2022 15:03:00 +0800
Subject: [PATCH] 提交
---
zhengcaioa/Services/CooperatecustomCustomerService.cs | 128 ++++++++++++++++++++++++++++++++++++++----
1 files changed, 115 insertions(+), 13 deletions(-)
diff --git a/zhengcaioa/Services/CooperatecustomCustomerService.cs b/zhengcaioa/Services/CooperatecustomCustomerService.cs
index 22ef326..fe95ca7 100644
--- a/zhengcaioa/Services/CooperatecustomCustomerService.cs
+++ b/zhengcaioa/Services/CooperatecustomCustomerService.cs
@@ -96,7 +96,44 @@
updateproject.Weixin = cooperatecustomCustomer.Weixin;
updateproject.HuiyuanId = cooperatecustomCustomer.HuiyuanId;
updateproject.Shifoutianjiaweixin = cooperatecustomCustomer.Shifoutianjiaweixin;
+ updateproject.Weixintime = cooperatecustomCustomer.Weixintime;
+ updateproject.Weixiner = cooperatecustomCustomer.Weixiner;
+ updateproject.Shouxinedu = cooperatecustomCustomer.Shouxinedu;
+ updateproject.Taocanjianshu = cooperatecustomCustomer.Taocanjianshu;
}
+
+ _context.SaveChanges();
+ resultEntity.ReturnID = cooperatecustomCustomer.Id;
+ resultEntity.Result = true;
+ }
+ catch (Exception ex)
+ {
+ resultEntity.Result = false;
+ resultEntity.Message = "淇濆瓨澶辫触锛岃鑱旂郴绠＄悊鍛�";
+
+ }
+ return resultEntity;
+ }
+
+
+ public ResultEntity saveyufukuan(CooperatecustomCustomerDTO cooperatecustomCustomerDTO)
+ {
+ ResultEntity resultEntity = new ResultEntity();
+ try
+ {
+
+
+ var cooperatecustomCustomer = _mapper.Map<CooperatecustomCustomer>(cooperatecustomCustomerDTO);
+
+
+
+ var updateproject = _context.CooperatecustomCustomers.Find(cooperatecustomCustomer.Id);
+
+
+ updateproject.Yufukuan = cooperatecustomCustomer.Yufukuan;
+ updateproject.Shenyushouxin = cooperatecustomCustomer.Shenyushouxin;
+ updateproject.Shouxinedu = cooperatecustomCustomer.Shouxinedu;
+
_context.SaveChanges();
resultEntity.ReturnID = cooperatecustomCustomer.Id;
@@ -166,32 +203,59 @@
DateTime.TryParse(Createtimes[1], out Createtimeend);
Createtimeend = Createtimeend.AddDays(1);
}
-
+
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
+
+
+ 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,
Moneycount = q.Sum(i => i.Money),
Ordercount = q.Count(),
- }
+ }
)
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))
@@ -203,7 +267,7 @@
&& (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) || (searchEntity.Shifouweixin == "A" && a.Weixin != null) || (searchEntity.Shifouweixin != "A" && a.Weixin == null) )
+ && (string.IsNullOrWhiteSpace(searchEntity.Shifouweixin) || a.Shifoutianjiaweixin == searchEntity.Shifouweixin.Trim())
&& (string.IsNullOrWhiteSpace(searchEntity.HuiyuanId) || a.HuiyuanId == searchEntity.HuiyuanId.Trim())
select new CooperatecustomCustomerDTO
@@ -216,12 +280,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,
@@ -230,6 +294,7 @@
Tel = a.Tel,
Ordercount = iii.Ordercount.ToString(),
Moneycount = iii.Moneycount.ToString(),
+ Moneycountde = iii.Moneycount,
Phone = a.Phone,
Qq = a.Qq,
Email = a.Email,
@@ -255,14 +320,31 @@
Weixin = a.Weixin,
Shifoutianjiaweixin = a.Shifoutianjiaweixin,
HuiyuanId = a.HuiyuanId,
+ Weixiner = a.Weixiner,
+ Weixintime = a.Weixintime,
+ Yufukuan = a.Yufukuan ?? 0,
+ Shouxinedu = a.Shouxinedu ?? 0,
+ Shenyushouxin = a.Shenyushouxin ?? 0,
+ YufukuanName = a.Yufukuan.HasValue ? a.Yufukuan.Value.ToString("f2") : "",
+ ShouxineduName = a.Shouxinedu.HasValue ? a.Shouxinedu.Value.ToString("f2") : "",
+ ShenyushouxinName = a.Shenyushouxin.HasValue ? a.Shenyushouxin.Value.ToString("f2") : "",
+ Taocanjianshu = a.Taocanjianshu ?? 0,
}
).OrderByDescending(x => x.Modifytime).ToList();
- if (searchEntity.totalrows == 0)
+ //if (searchEntity.totalrows == 0)
searchEntity.totalrows = query.Count();
+ data.Heji1 = Math.Round(query.Sum(x => x.Yufukuan) ?? 0, 2);
+ data.Heji2 = Math.Round(query.Sum(x => x.Shouxinedu) ?? 0, 2);
+ data.Heji3 = Math.Round(query.Sum(x => x.Shenyushouxin) ?? 0, 2);
+ data.Heji4 = Math.Round(query.Sum(x => x.Moneycountde) ?? 0, 2);
var lianlist = query.Skip((searchEntity.page - 1) * searchEntity.rows).Take(searchEntity.rows).ToList();
+ data.DangyeHeji1 = Math.Round(lianlist.Sum(x => x.Yufukuan) ?? 0, 2);
+ data.DangyeHeji2 = Math.Round(lianlist.Sum(x => x.Shouxinedu) ?? 0, 2);
+ data.DangyeHeji3 = Math.Round(lianlist.Sum(x => x.Shenyushouxin) ?? 0, 2);
+ data.DangyeHeji4 = Math.Round(lianlist.Sum(x => x.Moneycountde) ?? 0, 2);
data.LoadData(searchEntity, lianlist);
return data;
}
@@ -299,11 +381,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;
@@ -324,7 +416,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
@@ -333,5 +425,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