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/FiOrderrecievemoneyService.cs |   14 +++++++++++++-
 1 files changed, 13 insertions(+), 1 deletions(-)

diff --git a/zhengcaioa/Services/FiOrderrecievemoneyService.cs b/zhengcaioa/Services/FiOrderrecievemoneyService.cs
index 4932909..682dddb 100644
--- a/zhengcaioa/Services/FiOrderrecievemoneyService.cs
+++ b/zhengcaioa/Services/FiOrderrecievemoneyService.cs
@@ -192,6 +192,10 @@
                    into msssss
                          from mmm in msssss.DefaultIfEmpty()
 
+                         join s in _context.PltUsers
+         on a.Creater equals s.Id
+         into ssssss
+                         from sss in ssssss.DefaultIfEmpty()
 
                          where a.RecStatus == "A"  && a.ChedanStatus == "D"
                           && (string.IsNullOrWhiteSpace(searchEntity.XdTime) || (a.XdTime >= XdTimestart && a.XdTime <= XdTimeend))
@@ -233,7 +237,7 @@
 
                              Creater = a.Creater,
                              Createtime = a.Createtime,
-
+                             CreaterName = sss.UserName,
                              RecStatus = a.RecStatus,
                              Modifier = a.Modifier,
                              Modifytime = a.Modifytime,
@@ -258,7 +262,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.Money) , 2);
+            data.Heji3 = Math.Round(query.Sum(x => x.YishouMoney), 2);
+            data.Heji4 = Math.Round(query.Sum(x => x.WeishouMoney), 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.Money), 2);
+            data.DangyeHeji3 = Math.Round(lianlist.Sum(x => x.YishouMoney) , 2);
+            data.DangyeHeji4 = Math.Round(lianlist.Sum(x => x.WeishouMoney) , 2);
             data.LoadData(searchEntity, lianlist);
             return data;
         }

--
Gitblit v1.9.1