From 18db26a9759c18cac8fa3df420ff80d9f0de1ed9 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期二, 14 十二月 2021 11:11:42 +0800
Subject: [PATCH] 提交
---
zhengcaioa/Services/OrderBanciOrderService.cs | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/zhengcaioa/Services/OrderBanciOrderService.cs b/zhengcaioa/Services/OrderBanciOrderService.cs
index 2803819..b7b7bc7 100644
--- a/zhengcaioa/Services/OrderBanciOrderService.cs
+++ b/zhengcaioa/Services/OrderBanciOrderService.cs
@@ -147,7 +147,7 @@
&& (string.IsNullOrWhiteSpace(searchEntity.BanciId) || a.BanciId == searchEntity.BanciId.Trim())
-
+ && ((searchEntity.Kechengleixings==null|| searchEntity.Kechengleixings.Length == 0) || searchEntity.Kechengleixings.Split(new char[] { ',' }).Contains(a.KechengleixingId))
@@ -157,7 +157,7 @@
Id = a.Id,
Baomingtime = a.Baomingtime,
- BaomingtimeName = a.Baomingtime.ToString("yyyy-MM-dd"),
+ BaomingtimeName = a.Baomingtime.ToString("yyyy-MM-dd HH:mm"),
BanciId = a.BanciId,
Peixunbanci = a.Peixunbanci,
@@ -189,7 +189,12 @@
//if (searchEntity.totalrows == 0)
searchEntity.totalrows = query.Count();
+ data.Heji1 = Math.Round(query.Sum(x => x.Xuefei) ?? 0, 2);
+ data.Heji2 = Math.Round(new decimal(query.Sum(x => x.Baomingrenshu) ?? 0), 2);
+
var lianlist = query.Skip((searchEntity.page - 1) * searchEntity.rows).Take(searchEntity.rows).ToList();
+ data.DangyeHeji1 = Math.Round(lianlist.Sum(x => x.Xuefei) ?? 0, 2);
+ data.DangyeHeji2 = Math.Round(new decimal(lianlist.Sum(x => x.Baomingrenshu) ?? 0), 2);
data.LoadData(searchEntity, lianlist);
return data;
}
--
Gitblit v1.9.1