From 15eb82df2d6ec539e9d4245bfe08d531e8eb6379 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期日, 27 四月 2025 14:33:26 +0800
Subject: [PATCH] 修改培训订单占多个座位
---
zhengcaioa/Services/IntentionCustomerService.cs | 232 ++++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 194 insertions(+), 38 deletions(-)
diff --git a/zhengcaioa/Services/IntentionCustomerService.cs b/zhengcaioa/Services/IntentionCustomerService.cs
index 8371d13..41c2739 100644
--- a/zhengcaioa/Services/IntentionCustomerService.cs
+++ b/zhengcaioa/Services/IntentionCustomerService.cs
@@ -54,10 +54,10 @@
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 >= 1000)
+ if(Cooper+ Inten > 2000)
{
resultEntity.Result = false;
- resultEntity.Message = "璇ヤ笟鍔＄粡鐞嗭紝瀹㈡埛鍗曚綅鍜屽悎浣滃鎴峰悎璁¤秴杩�1000锛�";
+ resultEntity.Message = "璇ヤ笟鍔＄粡鐞嗭紝瀹㈡埛鍗曚綅鍜屽悎浣滃鎴峰悎璁¤秴杩�2000锛�";
return resultEntity;
}
}
@@ -73,10 +73,10 @@
updateproject.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 >= 1000)
+ if (Cooper + Inten >= 2000)
{
resultEntity.Result = false;
- resultEntity.Message = "璇ヤ笟鍔＄粡鐞嗭紝瀹㈡埛鍗曚綅鍜屽悎浣滃鎴峰悎璁¤秴杩�1000锛�";
+ resultEntity.Message = "璇ヤ笟鍔＄粡鐞嗭紝瀹㈡埛鍗曚綅鍜屽悎浣滃鎴峰悎璁¤秴杩�2000锛�";
return resultEntity;
}
}
@@ -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();
}
@@ -245,25 +245,25 @@
var query = (from a in _context.IntentionCustomers
- join b in listCode.Where(x => x.CodeTable == "IntentionCustomer" && x.CodeField == "khly")
- on a.Khly equals b.CodeSn
- join c in listCode.Where(x => x.CodeTable == "CooperatecustomCustomer" && x.CodeField == "hyfl")
- on a.Hyfl equals c.CodeSn
- join d in listCode.Where(x => x.CodeTable == "CooperatecustomCustomer" && x.CodeField == "khlx")
- on a.Khlx equals d.CodeSn
- join e in _context.PltUsers.Where(x => x.RecStatus == "A" && x.Zhiwustatus == "A" && x.IsYwjl == "A")
- on a.Ywjl equals e.Id
- into esss
- from abi in esss.DefaultIfEmpty()
+ // join b in listCode.Where(x => x.CodeTable == "IntentionCustomer" && x.CodeField == "khly")
+ // on a.Khly equals b.CodeSn
+ // join c in listCode.Where(x => x.CodeTable == "CooperatecustomCustomer" && x.CodeField == "hyfl")
+ // on a.Hyfl equals c.CodeSn
+ // join d in listCode.Where(x => x.CodeTable == "CooperatecustomCustomer" && x.CodeField == "khlx")
+ //on a.Khlx equals d.CodeSn
+ // join e in _context.PltUsers.Where(x => x.RecStatus == "A" && x.Zhiwustatus == "A" && x.IsYwjl == "A")
+ // on a.Ywjl equals e.Id
+ // into esss
+ // from abi in esss.DefaultIfEmpty()
- join f in _context.PltUsers.Where(x => x.RecStatus == "A" && x.Zhiwustatus == "A" )
- on a.Dianxiaozhuanyuan equals f.Id
- into fsss
- from fff in fsss.DefaultIfEmpty()
+ // join f in _context.PltUsers.Where(x => x.RecStatus == "A" && x.Zhiwustatus == "A" )
+ // on a.Dianxiaozhuanyuan equals f.Id
+ // into fsss
+ // from fff in fsss.DefaultIfEmpty()
- join f in _context.Areas on a.Sheng equals f.CodeId
- join g in _context.Areas on a.City equals g.CodeId
- join h in _context.Areas on a.AreaId equals h.CodeId
+ // join f in _context.Areas on a.Sheng equals f.CodeId
+ // join g in _context.Areas on a.City equals g.CodeId
+ // join h in _context.Areas on a.AreaId equals h.CodeId
join l in _context.IntentionVisits.Where(x => x.RecStatus == "A").GroupBy(q => new { q.Viscustomer }).Select(q => new
@@ -305,13 +305,13 @@
Hyfl = a.Hyfl,
Khlx = a.Khlx,
Ywjl = a.Ywjl,
- ShengName = f.Name + "-" + g.Name + "-" + h.Name,
- CityName = g.Name,
- AreaIdName = h.Name,
- KhlyName = b.Comments,
- HyflName = c.Comments,
- KhlxName = d.Comments,
- YwjlName = abi.UserName,
+ //ShengName = f.Name + "-" + g.Name + "-" + h.Name,
+ //CityName = g.Name,
+ //AreaIdName = h.Name,
+ //KhlyName = b.Comments,
+ //HyflName = c.Comments,
+ //KhlxName = d.Comments,
+ //YwjlName = abi.UserName,
Name = a.Name,
Postal = a.Postal,
Address = a.Address,
@@ -348,16 +348,31 @@
YixiangtimeName = a.Yixiangtime.HasValue? a.Yixiangtime.Value.ToString("yyyy-MM-dd"):"",
Yixiang = a.Yixiang,
Dianxiaozhuanyuan = a.Dianxiaozhuanyuan,
- DianxiaozhuanyuanName = fff.UserName,
+ //DianxiaozhuanyuanName = fff.UserName,
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))
@@ -403,6 +418,71 @@
searchEntity.totalrows = query.Count();
var lianlist = query.OrderByDescending(x => x.Modifytime).Skip((searchEntity.page - 1) * searchEntity.rows).Take(searchEntity.rows).ToList();
+ if(lianlist!=null && lianlist.Count > 0)
+ {
+ var areas = _context.Areas;
+ var pltUsers = _context.PltUsers.Where(x => x.RecStatus == "A" && x.Zhiwustatus == "A");
+
+ var khly = listCode.Where(x => x.CodeTable == "IntentionCustomer" && x.CodeField == "khly");
+
+
+ var hyfl = listCode.Where(x => x.CodeTable == "CooperatecustomCustomer" && x.CodeField == "hyfl");
+
+
+ var khlx = listCode.Where(x => x.CodeTable == "CooperatecustomCustomer" && x.CodeField == "khlx");
+
+
+ foreach (var intentionCustomerDTO in lianlist)
+ {
+ var sheng = areas.Where(x => x.CodeId == intentionCustomerDTO.Sheng).FirstOrDefault();
+ var city = areas.Where(x => x.CodeId == intentionCustomerDTO.City).FirstOrDefault();
+ var Area = areas.Where(x => x.CodeId == intentionCustomerDTO.AreaId).FirstOrDefault();
+ if (sheng != null)
+ {
+ intentionCustomerDTO.ShengName = sheng.Name;
+ }
+ if (city != null)
+ {
+ intentionCustomerDTO.CityName = city.Name;
+ intentionCustomerDTO.ShengName += "-" + city.Name;
+ }
+ if (Area != null)
+ {
+ intentionCustomerDTO.AreaIdName = Area.Name;
+ intentionCustomerDTO.ShengName += "-" + Area.Name;
+ }
+ var ywjl = pltUsers.Where(x => x.Id == intentionCustomerDTO.Ywjl).FirstOrDefault();
+ if (ywjl != null)
+ {
+ intentionCustomerDTO.YwjlName = ywjl.UserName;
+ }
+ var Dianxiaozhuanyuan = pltUsers.Where(x => x.Id == intentionCustomerDTO.Dianxiaozhuanyuan).FirstOrDefault();
+ if (Dianxiaozhuanyuan != null)
+ {
+ intentionCustomerDTO.DianxiaozhuanyuanName = Dianxiaozhuanyuan.UserName;
+ }
+ var KhlyName = khly.Where(x => x.CodeSn == intentionCustomerDTO.Khly).FirstOrDefault();
+ if (KhlyName != null)
+ {
+ intentionCustomerDTO.KhlyName = KhlyName.Comments;
+ }
+ var HyflName = hyfl.Where(x => x.CodeSn == intentionCustomerDTO.Hyfl).FirstOrDefault();
+ if (HyflName != null)
+ {
+ intentionCustomerDTO.HyflName = HyflName.Comments;
+ }
+ var KhlxName = khlx.Where(x => x.CodeSn == intentionCustomerDTO.Khlx).FirstOrDefault();
+ if (KhlxName != null)
+ {
+ intentionCustomerDTO.KhlxName = KhlxName.Comments;
+ }
+
+
+ intentionCustomerDTO.Guanliankehushu = _context.CustomerGuanlians.Count(x => x.CustomerId == intentionCustomerDTO.Id);
+ }
+ }
+
+
//foreach (var intentionCustomerDTO in lianlist)
//{
@@ -410,7 +490,7 @@
//}
- data.LoadData(searchEntity, lianlist);
+ data.LoadData(searchEntity, lianlist);
return data;
}
@@ -445,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>
@@ -513,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