From d4431c7e89865a506af8662244004d0baa7ed609 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期三, 11 六月 2025 12:24:15 +0800
Subject: [PATCH] 投诉处理，爬
---
zhengcaioa/Services/CooperOrderService.cs | 29 ++++++++++++++++++++++-------
1 files changed, 22 insertions(+), 7 deletions(-)
diff --git a/zhengcaioa/Services/CooperOrderService.cs b/zhengcaioa/Services/CooperOrderService.cs
index 03ed8db..2a8d1b0 100644
--- a/zhengcaioa/Services/CooperOrderService.cs
+++ b/zhengcaioa/Services/CooperOrderService.cs
@@ -78,8 +78,9 @@
updateproject.Shoulitime = entity.Shoulitime;
updateproject.Songhuoer = entity.Songhuoer;
updateproject.Songhuotime = entity.Songhuotime;
- updateproject.Wangonger = entity.Wangonger;
- updateproject.Wangongtime = entity.Wangongtime;
+ //updateproject.WangongStatus = entity.WangongStatus;
+ //updateproject.Wangonger = entity.Wangonger;
+ //updateproject.Wangongtime = entity.Wangongtime;
updateproject.RecStatus = entity.RecStatus;
updateproject.Modifier = entity.Modifier;
@@ -245,6 +246,11 @@
into msssss
from mmm in msssss.DefaultIfEmpty()
+ join n in _context.PltUsers
+ on a.Creater equals n.Id
+ into nsssss
+ from nnn in nsssss.DefaultIfEmpty()
+
where a.RecStatus == "A"
&& (string.IsNullOrWhiteSpace(searchEntity.XdTime) || (a.XdTime >= XdTimestart && a.XdTime <= XdTimeend))
&& (string.IsNullOrWhiteSpace(searchEntity.Ywjl) || ggg.Ywjl == searchEntity.Ywjl.Trim())
@@ -289,7 +295,8 @@
Remark = a.Remark,
Creater = a.Creater,
- Createtime = a.Createtime,
+ CreaterName = nnn.UserName,
+ Createtime = a.Createtime,
RecStatus = a.RecStatus,
Modifier = a.Modifier,
@@ -341,7 +348,15 @@
//if (searchEntity.totalrows == 0)
searchEntity.totalrows = query.Count();
+ data.Heji1 = Math.Round(query.Sum(x => x.OrderNum) ?? 0, 2);
+ data.Heji2 = Math.Round(query.Sum(x => x.Price) ?? 0, 2);
+ data.Heji3 = Math.Round(query.Sum(x => x.Money) ?? 0, 2);
+ data.Heji4 = Math.Round(query.Sum(x => x.Youhui) ?? 0, 2);
var lianlist = query.Skip((searchEntity.page - 1) * searchEntity.rows).Take(searchEntity.rows).ToList();
+ data.DangyeHeji1 = Math.Round(lianlist.Sum(x => x.OrderNum) ?? 0, 2);
+ data.DangyeHeji2 = Math.Round(lianlist.Sum(x => x.Price) ?? 0, 2);
+ data.DangyeHeji3 = Math.Round(lianlist.Sum(x => x.Money) ?? 0, 2);
+ data.DangyeHeji4 = Math.Round(lianlist.Sum(x => x.Youhui) ?? 0, 2);
data.LoadData(searchEntity, lianlist);
return data;
}
@@ -427,7 +442,7 @@
updateproject.WangongStatus = dto.WangongStatus;
updateproject.Wangonger = dto.Wangonger;
updateproject.Wangongtime = dto.Wangongtime;
-
+ updateproject.ShouliStatus = dto.ShouliStatus;
_context.SaveChanges();
@@ -502,7 +517,7 @@
updateproject.ChedanStatus = dto.ChedanStatus;
updateproject.Chedan = dto.Chedan;
updateproject.ShouliStatus = dto.ShouliStatus;
-
+ updateproject.Remark = dto.Remark;
_context.SaveChanges();
resultEntity.ReturnID = dto.Id;
resultEntity.Result = true;
@@ -744,7 +759,7 @@
public List<CooperOrderDTO> GetList(string userid, DateTime datemin, DateTime datemax)
{
- var entity = _context.CooperOrders.Where(x => x.RecStatus == "A" && x.ShouliStatus != "0" && x.Creater == userid && x.Createtime >= datemin && x.Createtime < datemax).ToList();
+ var entity = _context.CooperOrders.Where(x => x.RecStatus == "A" && x.ShouliStatus != "0" && x.Creater == userid && ((x.OrderType != "08" && x.Createtime >= datemin && x.Createtime < datemax) || (x.OrderType == "08" && x.WangongStatus == "A" && x.Wangongtime >= datemin && x.Wangongtime < datemax)) ).ToList();
@@ -776,7 +791,7 @@
- var entity = (from a in _context.CooperOrders.Where(x => x.RecStatus == "A" && x.ShouliStatus != "0" && x.Creater == userid && x.Createtime >= datemin && x.Createtime < datemax)
+ var entity = (from a in _context.CooperOrders.Where(x => x.RecStatus == "A" && x.ShouliStatus != "0" && x.Creater == userid && ( (x.OrderType != "08" && x.Createtime >= datemin && x.Createtime < datemax) || (x.OrderType == "08" && x.WangongStatus=="A" && x.Wangongtime >= datemin && x.Wangongtime < datemax)))
join b in listCode.Where(x => x.CodeTable == "CooperOrder" && x.CodeField == "shouli_status")
on a.ShouliStatus equals b.CodeSn
--
Gitblit v1.9.1