From 827b416782eda317a6b24e0afb88c788e483b86d Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期一, 22 八月 2022 15:58:31 +0800
Subject: [PATCH] 财务修改单页统计,摘要订单号

---
 zhengcaioa/Services/CooperOrderService.cs |   16 +++++++++++++++-
 1 files changed, 15 insertions(+), 1 deletions(-)

diff --git a/zhengcaioa/Services/CooperOrderService.cs b/zhengcaioa/Services/CooperOrderService.cs
index 03ed8db..6226e19 100644
--- a/zhengcaioa/Services/CooperOrderService.cs
+++ b/zhengcaioa/Services/CooperOrderService.cs
@@ -245,6 +245,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 +294,8 @@
                              Remark = a.Remark,
 
                              Creater = a.Creater,
-                             Createtime = a.Createtime,
+            CreaterName = nnn.UserName,
+            Createtime = a.Createtime,
 
                              RecStatus = a.RecStatus,
                              Modifier = a.Modifier,
@@ -341,7 +347,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;
         }

--
Gitblit v1.9.1