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 | 19 +++++++++++++++++--
1 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/zhengcaioa/Services/CooperatecustomCustomerService.cs b/zhengcaioa/Services/CooperatecustomCustomerService.cs
index d4ba3a4..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,
}
);
@@ -389,6 +391,19 @@
query = query.Where(a => a.Ywjl == null);
}
+
+ }
+
+ 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);
+ }
}
@@ -1158,10 +1173,10 @@
- where a.IsValid == true
+ where a.IsValid == true && a.Itcode.Length<=20 && a.Itcode.Length > 8
&& (string.IsNullOrWhiteSpace(searchEntity.Createtime) || (a.CreateTime >= Createtimestart && a.CreateTime <= Createtimeend))
&& (string.IsNullOrWhiteSpace(searchEntity.Name) || a.Name.Contains(searchEntity.Name.Trim()))
- && (string.IsNullOrWhiteSpace(searchEntity.Itcode) || a.Name.Contains(searchEntity.Itcode.Trim()))
+ && (string.IsNullOrWhiteSpace(searchEntity.Itcode) || a.Itcode.Contains(searchEntity.Itcode.Trim()))
select new FrameworkUserDTO
{
--
Gitblit v1.9.1