From 69e9ce6ae24fce670fb8d7af0e1f132e2e009dbc Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期三, 12 七月 2023 13:44:21 +0800
Subject: [PATCH] 提交
---
zhengcaioa/Services/IntentionCustomerService.cs | 109 ++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 100 insertions(+), 9 deletions(-)
diff --git a/zhengcaioa/Services/IntentionCustomerService.cs b/zhengcaioa/Services/IntentionCustomerService.cs
index 410bb6c..41c2739 100644
--- a/zhengcaioa/Services/IntentionCustomerService.cs
+++ b/zhengcaioa/Services/IntentionCustomerService.cs
@@ -54,7 +54,7 @@
intentionCustomer.Ywjltime = DateTime.Now;
var Cooper = _context.CooperatecustomCustomers.Count(x => x.RecStatus == "A" && x.Ywjl == intentionCustomer.Ywjl);
var Inten = _context.IntentionCustomers.Count(x => x.RecStatus == "A" && x.Ywjl == intentionCustomer.Ywjl);
- if(Cooper+ Inten >= 2000)
+ if(Cooper+ Inten > 2000)
{
resultEntity.Result = false;
resultEntity.Message = "璇ヤ笟鍔＄粡鐞嗭紝瀹㈡埛鍗曚綅鍜屽悎浣滃鎴峰悎璁¤秴杩�2000锛�";
@@ -142,9 +142,9 @@
var listPosition = _context.IntentionCustomers.Where(r => r.RecStatus == "A").ToList();
- var intentionCustomerDTOs = _mapper.Map<List<IntentionCustomerDTO>>(listPosition);
- CacheHelperNetCore.CacheInsert("intentionCustomerDTOs", intentionCustomerDTOs);
-
+ // var intentionCustomerDTOs = _mapper.Map<List<IntentionCustomerDTO>>(listPosition);
+ //CacheHelperNetCore.CacheInsert("intentionCustomerDTOs", intentionCustomerDTOs);
+ CacheHelperNetCore.CacheNull("intentionCustomerDTOs");
resultEntity.ReturnID = intentionCustomer.Id;
resultEntity.Result = true;
}
@@ -162,7 +162,7 @@
var entity = _context.IntentionCustomers.Find(id);
- if (entity.RecStatus != "A")
+ if (entity ==null || entity.RecStatus != "A")
{
entity = new IntentionCustomer();
}
@@ -352,12 +352,27 @@
Zuijinzhuizongtime = a.Zuijinzhuizongtime,
ZuijinzhuizongtimeName = a.Zuijinzhuizongtime.HasValue ? a.Zuijinzhuizongtime.Value.ToString("yyyy-MM-dd") : "",
Visittimes = lll.Visittimes,
+ Kuaidistatus = a.Kuaidistatus,
+ Kuaiditime = a.Kuaiditime,
}
);
if (!string.IsNullOrWhiteSpace(searchEntity.Shifouweixin))
{
query = query.Where( a=>a.Shifoutianjiaweixin == searchEntity.Shifouweixin.Trim());
+ }
+
+ 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 (!string.IsNullOrWhiteSpace(searchEntity.Ywjl))
@@ -510,21 +525,32 @@
/// 鑾峰彇鎵�鏈夋湁鏁堟剰鍚戝鎴�
/// </summary>
/// <returns></returns>
- public List<IntentionCustomerDTO> GetList()
+ public List<IntentionCustomerDTO> GetList(string huiyuanId = null)
{
+
+
List<IntentionCustomerDTO> intentionCustomerDTOs = (List<IntentionCustomerDTO>)CacheHelperNetCore.CacheValue("intentionCustomerDTOs");
+
if (intentionCustomerDTOs != null && intentionCustomerDTOs.Count > 0)
{
+ if (!string.IsNullOrEmpty(huiyuanId))
+ {
+ intentionCustomerDTOs = intentionCustomerDTOs.Where(x => x.HuiyuanId == huiyuanId).ToList();
+ }
+
return intentionCustomerDTOs;
}
var listPosition = _context.IntentionCustomers.Where(r => r.RecStatus == "A").ToList();
-
intentionCustomerDTOs = _mapper.Map<List<IntentionCustomerDTO>>(listPosition);
CacheHelperNetCore.CacheInsert("intentionCustomerDTOs", intentionCustomerDTOs);
- var list = _mapper.Map<List<IntentionCustomerDTO>>(listPosition);
- return list;
+ if (!string.IsNullOrEmpty(huiyuanId))
+ {
+ listPosition = listPosition.Where(x => x.HuiyuanId == huiyuanId).ToList();
+ }
+ intentionCustomerDTOs = _mapper.Map<List<IntentionCustomerDTO>>(listPosition);
+ return intentionCustomerDTOs;
}
/// <summary>
@@ -578,5 +604,70 @@
return list;
}
+ public ResultEntity saveKhlx(CooperatecustomCustomerDTO cooperatecustomCustomerDTO)
+ {
+ ResultEntity resultEntity = new ResultEntity();
+ try
+ {
+
+
+
+
+
+
+ var updateproject = _context.IntentionCustomers.Find(cooperatecustomCustomerDTO.Id);
+
+
+ updateproject.Khlx = cooperatecustomCustomerDTO.Khlx;
+
+ updateproject.Modifier = cooperatecustomCustomerDTO.Modifier;
+ updateproject.Modifytime = cooperatecustomCustomerDTO.Modifytime;
+
+
+ _context.SaveChanges();
+
+
+ resultEntity.ReturnID = cooperatecustomCustomerDTO.Id;
+ resultEntity.Result = true;
+ }
+ catch (Exception ex)
+ {
+ resultEntity.Result = false;
+ resultEntity.Message = "淇濆瓨澶辫触锛岃鑱旂郴绠＄悊鍛�";
+
+ }
+ return resultEntity;
+ }
+
+
+
+ public ResultEntity GetZhengfuProjectDTOByTitle(string Name, string Id)
+ {
+ ResultEntity resultEntity = new ResultEntity();
+ resultEntity.Result = true;
+ if (!string.IsNullOrWhiteSpace(Name))
+ {
+ var checkUserSn = _context.IntentionCustomers.Where(r => r.RecStatus == "A" && r.Name == Name).FirstOrDefault();
+ if (checkUserSn != null && (string.IsNullOrWhiteSpace(Id) || (!string.IsNullOrWhiteSpace(Id) && checkUserSn.Id != Id)))
+ {
+ resultEntity.Result = false;
+ resultEntity.Message = "璇ユ。妗堝鎴峰凡缁忓瓨鍦�";
+
+ }
+ var checkUserSncooper = _context.CooperatecustomCustomers.Where(r => r.RecStatus == "A" && r.Name == Name).FirstOrDefault();
+ if (checkUserSncooper != null && (string.IsNullOrWhiteSpace(Id) || (!string.IsNullOrWhiteSpace(Id) && checkUserSncooper.Id != Id)))
+ {
+ resultEntity.Result = false;
+ resultEntity.Message = "璇ュ悎浣滃鎴峰凡缁忓瓨鍦�";
+
+ }
+
+ }
+
+
+
+ return resultEntity;
+ }
+
}
}
--
Gitblit v1.9.1