zhengcaioa/DTO/CooperatecustomCustomerDTO.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
zhengcaioa/DTO/IntentionCustomerDTO.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
zhengcaioa/Model/CooperatecustomCustomer.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
zhengcaioa/Model/IntentionCustomer.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
zhengcaioa/Model/zhengcaioaContext.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
zhengcaioa/Services/CooperatecustomCustomerService.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
zhengcaioa/Services/IntentionCustomerService.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
zhengcaioa/zhengcaioa/Controllers/Customer/CooperatecustomCustomerController.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
zhengcaioa/zhengcaioa/Controllers/Customer/IntentionCustomerController.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
zhengcaioa/zhengcaioa/Timer/TimedBackgroundService.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
zhengcaioa/DTO/CooperatecustomCustomerDTO.cs
@@ -82,6 +82,8 @@ public string Customertype { get; set; } public string Hezuoyewu { get; set; } public DateTime? Ywjltime { get; set; } } public class CooperatecustomCustomerDTOSearch : SearchEntity zhengcaioa/DTO/IntentionCustomerDTO.cs
@@ -67,6 +67,8 @@ public int? Visittimes { get; set; } public string Viscustomer { get; set; } public DateTime? Ywjltime { get; set; } } public class IntentionCustomerDTOSearch : SearchEntity zhengcaioa/Model/CooperatecustomCustomer.cs
@@ -51,5 +51,6 @@ public decimal? Shenyushouxin { get; set; } public int? Taocanjianshu { get; set; } public DateTime? Ywjltime { get; set; } } } zhengcaioa/Model/IntentionCustomer.cs
@@ -50,5 +50,7 @@ public string Weixiner { get; set; } public DateTime? Weixintime { get; set; } public string HuiyuanId { get; set; } public DateTime? Ywjltime { get; set; } } } zhengcaioa/Model/zhengcaioaContext.cs
@@ -2720,6 +2720,10 @@ .HasColumnType("datetime") .HasColumnName("weixintime"); entity.Property(e => e.Ywjltime) .HasColumnType("datetime") .HasColumnName("ywjltime"); entity.Property(e => e.YwName) .HasMaxLength(500) .HasColumnName("yw_name") @@ -4192,6 +4196,10 @@ .HasColumnType("datetime") .HasColumnName("weixintime"); entity.Property(e => e.Ywjltime) .HasColumnType("datetime") .HasColumnName("ywjltime"); entity.Property(e => e.Yixiang).HasMaxLength(50); entity.Property(e => e.Yixiangtime).HasColumnType("datetime"); zhengcaioa/Services/CooperatecustomCustomerService.cs
@@ -55,12 +55,43 @@ if (String.IsNullOrEmpty(cooperatecustomCustomer.Id)) { if (!string.IsNullOrEmpty(cooperatecustomCustomer.Ywjl)) { cooperatecustomCustomer.Ywjltime = DateTime.Now; var Cooper = _context.CooperatecustomCustomers.Count(x => x.RecStatus == "A" && x.Ywjl == cooperatecustomCustomer.Ywjl); var Inten = _context.IntentionCustomers.Count(x => x.RecStatus == "A" && x.Ywjl == cooperatecustomCustomer.Ywjl); if (Cooper + Inten >= 1000) { resultEntity.Result = false; resultEntity.Message = "该业务经理,客户单位和合作客户合计超过1000!"; return resultEntity; } } cooperatecustomCustomer.Id = Guid.NewGuid().ToString(); _context.CooperatecustomCustomers.Add(cooperatecustomCustomer); } else { var updateproject = _context.CooperatecustomCustomers.Find(cooperatecustomCustomer.Id); if (!string.IsNullOrEmpty(cooperatecustomCustomer.Ywjl) && (string.IsNullOrEmpty(updateproject.Ywjl) || !string.IsNullOrEmpty(updateproject.Ywjl) && cooperatecustomCustomer.Ywjl != updateproject.Ywjl)) { updateproject.Ywjltime = DateTime.Now; var Cooper = _context.CooperatecustomCustomers.Count(x => x.RecStatus == "A" && x.Ywjl == cooperatecustomCustomer.Ywjl); var Inten = _context.IntentionCustomers.Count(x => x.RecStatus == "A" && x.Ywjl == cooperatecustomCustomer.Ywjl); if (Cooper + Inten >= 1000) { resultEntity.Result = false; resultEntity.Message = "该业务经理,客户单位和合作客户合计超过1000!"; return resultEntity; } } if (string.IsNullOrEmpty(cooperatecustomCustomer.Ywjl)) { updateproject.Ywjltime = DateTime.Now; } updateproject.Sheng = cooperatecustomCustomer.Sheng; updateproject.City = cooperatecustomCustomer.City; @@ -272,7 +303,7 @@ && (string.IsNullOrWhiteSpace(searchEntity.Khly) || a.Khly == searchEntity.Khly.Trim()) && (string.IsNullOrWhiteSpace(searchEntity.Hyfl) || a.Hyfl == searchEntity.Hyfl.Trim()) && (string.IsNullOrWhiteSpace(searchEntity.Khlx) || a.Khlx == searchEntity.Khlx.Trim()) && (string.IsNullOrWhiteSpace(searchEntity.Ywjl) || a.Ywjl == searchEntity.Ywjl.Trim()) //&& (string.IsNullOrWhiteSpace(searchEntity.Ywjl) || a.Ywjl == searchEntity.Ywjl.Trim()) && (string.IsNullOrWhiteSpace(searchEntity.Sheng) || a.Sheng == searchEntity.Sheng.Trim()) && (string.IsNullOrWhiteSpace(searchEntity.City) || a.City == searchEntity.City.Trim()) && (string.IsNullOrWhiteSpace(searchEntity.AreaId) || a.AreaId == searchEntity.AreaId.Trim()) @@ -340,9 +371,21 @@ Taocanjianshu = a.Taocanjianshu ?? 0, Customertype = "合作客户", } ).OrderByDescending(x => x.Modifytime).ToList(); ); if (!string.IsNullOrWhiteSpace(searchEntity.Ywjl)) { if (searchEntity.Ywjl != "11111") { query = query.Where(a => a.Ywjl == searchEntity.Ywjl.Trim()); } else { query = query.Where(a => a.Ywjl == null); } } //if (searchEntity.totalrows == 0) searchEntity.totalrows = query.Count(); @@ -350,7 +393,7 @@ data.Heji2 = Math.Round(query.Sum(x => x.Shouxinedu) ?? 0, 2); data.Heji3 = Math.Round(query.Sum(x => x.Shenyushouxin) ?? 0, 2); data.Heji4 = Math.Round(query.Sum(x => x.Moneycountde) ?? 0, 2); var lianlist = query.Skip((searchEntity.page - 1) * searchEntity.rows).Take(searchEntity.rows).ToList(); var lianlist = query.OrderByDescending(x => x.Modifytime).Skip((searchEntity.page - 1) * searchEntity.rows).Take(searchEntity.rows).ToList(); data.DangyeHeji1 = Math.Round(lianlist.Sum(x => x.Yufukuan) ?? 0, 2); data.DangyeHeji2 = Math.Round(lianlist.Sum(x => x.Shouxinedu) ?? 0, 2); data.DangyeHeji3 = Math.Round(lianlist.Sum(x => x.Shenyushouxin) ?? 0, 2); zhengcaioa/Services/IntentionCustomerService.cs
@@ -49,12 +49,43 @@ if (String.IsNullOrEmpty(intentionCustomer.Id)) { if (!string.IsNullOrEmpty(intentionCustomer.Ywjl)) { 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) { resultEntity.Result = false; resultEntity.Message = "该业务经理,客户单位和合作客户合计超过1000!"; return resultEntity; } } intentionCustomer.Id = Guid.NewGuid().ToString(); _context.IntentionCustomers.Add(intentionCustomer); } else { var updateproject = _context.IntentionCustomers.Find(intentionCustomer.Id); if (!string.IsNullOrEmpty(intentionCustomer.Ywjl) && (string.IsNullOrEmpty(updateproject.Ywjl) || !string.IsNullOrEmpty(updateproject.Ywjl) && intentionCustomer.Ywjl!= updateproject.Ywjl )) { 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) { resultEntity.Result = false; resultEntity.Message = "该业务经理,客户单位和合作客户合计超过1000!"; return resultEntity; } } if (string.IsNullOrEmpty(intentionCustomer.Ywjl)){ updateproject.Ywjltime = null; } updateproject.Sheng = intentionCustomer.Sheng; updateproject.City = intentionCustomer.City; @@ -250,7 +281,7 @@ && (string.IsNullOrWhiteSpace(searchEntity.Khly) || a.Khly == searchEntity.Khly.Trim()) && (string.IsNullOrWhiteSpace(searchEntity.Hyfl) || a.Hyfl == searchEntity.Hyfl.Trim()) && (string.IsNullOrWhiteSpace(searchEntity.Khlx) || a.Khlx == searchEntity.Khlx.Trim()) && (string.IsNullOrWhiteSpace(searchEntity.Ywjl) || a.Ywjl == searchEntity.Ywjl.Trim()) //&& (string.IsNullOrWhiteSpace(searchEntity.Ywjl) || a.Ywjl == searchEntity.Ywjl.Trim()) && (string.IsNullOrWhiteSpace(searchEntity.Sheng) || a.Sheng == searchEntity.Sheng.Trim()) && (string.IsNullOrWhiteSpace(searchEntity.City) || a.City == searchEntity.City.Trim()) && (string.IsNullOrWhiteSpace(searchEntity.AreaId) || a.AreaId == searchEntity.AreaId.Trim()) @@ -328,6 +359,20 @@ { query = query.Where( a=>a.Shifoutianjiaweixin == searchEntity.Shifouweixin.Trim()); } if (!string.IsNullOrWhiteSpace(searchEntity.Ywjl)) { if(searchEntity.Ywjl != "11111") { query = query.Where(a => a.Ywjl == searchEntity.Ywjl.Trim()); }else { query = query.Where(a => a.Ywjl == null ); } } if (!string.IsNullOrWhiteSpace(searchEntity.ShifouDianhua)) { if (searchEntity.ShifouDianhua != "A") zhengcaioa/zhengcaioa/Controllers/Customer/CooperatecustomCustomerController.cs
@@ -137,9 +137,12 @@ ViewBag.khly = _liaotianService.GetSYScode("CooperatecustomCustomer", "khly").Select(x => new { code = x.CodeSn, label = x.Comments }).ToList(); ViewBag.hyfl = _liaotianService.GetSYScode("CooperatecustomCustomer", "hyfl").Select(x => new { code = x.CodeSn, label = x.Comments }).ToList(); ViewBag.shifou = _liaotianService.GetSYScode("system", "shifou").Select(x => new { code = x.CodeSn, label = x.Comments }).ToList(); ViewBag.users = _userService.GetList().Where(x => x.IsYwjl == "A").Select(x => new { code = x.Id, label = x.UserName }).ToList(); var users = _userService.GetList().Where(x => x.IsYwjl == "A").Select(x => new { code = x.Id, label = x.UserName }).ToList(); users.Insert(0, new { code = "11111", label = "无业务经理" }); ViewBag.users = users; var areaDTOs = _projectService.Getsheng().ToList(); zhengcaioa/zhengcaioa/Controllers/Customer/IntentionCustomerController.cs
@@ -162,7 +162,10 @@ ViewBag.khly = _liaotianService.GetSYScode("IntentionCustomer", "khly").Select(x => new { code = x.CodeSn, label = x.Comments }).ToList(); ViewBag.hyfl = _liaotianService.GetSYScode("CooperatecustomCustomer", "hyfl").Select(x => new { code = x.CodeSn, label = x.Comments }).ToList(); ViewBag.users = _userService.GetList().Where(x => x.IsYwjl == "A").Select(x => new { code = x.Id, label = x.UserName }).ToList(); var users = _userService.GetList().Where(x => x.IsYwjl == "A").Select(x => new { code = x.Id, label = x.UserName }).ToList(); users.Insert(0, new { code = "11111", label = "无业务经理" }); ViewBag.users = users; ViewBag.Creater = _userService.GetList().Select(x => new { code = x.Id, label = x.UserName }).ToList(); zhengcaioa/zhengcaioa/Timer/TimedBackgroundService.cs
@@ -104,6 +104,11 @@ try { _logger.LogInformation("把超过90天还没有转化的档案客户的业务经理归为无"); this.ywjlguiling(); _logger.LogInformation("把超过90天还没有转化的档案客户的业务经理归为无执行结束"); _logger.LogInformation("判断是否是第五个工作日结束"); DateTime diwutian = this.diwugongzuori(); //第五个工作日结束后开始计算 @@ -207,6 +212,20 @@ return diwutian; } //把超过90天还没有转化的档案客户的业务经理归为无 public void ywjlguiling() { var intentionCustomerDTOs = _intentionCustomerService.GetList().Where(x=>x.Ywjltime < DateTime.Now.AddDays(-90)).ToList(); foreach(var intentionCustomerDTO in intentionCustomerDTOs) { intentionCustomerDTO.Ywjl = null; intentionCustomerDTO.Ywjltime = null; _intentionCustomerService.save(intentionCustomerDTO); } } //计算考勤 public void jisuankaoqin() {