From 0fbf7c551ba932e7c8bfdb1086bd4ef7acc90a9c Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期五, 18 四月 2025 08:55:14 +0800
Subject: [PATCH] 提交
---
zhengcaioa/Services/CooperatecustomCustomerService.cs | 37 ++++++++++++++++++++++---------------
1 files changed, 22 insertions(+), 15 deletions(-)
diff --git a/zhengcaioa/Services/CooperatecustomCustomerService.cs b/zhengcaioa/Services/CooperatecustomCustomerService.cs
index d4ba3a4..4096d52 100644
--- a/zhengcaioa/Services/CooperatecustomCustomerService.cs
+++ b/zhengcaioa/Services/CooperatecustomCustomerService.cs
@@ -145,9 +145,7 @@
var listPosition = _context.CooperatecustomCustomers.Where(r => r.RecStatus == "A").ToList();
- var CooperatecustomCustomerDTOs = _mapper.Map<List<CooperatecustomCustomerDTO>>(listPosition);
- CacheHelperNetCore.CacheInsert("CooperatecustomCustomerDTOs", CooperatecustomCustomerDTOs);
-
+ CacheHelperNetCore.CacheNull("CooperatecustomCustomerDTOs");
resultEntity.ReturnID = cooperatecustomCustomer.Id;
resultEntity.Result = true;
}
@@ -375,6 +373,8 @@
ShenyushouxinName = a.Shenyushouxin.HasValue ? a.Shenyushouxin.Value.ToString("f2") : "",
Taocanjianshu = a.Taocanjianshu ?? 0,
Customertype = "鍚堜綔瀹㈡埛",
+ Kuaidistatus = a.Kuaidistatus,
+ Kuaiditime = a.Kuaiditime,
}
);
@@ -389,6 +389,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);
+ }
}
@@ -504,37 +517,31 @@
{
CooperatecustomCustomerDTOs = CooperatecustomCustomerDTOs.Where(x => x.HuiyuanId == HuiyuanId).ToList();
}
-
if (!string.IsNullOrEmpty(Name))
{
CooperatecustomCustomerDTOs = CooperatecustomCustomerDTOs.Where(x => x.Name == Name).ToList();
}
-
return CooperatecustomCustomerDTOs;
}
-
var listPosition = _context.CooperatecustomCustomers.Where(r => r.RecStatus == "A").ToList();
-
CooperatecustomCustomerDTOs = _mapper.Map<List<CooperatecustomCustomerDTO>>(listPosition);
CacheHelperNetCore.CacheInsert("CooperatecustomCustomerDTOs", CooperatecustomCustomerDTOs);
-
if (!string.IsNullOrEmpty(HuiyuanId))
{
- CooperatecustomCustomerDTOs = CooperatecustomCustomerDTOs.Where(x => x.HuiyuanId == HuiyuanId).ToList();
+ listPosition = listPosition.Where(x => x.HuiyuanId == HuiyuanId).ToList();
}
-
if (!string.IsNullOrEmpty(Name))
{
- CooperatecustomCustomerDTOs = CooperatecustomCustomerDTOs.Where(x => x.Name == Name).ToList();
+ listPosition = listPosition.Where(x => x.Name == Name).ToList();
}
-
+ CooperatecustomCustomerDTOs = _mapper.Map<List<CooperatecustomCustomerDTO>>(listPosition);
return CooperatecustomCustomerDTOs;
-
+
}
public List<CooperatecustomCustomerDTO> GetListsalary(string userid, DateTime datemin, DateTime datemax)
@@ -1158,10 +1165,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