From 69a8bb4807c77d05b5b43328acbf4ad26fb5fc68 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期五, 05 五月 2023 15:00:52 +0800
Subject: [PATCH] 提交

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

diff --git a/zhengcaioa/Services/CooperatecustomCustomerService.cs b/zhengcaioa/Services/CooperatecustomCustomerService.cs
index b8024a6..9a04ea6 100644
--- a/zhengcaioa/Services/CooperatecustomCustomerService.cs
+++ b/zhengcaioa/Services/CooperatecustomCustomerService.cs
@@ -375,6 +375,8 @@
                              ShenyushouxinName = a.Shenyushouxin.HasValue ? a.Shenyushouxin.Value.ToString("f2") : "",
                              Taocanjianshu = a.Taocanjianshu ?? 0,
                              Customertype = "鍚堜綔瀹㈡埛",
+                             Kuaidistatus = a.Kuaidistatus,
+                             Kuaiditime = a.Kuaiditime,
                          }
                         );
 
@@ -392,6 +394,19 @@
 
             }
 
+            if (!string.IsNullOrWhiteSpace(searchEntity.Kuaidistatus))
+            {
+                if (searchEntity.Kuaidistatus == "A")
+                {
+                    query = query.Where(a => a.Kuaidistatus == searchEntity.Kuaidistatus.Trim());
+                }
+                else
+                {
+                    query = query.Where(a => a.Kuaidistatus == searchEntity.Kuaidistatus.Trim() || a.Kuaidistatus == null);
+                }
+
+            }
+
             //if (searchEntity.totalrows == 0)
             searchEntity.totalrows = query.Count();
             data.Heji1 = Math.Round(query.Sum(x => x.Yufukuan) ?? 0, 2);

--
Gitblit v1.9.1