From eacd4c4f0581f1c4b55f7f0c7f1092b3f965a6f8 Mon Sep 17 00:00:00 2001 From: username@email.com <yzy2002yzy@163.com> Date: 星期三, 29 三月 2023 14:04:58 +0800 Subject: [PATCH] 提交 --- zhengcaioa/zhengcaioa/Timer/TimerGetShopUsersService.cs | 2331 ++++++++++++++++++++++++++++++++++++++++------------------- 1 files changed, 1,572 insertions(+), 759 deletions(-) diff --git a/zhengcaioa/zhengcaioa/Timer/TimerGetShopUsersService.cs b/zhengcaioa/zhengcaioa/Timer/TimerGetShopUsersService.cs index b38cc0b..259a77a 100644 --- a/zhengcaioa/zhengcaioa/Timer/TimerGetShopUsersService.cs +++ b/zhengcaioa/zhengcaioa/Timer/TimerGetShopUsersService.cs @@ -31,8 +31,10 @@ private readonly ILiaotianService _liaotianService; private readonly IHttpClientFactory _clientFactory; private readonly ICooperatecustomCustomerService _cooperatecustomCustomerService; + private readonly IIntentionCustomerService _intentionCustomerService; private readonly zhengcaioaContext _context; private readonly IMapper _mapper; + private readonly zcUserInfoN_dbContext _zcUserInfoN_DbContext; public TimerGetShopUsersService(ILogger<TimerGetShopUsersService> logger, IServiceScopeFactory factory) { _logger = logger; @@ -40,8 +42,10 @@ _liaotianService = factory.CreateScope().ServiceProvider.GetRequiredService<ILiaotianService>(); _clientFactory = factory.CreateScope().ServiceProvider.GetRequiredService<IHttpClientFactory>(); _cooperatecustomCustomerService = factory.CreateScope().ServiceProvider.GetRequiredService<ICooperatecustomCustomerService>(); + _intentionCustomerService = factory.CreateScope().ServiceProvider.GetRequiredService<IIntentionCustomerService>(); _context = factory.CreateScope().ServiceProvider.GetRequiredService<zhengcaioaContext>(); - _mapper = factory.CreateScope().ServiceProvider.GetRequiredService<IMapper>(); ; + _mapper = factory.CreateScope().ServiceProvider.GetRequiredService<IMapper>(); + _zcUserInfoN_DbContext = factory.CreateScope().ServiceProvider.GetRequiredService<zcUserInfoN_dbContext>(); } protected override async Task ExecuteAsync(CancellationToken stoppingToken) @@ -51,13 +55,25 @@ //stoppingToken.Register(() => File.Create($"E:\\dotnetCore\\Practice\\Practice\\{DateTime.Now.Millisecond}.txt")); DateTime datenow = DateTime.Now; + DateTime datenowfasongxiaoxi = DateTime.Now; while (!stoppingToken.IsCancellationRequested) { _logger.LogInformation("TimerGetShopUsersService 寮�濮嬫墽琛�"); _logger.LogInformation(datenow.ToString("yyyy-MM-dd HH:mm:ss")); - if (DateTime.Now.Hour == 6) + if (datenowfasongxiaoxi.Day == DateTime.Now.Day && DateTime.Now.Hour == 12) + //if (true) { - this.fasongxiaoxi(); + + try + { + datenowfasongxiaoxi.AddDays(1); + this.fasongxiaoxi(); + + } + catch (Exception ex) + { + _logger.LogInformation(ex.ToString()); + } } //姣忎釜灏忔椂璁$畻涓�娆� @@ -121,6 +137,13 @@ var cooperatecustomCustomers = _context.CooperatecustomCustomers.Where(x => x.RecStatus == "A").ToList(); + + //鍏宠仈琛� + var customerGuanlianhuiyuans = _context.CustomerGuanlianhuiyuans.Where(x => x.RecStatus == "A").ToList(); + + //浼氬憳琛� + var frameworkUsers = _zcUserInfoN_DbContext.FrameworkUsers.Where(x => x.IsValid == true).ToList(); + //StringBuilder number = new StringBuilder(); ; //if (result != null && result.Count > 0) //{ @@ -162,11 +185,11 @@ { fbprojiectid.Add(project.Id); } - var fbprojectzhongbiaos = _context.Projectzhongbiaos.Where(x => fbprojiectid.Contains(x.ProjectId)).ToList(); + var fbprojectzhongbiaos = projectzhongbiaos.Where(x => fbprojiectid.Contains(x.ProjectId)).ToList(); - var fbprojectreasons = _context.Projectreasons.Where(x => fbprojiectid.Contains(x.ProjectId)).ToList(); + var fbprojectreasons = projectreasons.Where(x => fbprojiectid.Contains(x.ProjectId)).ToList(); - var fbprojectyouxiaos = _context.Projectyouxiaos.Where(x => fbprojiectid.Contains(x.ProjectId)).ToList(); + var fbprojectyouxiaos = projectyouxiaos.Where(x => fbprojiectid.Contains(x.ProjectId)).ToList(); var projectfasongxiaoxiDTOsduanxin = new List<ProjectfasongxiaoxiDTO>(); @@ -370,6 +393,7 @@ } } + var projectfasongxiaoxiDTOsduanxinzuizhong = new List<ProjectfasongxiaoxiDTO>(); //鏌ヨ闇�瑕佸彂閫佺煭淇$殑瀹㈡埛 foreach (var projectfasongxiaoxiDTO1 in projectfasongxiaoxiDTOsduanxin) { @@ -391,6 +415,44 @@ projectfasongxiaoxiDTO1.Ywjl = cooperatecustomCustomer.Ywjl; projectfasongxiaoxiDTO1.KhId = cooperatecustomCustomer.Id; projectfasongxiaoxiDTO1.HuiyuanId = cooperatecustomCustomer.HuiyuanId; + projectfasongxiaoxiDTOsduanxinzuizhong.Add(projectfasongxiaoxiDTO1); + + //鏌ヨ璇ヤ紒涓氫笅鐨勫叾浠栦汉鍛� + var customerGuanlianhuiyuansqita = customerGuanlianhuiyuans.Where(x => x.Customerid == cooperatecustomCustomer.Id && x.Huiyuanid != cooperatecustomCustomer.HuiyuanId).ToList(); + if(customerGuanlianhuiyuansqita!=null&& customerGuanlianhuiyuansqita.Count > 0) + { + var huiyuanids = new List<Guid>(); + foreach (var customerGuanlianhuiyuan in customerGuanlianhuiyuansqita) + { + huiyuanids.Add(Guid.Parse(customerGuanlianhuiyuan.Huiyuanid)); + } + var frameworkUsers1 = frameworkUsers.Where(x=> huiyuanids.Contains(x.Id)).ToList(); + if(frameworkUsers1 != null && frameworkUsers1.Count > 0) + { + foreach (var frameworkUser in frameworkUsers1) + { + var projectfasongxiaoxiDTO = new ProjectfasongxiaoxiDTO(); + projectfasongxiaoxiDTO.ProjectId = projectfasongxiaoxiDTO1.ProjectId; + projectfasongxiaoxiDTO.ProjectmingxiId = projectfasongxiaoxiDTO1.ProjectmingxiId; + projectfasongxiaoxiDTO.Xiaoxileixing = projectfasongxiaoxiDTO1.Xiaoxileixing; + projectfasongxiaoxiDTO.Xiaoxizhonglei = projectfasongxiaoxiDTO1.Xiaoxizhonglei; + projectfasongxiaoxiDTO.RecStatus = projectfasongxiaoxiDTO1.RecStatus; + projectfasongxiaoxiDTO.Createtime = projectfasongxiaoxiDTO1.Createtime; + projectfasongxiaoxiDTO.Gyszl = projectfasongxiaoxiDTO1.Gyszl; + projectfasongxiaoxiDTO.Khname = projectfasongxiaoxiDTO1.Khname; + projectfasongxiaoxiDTO.Tel = frameworkUser.Itcode; + projectfasongxiaoxiDTO.Ywjl = projectfasongxiaoxiDTO1.Ywjl; + projectfasongxiaoxiDTO.KhId = projectfasongxiaoxiDTO1.KhId; + projectfasongxiaoxiDTO.HuiyuanId = frameworkUser.Id.ToString().ToLower() ; + projectfasongxiaoxiDTO.Projectname = projectfasongxiaoxiDTO1.Projectname; + projectfasongxiaoxiDTOsduanxinzuizhong.Add(projectfasongxiaoxiDTO); + } + } + } + + + + } } @@ -407,9 +469,44 @@ projectfasongxiaoxiDTO1.Ywjl = intentionCustomer.Ywjl; projectfasongxiaoxiDTO1.KhId = intentionCustomer.Id; projectfasongxiaoxiDTO1.HuiyuanId = intentionCustomer.HuiyuanId; + projectfasongxiaoxiDTOsduanxinzuizhong.Add(projectfasongxiaoxiDTO1); + + //鏌ヨ璇ヤ紒涓氫笅鐨勫叾浠栦汉鍛� + var customerGuanlianhuiyuansqita = customerGuanlianhuiyuans.Where(x => x.Customerid == intentionCustomer.Id && x.Huiyuanid != intentionCustomer.HuiyuanId).ToList(); + if (customerGuanlianhuiyuansqita != null && customerGuanlianhuiyuansqita.Count > 0) + { + var huiyuanids = new List<Guid>(); + foreach (var customerGuanlianhuiyuan in customerGuanlianhuiyuansqita) + { + huiyuanids.Add(Guid.Parse(customerGuanlianhuiyuan.Huiyuanid)); + } + var frameworkUsers1 = frameworkUsers.Where(x => huiyuanids.Contains(x.Id)).ToList(); + if (frameworkUsers1 != null && frameworkUsers1.Count > 0) + { + foreach (var frameworkUser in frameworkUsers1) + { + var projectfasongxiaoxiDTO = new ProjectfasongxiaoxiDTO(); + projectfasongxiaoxiDTO.ProjectId = projectfasongxiaoxiDTO1.ProjectId; + projectfasongxiaoxiDTO.ProjectmingxiId = projectfasongxiaoxiDTO1.ProjectmingxiId; + projectfasongxiaoxiDTO.Xiaoxileixing = projectfasongxiaoxiDTO1.Xiaoxileixing; + projectfasongxiaoxiDTO.Xiaoxizhonglei = projectfasongxiaoxiDTO1.Xiaoxizhonglei; + projectfasongxiaoxiDTO.RecStatus = projectfasongxiaoxiDTO1.RecStatus; + projectfasongxiaoxiDTO.Createtime = projectfasongxiaoxiDTO1.Createtime; + projectfasongxiaoxiDTO.Gyszl = projectfasongxiaoxiDTO1.Gyszl; + projectfasongxiaoxiDTO.Khname = projectfasongxiaoxiDTO1.Khname; + projectfasongxiaoxiDTO.Tel = frameworkUser.Itcode; + projectfasongxiaoxiDTO.Ywjl = projectfasongxiaoxiDTO1.Ywjl; + projectfasongxiaoxiDTO.KhId = projectfasongxiaoxiDTO1.KhId; + projectfasongxiaoxiDTO.HuiyuanId = frameworkUser.Id.ToString().ToLower(); + projectfasongxiaoxiDTO.Projectname = projectfasongxiaoxiDTO1.Projectname; + projectfasongxiaoxiDTOsduanxinzuizhong.Add(projectfasongxiaoxiDTO); + } + } + } } } + var projectfasongxiaoxiDTOsappzuizhong = new List<ProjectfasongxiaoxiDTO>(); //鏌ヨ闇�瑕佸彂閫丄pp娑堟伅鐨勫鎴� foreach (var projectfasongxiaoxiDTO1 in projectfasongxiaoxiDTOsapp) { @@ -431,7 +528,40 @@ projectfasongxiaoxiDTO1.Ywjl = cooperatecustomCustomer.Ywjl; projectfasongxiaoxiDTO1.KhId = cooperatecustomCustomer.Id; projectfasongxiaoxiDTO1.HuiyuanId = cooperatecustomCustomer.HuiyuanId; + projectfasongxiaoxiDTOsappzuizhong.Add(projectfasongxiaoxiDTO1); + //鏌ヨ璇ヤ紒涓氫笅鐨勫叾浠栦汉鍛� + var customerGuanlianhuiyuansqita = customerGuanlianhuiyuans.Where(x => x.Customerid == cooperatecustomCustomer.Id && x.Huiyuanid != cooperatecustomCustomer.HuiyuanId).ToList(); + if (customerGuanlianhuiyuansqita != null && customerGuanlianhuiyuansqita.Count > 0) + { + var huiyuanids = new List<Guid>(); + foreach (var customerGuanlianhuiyuan in customerGuanlianhuiyuansqita) + { + huiyuanids.Add(Guid.Parse(customerGuanlianhuiyuan.Huiyuanid)); + } + var frameworkUsers1 = frameworkUsers.Where(x => huiyuanids.Contains(x.Id)).ToList(); + if (frameworkUsers1 != null && frameworkUsers1.Count > 0) + { + foreach (var frameworkUser in frameworkUsers1) + { + var projectfasongxiaoxiDTO = new ProjectfasongxiaoxiDTO(); + projectfasongxiaoxiDTO.ProjectId = projectfasongxiaoxiDTO1.ProjectId; + projectfasongxiaoxiDTO.ProjectmingxiId = projectfasongxiaoxiDTO1.ProjectmingxiId; + projectfasongxiaoxiDTO.Xiaoxileixing = projectfasongxiaoxiDTO1.Xiaoxileixing; + projectfasongxiaoxiDTO.Xiaoxizhonglei = projectfasongxiaoxiDTO1.Xiaoxizhonglei; + projectfasongxiaoxiDTO.RecStatus = projectfasongxiaoxiDTO1.RecStatus; + projectfasongxiaoxiDTO.Createtime = projectfasongxiaoxiDTO1.Createtime; + projectfasongxiaoxiDTO.Gyszl = projectfasongxiaoxiDTO1.Gyszl; + projectfasongxiaoxiDTO.Khname = projectfasongxiaoxiDTO1.Khname; + projectfasongxiaoxiDTO.Tel = frameworkUser.Itcode; + projectfasongxiaoxiDTO.Ywjl = projectfasongxiaoxiDTO1.Ywjl; + projectfasongxiaoxiDTO.KhId = projectfasongxiaoxiDTO1.KhId; + projectfasongxiaoxiDTO.HuiyuanId = frameworkUser.Id.ToString().ToLower(); + projectfasongxiaoxiDTO.Projectname = projectfasongxiaoxiDTO1.Projectname; + projectfasongxiaoxiDTOsappzuizhong.Add(projectfasongxiaoxiDTO); + } + } + } } } else @@ -447,176 +577,51 @@ projectfasongxiaoxiDTO1.Ywjl = intentionCustomer.Ywjl; projectfasongxiaoxiDTO1.KhId = intentionCustomer.Id; projectfasongxiaoxiDTO1.HuiyuanId = intentionCustomer.HuiyuanId; + projectfasongxiaoxiDTOsappzuizhong.Add(projectfasongxiaoxiDTO1); + + //鏌ヨ璇ヤ紒涓氫笅鐨勫叾浠栦汉鍛� + var customerGuanlianhuiyuansqita = customerGuanlianhuiyuans.Where(x => x.Customerid == intentionCustomer.Id && x.Huiyuanid != intentionCustomer.HuiyuanId).ToList(); + if (customerGuanlianhuiyuansqita != null && customerGuanlianhuiyuansqita.Count > 0) + { + var huiyuanids = new List<Guid>(); + foreach (var customerGuanlianhuiyuan in customerGuanlianhuiyuansqita) + { + huiyuanids.Add(Guid.Parse(customerGuanlianhuiyuan.Huiyuanid)); + } + var frameworkUsers1 = frameworkUsers.Where(x => huiyuanids.Contains(x.Id)).ToList(); + if (frameworkUsers1 != null && frameworkUsers1.Count > 0) + { + foreach (var frameworkUser in frameworkUsers1) + { + var projectfasongxiaoxiDTO = new ProjectfasongxiaoxiDTO(); + projectfasongxiaoxiDTO.ProjectId = projectfasongxiaoxiDTO1.ProjectId; + projectfasongxiaoxiDTO.ProjectmingxiId = projectfasongxiaoxiDTO1.ProjectmingxiId; + projectfasongxiaoxiDTO.Xiaoxileixing = projectfasongxiaoxiDTO1.Xiaoxileixing; + projectfasongxiaoxiDTO.Xiaoxizhonglei = projectfasongxiaoxiDTO1.Xiaoxizhonglei; + projectfasongxiaoxiDTO.RecStatus = projectfasongxiaoxiDTO1.RecStatus; + projectfasongxiaoxiDTO.Createtime = projectfasongxiaoxiDTO1.Createtime; + projectfasongxiaoxiDTO.Gyszl = projectfasongxiaoxiDTO1.Gyszl; + projectfasongxiaoxiDTO.Khname = projectfasongxiaoxiDTO1.Khname; + projectfasongxiaoxiDTO.Tel = frameworkUser.Itcode; + projectfasongxiaoxiDTO.Ywjl = projectfasongxiaoxiDTO1.Ywjl; + projectfasongxiaoxiDTO.KhId = projectfasongxiaoxiDTO1.KhId; + projectfasongxiaoxiDTO.HuiyuanId = frameworkUser.Id.ToString().ToLower(); + projectfasongxiaoxiDTO.Projectname = projectfasongxiaoxiDTO1.Projectname; + projectfasongxiaoxiDTOsappzuizhong.Add(projectfasongxiaoxiDTO); + } + } + } } } - - - //鎺ㄩ�丄pp - foreach (var ywjl in Ywjl) - { - - var projectfasongxiaoxisywjl = projectfasongxiaoxiDTOsapp.Where(x => x.Ywjl == ywjl.Id && x.Tel != null && x.Tel.StartsWith("1")).ToList(); - int j = 0; - while (j * 1000 <= projectfasongxiaoxisywjl.Count) - { - j = j + 1; - string numberstring = ""; - string customename = ""; - if (projectfasongxiaoxisywjl != null && projectfasongxiaoxisywjl.Count > 0) - { - int countt = (j * 1000); - if (countt > projectfasongxiaoxisywjl.Count) - { - countt = projectfasongxiaoxisywjl.Count; - } - - for (int i = 0; i < countt; i++) - { - if (numberstring.IndexOf(projectfasongxiaoxisywjl[i + j - 1].Tel) >= 0) - { - continue; - } - numberstring += "\"" + projectfasongxiaoxisywjl[i + j - 1].Tel + "\","; - customename += projectfasongxiaoxisywjl[i + j - 1].Khname + ","; - - } - } - - if (numberstring.EndsWith(",")) - { - numberstring = numberstring.Substring(0, numberstring.Length - 1); - } - string conment = "{" - + "\"title\": \"鏀块噰鍜ㄨ鍏徃鐨勨�滄爣涔﹂璇勫鈥濇湇鍔"," - + "\"content\": \"鏀块噰鍜ㄨ鍏徃鐨勨�滄爣涔﹂璇勫鈥濇湇鍔★紝鐢�3浣嶉��浼戣祫娣辫瘎瀹′笓瀹跺湪寮�鏍囧墠鎸夌収璇勬爣娴佺▼涓烘偍浜ゅ弶妫�鏌ユ爣涔︼紝鏉滅粷搴熸爣 銆佸府鍔╂偍寰楀埌鍏ㄩ儴缁煎悎璇勫寰楀垎锛岀粡鏀块噰鍜ㄨ鍏徃妫�鏌ヨ繃鐨勬爣涔︼紝涓嶅彲鑳借搴熸爣锛岃鎯呰鍜ㄨ锛�" + ywjl.Phone + " \"," - + "\"getui_alias\": [" + numberstring + "]," - + "\"payload\": {\"text\": \"鏀块噰鍜ㄨ鍏徃鐨勨�滄爣涔﹂璇勫鈥濇湇鍔★紝鐢�3浣嶉��浼戣祫娣辫瘎瀹′笓瀹跺湪寮�鏍囧墠鎸夌収璇勬爣娴佺▼涓烘偍浜ゅ弶妫�鏌ユ爣涔︼紝鏉滅粷搴熸爣 銆佸府鍔╂偍寰楀埌鍏ㄩ儴缁煎悎璇勫寰楀垎锛岀粡鏀块噰鍜ㄨ鍏徃妫�鏌ヨ繃鐨勬爣涔︼紝涓嶅彲鑳借搴熸爣锛岃鎯呰鍜ㄨ锛�" + ywjl.Phone + " \"}," - + "\"force_notification\": true" - + "}"; - - string result2 = SMSHelper.PushApp(conment); - _logger.LogInformation("result2:" + result2); - JObject jobjectresult = (JObject)JsonConvert.DeserializeObject(result2); - - if (jobjectresult["code"] != null && jobjectresult["code"].ToString() == "1") - { - var isOK = jobjectresult["isOK"].ToString(); - - foreach (var projectfasongxiaoDTO in projectfasongxiaoxisywjl) - { - if (isOK.IndexOf(projectfasongxiaoDTO.Tel) >= 0) - { - var projectfasongxiaoxi = new Projectfasongxiaoxi(); - projectfasongxiaoxi.Id = Guid.NewGuid().ToString(); - projectfasongxiaoxi.ProjectmingxiId = projectfasongxiaoDTO.ProjectmingxiId; - projectfasongxiaoxi.Xiaoxileixing = projectfasongxiaoDTO.Xiaoxileixing; - projectfasongxiaoxi.Xiaoxizhonglei = projectfasongxiaoDTO.Xiaoxizhonglei; - projectfasongxiaoxi.Gyszl = projectfasongxiaoDTO.Gyszl; - projectfasongxiaoxi.Khname = projectfasongxiaoDTO.Khname; - projectfasongxiaoxi.RecStatus = "A"; - projectfasongxiaoxi.Createtime = DateTime.Now; - _context.Projectfasongxiaoxis.Add(projectfasongxiaoxi); - } - } - _context.SaveChanges(); - } - - - - _logger.LogInformation(ywjl.UserName + "鎺ㄩ�乤pp缁欏鎴�" + customename); - } - - - - - } - //涓氬姟缁忕悊涓虹┖ - if (true) - { - var projectfasongxiaoxisywjl = projectfasongxiaoxiDTOsapp.Where(x => x.Ywjl == null && x.Tel != null && x.Tel.StartsWith("1")).ToList(); - int j = 0; - while (j * 1000 <= projectfasongxiaoxisywjl.Count) - { - j = j + 1; - string numberstring = ""; - string customename = ""; - if (projectfasongxiaoxisywjl != null && projectfasongxiaoxisywjl.Count > 0) - { - int countt = (j * 1000); - if (countt > projectfasongxiaoxisywjl.Count) - { - countt = projectfasongxiaoxisywjl.Count; - } - for (int i = 0; i < countt; i++) - { - if (numberstring.IndexOf(projectfasongxiaoxisywjl[i + j - 1].Tel) >= 0) - { - continue; - } - numberstring += "\"" + projectfasongxiaoxisywjl[i + j - 1].Tel + "\","; - customename += projectfasongxiaoxisywjl[i + j - 1].Khname + ","; - - } - } - - if (numberstring.EndsWith(",")) - { - numberstring = numberstring.Substring(0, numberstring.Length - 1); - } - string conment = "{" - + "\"title\": \"鏀块噰鍜ㄨ鍏徃鐨勨�滄爣涔﹂璇勫鈥濇湇鍔"," - + "\"content\": \"鏀块噰鍜ㄨ鍏徃鐨勨�滄爣涔﹂璇勫鈥濇湇鍔★紝鐢�3浣嶉��浼戣祫娣辫瘎瀹′笓瀹跺湪寮�鏍囧墠鎸夌収璇勬爣娴佺▼涓烘偍浜ゅ弶妫�鏌ユ爣涔︼紝鏉滅粷搴熸爣 銆佸府鍔╂偍寰楀埌鍏ㄩ儴缁煎悎璇勫寰楀垎锛岀粡鏀块噰鍜ㄨ鍏徃妫�鏌ヨ繃鐨勬爣涔︼紝涓嶅彲鑳借搴熸爣锛岃鎯呰鍜ㄨ锛�400-028-8080 \"," - + "\"getui_alias\": [" + numberstring + "]," - + "\"payload\": {\"text\": \"鏀块噰鍜ㄨ鍏徃鐨勨�滄爣涔﹂璇勫鈥濇湇鍔★紝鐢�3浣嶉��浼戣祫娣辫瘎瀹′笓瀹跺湪寮�鏍囧墠鎸夌収璇勬爣娴佺▼涓烘偍浜ゅ弶妫�鏌ユ爣涔︼紝鏉滅粷搴熸爣 銆佸府鍔╂偍寰楀埌鍏ㄩ儴缁煎悎璇勫寰楀垎锛岀粡鏀块噰鍜ㄨ鍏徃妫�鏌ヨ繃鐨勬爣涔︼紝涓嶅彲鑳借搴熸爣锛岃鎯呰鍜ㄨ锛�400-028-8080 \"}," - + "\"force_notification\": true" - + "}"; - - string result2 = SMSHelper.PushApp(conment); - _logger.LogInformation("result2:" + result2); - JObject jobjectresult = (JObject)JsonConvert.DeserializeObject(result2); - - if (jobjectresult["code"] != null && jobjectresult["code"].ToString() == "1") - { - var isOK = jobjectresult["isOK"].ToString(); - - foreach (var projectfasongxiaoDTO in projectfasongxiaoxisywjl) - { - if (isOK.IndexOf(projectfasongxiaoDTO.Tel) >= 0) - { - var projectfasongxiaoxi = new Projectfasongxiaoxi(); - projectfasongxiaoxi.Id = Guid.NewGuid().ToString(); - projectfasongxiaoxi.ProjectmingxiId = projectfasongxiaoDTO.ProjectmingxiId; - projectfasongxiaoxi.Xiaoxileixing = projectfasongxiaoDTO.Xiaoxileixing; - projectfasongxiaoxi.Xiaoxizhonglei = projectfasongxiaoDTO.Xiaoxizhonglei; - projectfasongxiaoxi.Gyszl = projectfasongxiaoDTO.Gyszl; - projectfasongxiaoxi.Khname = projectfasongxiaoDTO.Khname; - projectfasongxiaoxi.RecStatus = "A"; - projectfasongxiaoxi.Createtime = DateTime.Now; - _context.Projectfasongxiaoxis.Add(projectfasongxiaoxi); - } - } - _context.SaveChanges(); - } - - - - _logger.LogInformation("鏃犱笟鍔$粡鐞嗘帹閫乤pp缁欏鎴�" + customename); - } - - - - } - - //鍙戦�佺煭淇� foreach (var ywjl in Ywjl) { - var projectfasongxiaoxisywjl = projectfasongxiaoxiDTOsduanxin.Where(x => x.Ywjl == ywjl.Id && x.Tel != null && x.Tel.StartsWith("1")).ToList(); + var projectfasongxiaoxisywjl = projectfasongxiaoxiDTOsduanxinzuizhong.Where(x => x.Ywjl == ywjl.Id && x.Tel != null && x.Tel.StartsWith("1")).ToList(); if (projectfasongxiaoxisywjl.Count >= 100) { int j = 0; - while (j*1000<= projectfasongxiaoxisywjl.Count) + while (j * 1000 <= projectfasongxiaoxisywjl.Count) { j = j + 1; string numberstring = ""; @@ -624,14 +629,14 @@ if (projectfasongxiaoxisywjl != null && projectfasongxiaoxisywjl.Count > 0) { int countt = (j * 1000); - if(countt> projectfasongxiaoxisywjl.Count) + if (countt > projectfasongxiaoxisywjl.Count) { countt = projectfasongxiaoxisywjl.Count; } for (int i = 0; i < countt; i++) { - if (numberstring.IndexOf(projectfasongxiaoxisywjl[i+j-1].Tel) >= 0) + if (numberstring.IndexOf(projectfasongxiaoxisywjl[i + j - 1].Tel) >= 0) { continue; } @@ -671,7 +676,7 @@ } } - + @@ -681,7 +686,7 @@ //涓氬姟缁忕悊涓虹┖ if (true) { - var projectfasongxiaoxisywjl = projectfasongxiaoxiDTOsduanxin.Where(x => x.Ywjl == null && x.Tel != null && x.Tel.StartsWith("1")).ToList(); + var projectfasongxiaoxisywjl = projectfasongxiaoxiDTOsduanxinzuizhong.Where(x => x.Ywjl == null && x.Tel != null && x.Tel.StartsWith("1")).ToList(); if (projectfasongxiaoxisywjl.Count >= 100) { int j = 0; @@ -740,10 +745,178 @@ } - + } } + + //鎺ㄩ�丄pp + foreach (var ywjl in Ywjl) + { + + var projectfasongxiaoxisywjl = projectfasongxiaoxiDTOsappzuizhong.Where(x => x.Ywjl == ywjl.Id && x.Tel != null && x.Tel.StartsWith("1")).ToList(); + int j = 0; + while (j * 1000 <= projectfasongxiaoxisywjl.Count) + { + j = j + 1; + string numberstring = ""; + string customename = ""; + if (projectfasongxiaoxisywjl != null && projectfasongxiaoxisywjl.Count > 0) + { + int countt = (j * 1000); + if (countt > projectfasongxiaoxisywjl.Count) + { + countt = projectfasongxiaoxisywjl.Count; + } + + for (int i = 0; i < countt; i++) + { + if (numberstring.IndexOf(projectfasongxiaoxisywjl[i + j - 1].Tel) >= 0) + { + continue; + } + numberstring += "\"" + projectfasongxiaoxisywjl[i + j - 1].Tel + "\","; + customename += projectfasongxiaoxisywjl[i + j - 1].Khname + ","; + + } + } + + if (numberstring.EndsWith(",")) + { + numberstring = numberstring.Substring(0, numberstring.Length - 1); + } + if (string.IsNullOrEmpty(numberstring)) + { + continue; + } + string conment = "{" + + "\"title\": \"鏀块噰鍜ㄨ鍏徃鐨勨�滄爣涔﹂璇勫鈥濇湇鍔"," + + "\"content\": \"鏀块噰鍜ㄨ鍏徃鐨勨�滄爣涔﹂璇勫鈥濇湇鍔★紝鐢�3浣嶉��浼戣祫娣辫瘎瀹′笓瀹跺湪寮�鏍囧墠鎸夌収璇勬爣娴佺▼涓烘偍浜ゅ弶妫�鏌ユ爣涔︼紝鏉滅粷搴熸爣 銆佸府鍔╂偍寰楀埌鍏ㄩ儴缁煎悎璇勫寰楀垎锛岀粡鏀块噰鍜ㄨ鍏徃妫�鏌ヨ繃鐨勬爣涔︼紝涓嶅彲鑳借搴熸爣锛岃鎯呰鍜ㄨ锛�" + ywjl.Phone + " \"," + + "\"getui_alias\": [" + numberstring + "]," + + "\"payload\": {\"text\": \"鏀块噰鍜ㄨ鍏徃鐨勨�滄爣涔﹂璇勫鈥濇湇鍔★紝鐢�3浣嶉��浼戣祫娣辫瘎瀹′笓瀹跺湪寮�鏍囧墠鎸夌収璇勬爣娴佺▼涓烘偍浜ゅ弶妫�鏌ユ爣涔︼紝鏉滅粷搴熸爣 銆佸府鍔╂偍寰楀埌鍏ㄩ儴缁煎悎璇勫寰楀垎锛岀粡鏀块噰鍜ㄨ鍏徃妫�鏌ヨ繃鐨勬爣涔︼紝涓嶅彲鑳借搴熸爣锛岃鎯呰鍜ㄨ锛�" + ywjl.Phone + " \"}," + + "\"force_notification\": true" + + "}"; + + string result2 = SMSHelper.PushApp(conment); + _logger.LogInformation("result2:" + result2); + JObject jobjectresult = (JObject)JsonConvert.DeserializeObject(result2); + + if (jobjectresult["code"] != null && jobjectresult["code"].ToString() == "1") + { + var isOK = jobjectresult["isOK"].ToString(); + + foreach (var projectfasongxiaoDTO in projectfasongxiaoxisywjl) + { + if (isOK.IndexOf(projectfasongxiaoDTO.Tel) >= 0) + { + var projectfasongxiaoxi = new Projectfasongxiaoxi(); + projectfasongxiaoxi.Id = Guid.NewGuid().ToString(); + projectfasongxiaoxi.ProjectmingxiId = projectfasongxiaoDTO.ProjectmingxiId; + projectfasongxiaoxi.Xiaoxileixing = projectfasongxiaoDTO.Xiaoxileixing; + projectfasongxiaoxi.Xiaoxizhonglei = projectfasongxiaoDTO.Xiaoxizhonglei; + projectfasongxiaoxi.Gyszl = projectfasongxiaoDTO.Gyszl; + projectfasongxiaoxi.Khname = projectfasongxiaoDTO.Khname; + projectfasongxiaoxi.RecStatus = "A"; + projectfasongxiaoxi.Createtime = DateTime.Now; + _context.Projectfasongxiaoxis.Add(projectfasongxiaoxi); + } + } + _context.SaveChanges(); + } + + + + _logger.LogInformation(ywjl.UserName + "鎺ㄩ�乤pp缁欏鎴�" + customename); + } + + + + + } + //涓氬姟缁忕悊涓虹┖ + if (true) + { + var projectfasongxiaoxisywjl = projectfasongxiaoxiDTOsappzuizhong.Where(x => x.Ywjl == null && x.Tel != null && x.Tel.StartsWith("1")).ToList(); + int j = 0; + while (j * 1000 <= projectfasongxiaoxisywjl.Count) + { + j = j + 1; + string numberstring = ""; + string customename = ""; + if (projectfasongxiaoxisywjl != null && projectfasongxiaoxisywjl.Count > 0) + { + int countt = (j * 1000); + if (countt > projectfasongxiaoxisywjl.Count) + { + countt = projectfasongxiaoxisywjl.Count; + } + for (int i = 0; i < countt; i++) + { + if (numberstring.IndexOf(projectfasongxiaoxisywjl[i + j - 1].Tel) >= 0) + { + continue; + } + numberstring += "\"" + projectfasongxiaoxisywjl[i + j - 1].Tel + "\","; + customename += projectfasongxiaoxisywjl[i + j - 1].Khname + ","; + + } + } + + if (numberstring.EndsWith(",")) + { + numberstring = numberstring.Substring(0, numberstring.Length - 1); + } + if (string.IsNullOrEmpty(numberstring)) + { + continue; + } + string conment = "{" + + "\"title\": \"鏀块噰鍜ㄨ鍏徃鐨勨�滄爣涔﹂璇勫鈥濇湇鍔"," + + "\"content\": \"鏀块噰鍜ㄨ鍏徃鐨勨�滄爣涔﹂璇勫鈥濇湇鍔★紝鐢�3浣嶉��浼戣祫娣辫瘎瀹′笓瀹跺湪寮�鏍囧墠鎸夌収璇勬爣娴佺▼涓烘偍浜ゅ弶妫�鏌ユ爣涔︼紝鏉滅粷搴熸爣 銆佸府鍔╂偍寰楀埌鍏ㄩ儴缁煎悎璇勫寰楀垎锛岀粡鏀块噰鍜ㄨ鍏徃妫�鏌ヨ繃鐨勬爣涔︼紝涓嶅彲鑳借搴熸爣锛岃鎯呰鍜ㄨ锛�400-028-8080 \"," + + "\"getui_alias\": [" + numberstring + "]," + + "\"payload\": {\"text\": \"鏀块噰鍜ㄨ鍏徃鐨勨�滄爣涔﹂璇勫鈥濇湇鍔★紝鐢�3浣嶉��浼戣祫娣辫瘎瀹′笓瀹跺湪寮�鏍囧墠鎸夌収璇勬爣娴佺▼涓烘偍浜ゅ弶妫�鏌ユ爣涔︼紝鏉滅粷搴熸爣 銆佸府鍔╂偍寰楀埌鍏ㄩ儴缁煎悎璇勫寰楀垎锛岀粡鏀块噰鍜ㄨ鍏徃妫�鏌ヨ繃鐨勬爣涔︼紝涓嶅彲鑳借搴熸爣锛岃鎯呰鍜ㄨ锛�400-028-8080 \"}," + + "\"force_notification\": true" + + "}"; + + string result2 = SMSHelper.PushApp(conment); + _logger.LogInformation("result2:" + result2); + JObject jobjectresult = (JObject)JsonConvert.DeserializeObject(result2); + + if (jobjectresult["code"] != null && jobjectresult["code"].ToString() == "1") + { + var isOK = jobjectresult["isOK"].ToString(); + + foreach (var projectfasongxiaoDTO in projectfasongxiaoxisywjl) + { + if (isOK.IndexOf(projectfasongxiaoDTO.Tel) >= 0) + { + var projectfasongxiaoxi = new Projectfasongxiaoxi(); + projectfasongxiaoxi.Id = Guid.NewGuid().ToString(); + projectfasongxiaoxi.ProjectmingxiId = projectfasongxiaoDTO.ProjectmingxiId; + projectfasongxiaoxi.Xiaoxileixing = projectfasongxiaoDTO.Xiaoxileixing; + projectfasongxiaoxi.Xiaoxizhonglei = projectfasongxiaoDTO.Xiaoxizhonglei; + projectfasongxiaoxi.Gyszl = projectfasongxiaoDTO.Gyszl; + projectfasongxiaoxi.Khname = projectfasongxiaoDTO.Khname; + projectfasongxiaoxi.RecStatus = "A"; + projectfasongxiaoxi.Createtime = DateTime.Now; + _context.Projectfasongxiaoxis.Add(projectfasongxiaoxi); + } + } + _context.SaveChanges(); + } + + + + _logger.LogInformation("鏃犱笟鍔$粡鐞嗘帹閫乤pp缁欏鎴�" + customename); + } + + + + } + + + + @@ -775,7 +948,7 @@ { fbprojiectid.Add(project.Id); } - var fbprojectzhongbiaos = _context.Projectzhongbiaos.Where(x => fbprojiectid.Contains(x.ProjectId)).ToList(); + var fbprojectzhongbiaos = projectzhongbiaos.Where(x => fbprojiectid.Contains(x.ProjectId)).ToList(); var projectfasongxiaoxiDTOsduanxin = new List<ProjectfasongxiaoxiDTO>(); @@ -873,6 +1046,7 @@ } + var projectfasongxiaoxiDTOsduanxinzuizhong = new List<ProjectfasongxiaoxiDTO>(); //鏌ヨ闇�瑕佸彂閫佺煭淇$殑瀹㈡埛 foreach (var projectfasongxiaoxiDTO1 in projectfasongxiaoxiDTOsduanxin) { @@ -894,6 +1068,44 @@ projectfasongxiaoxiDTO1.Ywjl = cooperatecustomCustomer.Ywjl; projectfasongxiaoxiDTO1.KhId = cooperatecustomCustomer.Id; projectfasongxiaoxiDTO1.HuiyuanId = cooperatecustomCustomer.HuiyuanId; + projectfasongxiaoxiDTOsduanxinzuizhong.Add(projectfasongxiaoxiDTO1); + + //鏌ヨ璇ヤ紒涓氫笅鐨勫叾浠栦汉鍛� + var customerGuanlianhuiyuansqita = customerGuanlianhuiyuans.Where(x => x.Customerid == cooperatecustomCustomer.Id && x.Huiyuanid != cooperatecustomCustomer.HuiyuanId).ToList(); + if (customerGuanlianhuiyuansqita != null && customerGuanlianhuiyuansqita.Count > 0) + { + var huiyuanids = new List<Guid>(); + foreach (var customerGuanlianhuiyuan in customerGuanlianhuiyuansqita) + { + huiyuanids.Add(Guid.Parse(customerGuanlianhuiyuan.Huiyuanid)); + } + var frameworkUsers1 = frameworkUsers.Where(x => huiyuanids.Contains(x.Id)).ToList(); + if (frameworkUsers1 != null && frameworkUsers1.Count > 0) + { + foreach (var frameworkUser in frameworkUsers1) + { + var projectfasongxiaoxiDTO = new ProjectfasongxiaoxiDTO(); + projectfasongxiaoxiDTO.ProjectId = projectfasongxiaoxiDTO1.ProjectId; + projectfasongxiaoxiDTO.ProjectmingxiId = projectfasongxiaoxiDTO1.ProjectmingxiId; + projectfasongxiaoxiDTO.Xiaoxileixing = projectfasongxiaoxiDTO1.Xiaoxileixing; + projectfasongxiaoxiDTO.Xiaoxizhonglei = projectfasongxiaoxiDTO1.Xiaoxizhonglei; + projectfasongxiaoxiDTO.RecStatus = projectfasongxiaoxiDTO1.RecStatus; + projectfasongxiaoxiDTO.Createtime = projectfasongxiaoxiDTO1.Createtime; + projectfasongxiaoxiDTO.Gyszl = projectfasongxiaoxiDTO1.Gyszl; + projectfasongxiaoxiDTO.Khname = projectfasongxiaoxiDTO1.Khname; + projectfasongxiaoxiDTO.Tel = frameworkUser.Itcode; + projectfasongxiaoxiDTO.Ywjl = projectfasongxiaoxiDTO1.Ywjl; + projectfasongxiaoxiDTO.KhId = projectfasongxiaoxiDTO1.KhId; + projectfasongxiaoxiDTO.HuiyuanId = frameworkUser.Id.ToString().ToLower(); + projectfasongxiaoxiDTO.Projectname = projectfasongxiaoxiDTO1.Projectname; + projectfasongxiaoxiDTOsduanxinzuizhong.Add(projectfasongxiaoxiDTO); + } + } + } + + + + } } @@ -910,9 +1122,44 @@ projectfasongxiaoxiDTO1.Ywjl = intentionCustomer.Ywjl; projectfasongxiaoxiDTO1.KhId = intentionCustomer.Id; projectfasongxiaoxiDTO1.HuiyuanId = intentionCustomer.HuiyuanId; + projectfasongxiaoxiDTOsduanxinzuizhong.Add(projectfasongxiaoxiDTO1); + + //鏌ヨ璇ヤ紒涓氫笅鐨勫叾浠栦汉鍛� + var customerGuanlianhuiyuansqita = customerGuanlianhuiyuans.Where(x => x.Customerid == intentionCustomer.Id && x.Huiyuanid != intentionCustomer.HuiyuanId).ToList(); + if (customerGuanlianhuiyuansqita != null && customerGuanlianhuiyuansqita.Count > 0) + { + var huiyuanids = new List<Guid>(); + foreach (var customerGuanlianhuiyuan in customerGuanlianhuiyuansqita) + { + huiyuanids.Add(Guid.Parse(customerGuanlianhuiyuan.Huiyuanid)); + } + var frameworkUsers1 = frameworkUsers.Where(x => huiyuanids.Contains(x.Id)).ToList(); + if (frameworkUsers1 != null && frameworkUsers1.Count > 0) + { + foreach (var frameworkUser in frameworkUsers1) + { + var projectfasongxiaoxiDTO = new ProjectfasongxiaoxiDTO(); + projectfasongxiaoxiDTO.ProjectId = projectfasongxiaoxiDTO1.ProjectId; + projectfasongxiaoxiDTO.ProjectmingxiId = projectfasongxiaoxiDTO1.ProjectmingxiId; + projectfasongxiaoxiDTO.Xiaoxileixing = projectfasongxiaoxiDTO1.Xiaoxileixing; + projectfasongxiaoxiDTO.Xiaoxizhonglei = projectfasongxiaoxiDTO1.Xiaoxizhonglei; + projectfasongxiaoxiDTO.RecStatus = projectfasongxiaoxiDTO1.RecStatus; + projectfasongxiaoxiDTO.Createtime = projectfasongxiaoxiDTO1.Createtime; + projectfasongxiaoxiDTO.Gyszl = projectfasongxiaoxiDTO1.Gyszl; + projectfasongxiaoxiDTO.Khname = projectfasongxiaoxiDTO1.Khname; + projectfasongxiaoxiDTO.Tel = frameworkUser.Itcode; + projectfasongxiaoxiDTO.Ywjl = projectfasongxiaoxiDTO1.Ywjl; + projectfasongxiaoxiDTO.KhId = projectfasongxiaoxiDTO1.KhId; + projectfasongxiaoxiDTO.HuiyuanId = frameworkUser.Id.ToString().ToLower(); + projectfasongxiaoxiDTO.Projectname = projectfasongxiaoxiDTO1.Projectname; + projectfasongxiaoxiDTOsduanxinzuizhong.Add(projectfasongxiaoxiDTO); + } + } + } } } + var projectfasongxiaoxiDTOsappzuizhong = new List<ProjectfasongxiaoxiDTO>(); //鏌ヨ闇�瑕佸彂閫丄pp娑堟伅鐨勫鎴� foreach (var projectfasongxiaoxiDTO1 in projectfasongxiaoxiDTOsapp) { @@ -934,7 +1181,40 @@ projectfasongxiaoxiDTO1.Ywjl = cooperatecustomCustomer.Ywjl; projectfasongxiaoxiDTO1.KhId = cooperatecustomCustomer.Id; projectfasongxiaoxiDTO1.HuiyuanId = cooperatecustomCustomer.HuiyuanId; + projectfasongxiaoxiDTOsappzuizhong.Add(projectfasongxiaoxiDTO1); + //鏌ヨ璇ヤ紒涓氫笅鐨勫叾浠栦汉鍛� + var customerGuanlianhuiyuansqita = customerGuanlianhuiyuans.Where(x => x.Customerid == cooperatecustomCustomer.Id && x.Huiyuanid != cooperatecustomCustomer.HuiyuanId).ToList(); + if (customerGuanlianhuiyuansqita != null && customerGuanlianhuiyuansqita.Count > 0) + { + var huiyuanids = new List<Guid>(); + foreach (var customerGuanlianhuiyuan in customerGuanlianhuiyuansqita) + { + huiyuanids.Add(Guid.Parse(customerGuanlianhuiyuan.Huiyuanid)); + } + var frameworkUsers1 = frameworkUsers.Where(x => huiyuanids.Contains(x.Id)).ToList(); + if (frameworkUsers1 != null && frameworkUsers1.Count > 0) + { + foreach (var frameworkUser in frameworkUsers1) + { + var projectfasongxiaoxiDTO = new ProjectfasongxiaoxiDTO(); + projectfasongxiaoxiDTO.ProjectId = projectfasongxiaoxiDTO1.ProjectId; + projectfasongxiaoxiDTO.ProjectmingxiId = projectfasongxiaoxiDTO1.ProjectmingxiId; + projectfasongxiaoxiDTO.Xiaoxileixing = projectfasongxiaoxiDTO1.Xiaoxileixing; + projectfasongxiaoxiDTO.Xiaoxizhonglei = projectfasongxiaoxiDTO1.Xiaoxizhonglei; + projectfasongxiaoxiDTO.RecStatus = projectfasongxiaoxiDTO1.RecStatus; + projectfasongxiaoxiDTO.Createtime = projectfasongxiaoxiDTO1.Createtime; + projectfasongxiaoxiDTO.Gyszl = projectfasongxiaoxiDTO1.Gyszl; + projectfasongxiaoxiDTO.Khname = projectfasongxiaoxiDTO1.Khname; + projectfasongxiaoxiDTO.Tel = frameworkUser.Itcode; + projectfasongxiaoxiDTO.Ywjl = projectfasongxiaoxiDTO1.Ywjl; + projectfasongxiaoxiDTO.KhId = projectfasongxiaoxiDTO1.KhId; + projectfasongxiaoxiDTO.HuiyuanId = frameworkUser.Id.ToString().ToLower(); + projectfasongxiaoxiDTO.Projectname = projectfasongxiaoxiDTO1.Projectname; + projectfasongxiaoxiDTOsappzuizhong.Add(projectfasongxiaoxiDTO); + } + } + } } } else @@ -950,106 +1230,46 @@ projectfasongxiaoxiDTO1.Ywjl = intentionCustomer.Ywjl; projectfasongxiaoxiDTO1.KhId = intentionCustomer.Id; projectfasongxiaoxiDTO1.HuiyuanId = intentionCustomer.HuiyuanId; - } - } + projectfasongxiaoxiDTOsappzuizhong.Add(projectfasongxiaoxiDTO1); - - //鎺ㄩ�丄pp - foreach (var ywjl in Ywjl) - { - - var projectfasongxiaoxisywjl = projectfasongxiaoxiDTOsapp.Where(x => x.Ywjl == ywjl.Id && x.Tel != null && x.Tel.StartsWith("1")).ToList(); - - - for (int i = 0; i < projectfasongxiaoxisywjl.Count; i++) - { - string conment = "{" - + "\"title\": \"鏀块噰鍜ㄨ鍏徃涓撲笟鈥滄爣涔︽鏌モ�濄�佲�滄爣涔︽寚瀵尖�漒"," - + "\"content\": \"鏀块噰鍜ㄨ鍏徃涓撲笟鈥滄爣涔︽鏌モ�濄�佲�滄爣涔︽寚瀵尖�濓紝閫�浼戣祫娣辫瘎瀹′笓瀹跺湪寮�鏍囧墠鎸夌収璇勬爣娴佺▼涓烘偍浜ゅ弶妫�鏌ャ�佹寚瀵兼爣涔︼紝璁╄瘎瀹′笓瀹舵壘涓嶅嚭涓昏鏂规鎵e垎鐞嗙敱锛屽鏋滄偍鍦ㄥ弬鍔犫��" + projectfasongxiaoxisywjl[i].Projectname + "鈥濇姇鏍囧墠鎵炬斂閲囧挩璇㈡鏌ユ爣涔︼紝鑷冲皯鎻愬崌璇勫寰楀垎5-8鍒嗭紝涔熻涓爣鐨勫氨鏄吹鍏徃銆備簡瑙h鎯呰鍜ㄨ锛�" + ywjl.Phone + " \"," - + "\"getui_alias\": \"" + projectfasongxiaoxisywjl[i].Tel + "\"," - + "\"payload\": {\"text\": \"鏀块噰鍜ㄨ鍏徃涓撲笟鈥滄爣涔︽鏌モ�濄�佲�滄爣涔︽寚瀵尖�濓紝閫�浼戣祫娣辫瘎瀹′笓瀹跺湪寮�鏍囧墠鎸夌収璇勬爣娴佺▼涓烘偍浜ゅ弶妫�鏌ャ�佹寚瀵兼爣涔︼紝璁╄瘎瀹′笓瀹舵壘涓嶅嚭涓昏鏂规鎵e垎鐞嗙敱锛屽鏋滄偍鍦ㄥ弬鍔犫��" + projectfasongxiaoxisywjl[i].Projectname + "鈥濇姇鏍囧墠鎵炬斂閲囧挩璇㈡鏌ユ爣涔︼紝鑷冲皯鎻愬崌璇勫寰楀垎5-8鍒嗭紝涔熻涓爣鐨勫氨鏄吹鍏徃銆備簡瑙h鎯呰鍜ㄨ锛�" + ywjl.Phone + " \"}," - + "\"force_notification\": true" - + "}"; - - string result2 = SMSHelper.PushApp(conment); - _logger.LogInformation("result2:" + result2); - JObject jobjectresult = (JObject)JsonConvert.DeserializeObject(result2); - - if (jobjectresult["code"] != null && jobjectresult["code"].ToString() == "1") + //鏌ヨ璇ヤ紒涓氫笅鐨勫叾浠栦汉鍛� + var customerGuanlianhuiyuansqita = customerGuanlianhuiyuans.Where(x => x.Customerid == intentionCustomer.Id && x.Huiyuanid != intentionCustomer.HuiyuanId).ToList(); + if (customerGuanlianhuiyuansqita != null && customerGuanlianhuiyuansqita.Count > 0) { - var isOK = jobjectresult["isOK"].ToString(); - - - if (isOK.IndexOf(projectfasongxiaoxisywjl[i].Tel) >= 0) + var huiyuanids = new List<Guid>(); + foreach (var customerGuanlianhuiyuan in customerGuanlianhuiyuansqita) { - var projectfasongxiaoxi = new Projectfasongxiaoxi(); - projectfasongxiaoxi.Id = Guid.NewGuid().ToString(); - projectfasongxiaoxi.ProjectmingxiId = projectfasongxiaoxisywjl[i].ProjectmingxiId; - projectfasongxiaoxi.Xiaoxileixing = projectfasongxiaoxisywjl[i].Xiaoxileixing; - projectfasongxiaoxi.Xiaoxizhonglei = projectfasongxiaoxisywjl[i].Xiaoxizhonglei; - projectfasongxiaoxi.Gyszl = projectfasongxiaoxisywjl[i].Gyszl; - projectfasongxiaoxi.Khname = projectfasongxiaoxisywjl[i].Khname; - projectfasongxiaoxi.RecStatus = "A"; - projectfasongxiaoxi.Createtime = DateTime.Now; - _context.Projectfasongxiaoxis.Add(projectfasongxiaoxi); + huiyuanids.Add(Guid.Parse(customerGuanlianhuiyuan.Huiyuanid)); } - } - _context.SaveChanges(); - _logger.LogInformation(ywjl.UserName + "鎺ㄩ�乤pp缁欏鎴�" + projectfasongxiaoxisywjl[i].Khname); - - } - } - //涓氬姟缁忕悊涓虹┖ - if (true) - { - var projectfasongxiaoxisywjl = projectfasongxiaoxiDTOsapp.Where(x => x.Ywjl == null && x.Tel != null && x.Tel.StartsWith("1")).ToList(); - - for (int i = 0; i < projectfasongxiaoxisywjl.Count; i++) - { - string conment = "{" - + "\"title\": \"鏀块噰鍜ㄨ鍏徃涓撲笟鈥滄爣涔︽鏌モ�濄�佲�滄爣涔︽寚瀵尖�漒"," - + "\"content\": \"鏀块噰鍜ㄨ鍏徃涓撲笟鈥滄爣涔︽鏌モ�濄�佲�滄爣涔︽寚瀵尖�濓紝閫�浼戣祫娣辫瘎瀹′笓瀹跺湪寮�鏍囧墠鎸夌収璇勬爣娴佺▼涓烘偍浜ゅ弶妫�鏌ャ�佹寚瀵兼爣涔︼紝璁╄瘎瀹′笓瀹舵壘涓嶅嚭涓昏鏂规鎵e垎鐞嗙敱锛屽鏋滄偍鍦ㄥ弬鍔犫��" + projectfasongxiaoxisywjl[i].Projectname + "鈥濇姇鏍囧墠鎵炬斂閲囧挩璇㈡鏌ユ爣涔︼紝鑷冲皯鎻愬崌璇勫寰楀垎5-8鍒嗭紝涔熻涓爣鐨勫氨鏄吹鍏徃銆備簡瑙h鎯呰鍜ㄨ锛�400-028-8080 \"," - + "\"getui_alias\": \"" + projectfasongxiaoxisywjl[i].Tel + "\"," - + "\"payload\": {\"text\": \"鏀块噰鍜ㄨ鍏徃涓撲笟鈥滄爣涔︽鏌モ�濄�佲�滄爣涔︽寚瀵尖�濓紝閫�浼戣祫娣辫瘎瀹′笓瀹跺湪寮�鏍囧墠鎸夌収璇勬爣娴佺▼涓烘偍浜ゅ弶妫�鏌ャ�佹寚瀵兼爣涔︼紝璁╄瘎瀹′笓瀹舵壘涓嶅嚭涓昏鏂规鎵e垎鐞嗙敱锛屽鏋滄偍鍦ㄥ弬鍔犫��" + projectfasongxiaoxisywjl[i].Projectname + "鈥濇姇鏍囧墠鎵炬斂閲囧挩璇㈡鏌ユ爣涔︼紝鑷冲皯鎻愬崌璇勫寰楀垎5-8鍒嗭紝涔熻涓爣鐨勫氨鏄吹鍏徃銆備簡瑙h鎯呰鍜ㄨ锛�400-028-8080 \"}," - + "\"force_notification\": true" - + "}"; - - string result2 = SMSHelper.PushApp(conment); - _logger.LogInformation("result2:" + result2); - JObject jobjectresult = (JObject)JsonConvert.DeserializeObject(result2); - - if (jobjectresult["code"] != null && jobjectresult["code"].ToString() == "1") + var frameworkUsers1 = frameworkUsers.Where(x => huiyuanids.Contains(x.Id)).ToList(); + if (frameworkUsers1 != null && frameworkUsers1.Count > 0) { - var isOK = jobjectresult["isOK"].ToString(); - - - if (isOK.IndexOf(projectfasongxiaoxisywjl[i].Tel) >= 0) + foreach (var frameworkUser in frameworkUsers1) { - var projectfasongxiaoxi = new Projectfasongxiaoxi(); - projectfasongxiaoxi.Id = Guid.NewGuid().ToString(); - projectfasongxiaoxi.ProjectmingxiId = projectfasongxiaoxisywjl[i].ProjectmingxiId; - projectfasongxiaoxi.Xiaoxileixing = projectfasongxiaoxisywjl[i].Xiaoxileixing; - projectfasongxiaoxi.Xiaoxizhonglei = projectfasongxiaoxisywjl[i].Xiaoxizhonglei; - projectfasongxiaoxi.Gyszl = projectfasongxiaoxisywjl[i].Gyszl; - projectfasongxiaoxi.Khname = projectfasongxiaoxisywjl[i].Khname; - projectfasongxiaoxi.RecStatus = "A"; - projectfasongxiaoxi.Createtime = DateTime.Now; - _context.Projectfasongxiaoxis.Add(projectfasongxiaoxi); + var projectfasongxiaoxiDTO = new ProjectfasongxiaoxiDTO(); + projectfasongxiaoxiDTO.ProjectId = projectfasongxiaoxiDTO1.ProjectId; + projectfasongxiaoxiDTO.ProjectmingxiId = projectfasongxiaoxiDTO1.ProjectmingxiId; + projectfasongxiaoxiDTO.Xiaoxileixing = projectfasongxiaoxiDTO1.Xiaoxileixing; + projectfasongxiaoxiDTO.Xiaoxizhonglei = projectfasongxiaoxiDTO1.Xiaoxizhonglei; + projectfasongxiaoxiDTO.RecStatus = projectfasongxiaoxiDTO1.RecStatus; + projectfasongxiaoxiDTO.Createtime = projectfasongxiaoxiDTO1.Createtime; + projectfasongxiaoxiDTO.Gyszl = projectfasongxiaoxiDTO1.Gyszl; + projectfasongxiaoxiDTO.Khname = projectfasongxiaoxiDTO1.Khname; + projectfasongxiaoxiDTO.Tel = frameworkUser.Itcode; + projectfasongxiaoxiDTO.Ywjl = projectfasongxiaoxiDTO1.Ywjl; + projectfasongxiaoxiDTO.KhId = projectfasongxiaoxiDTO1.KhId; + projectfasongxiaoxiDTO.HuiyuanId = frameworkUser.Id.ToString().ToLower(); + projectfasongxiaoxiDTO.Projectname = projectfasongxiaoxiDTO1.Projectname; + projectfasongxiaoxiDTOsappzuizhong.Add(projectfasongxiaoxiDTO); } } - _context.SaveChanges(); - _logger.LogInformation( "鏃犱笟鍔$粡鐞嗘帹閫乤pp缁欏鎴�" + projectfasongxiaoxisywjl[i].Khname); - } - + } } - - - //鍙戦�佺煭淇� foreach (var ywjl in Ywjl) { - var projectfasongxiaoxisywjl = projectfasongxiaoxiDTOsduanxin.Where(x => x.Ywjl == ywjl.Id && x.Tel != null && x.Tel.StartsWith("1")).ToList(); + var projectfasongxiaoxisywjl = projectfasongxiaoxiDTOsduanxinzuizhong.Where(x => x.Ywjl == ywjl.Id && x.Tel != null && x.Tel.StartsWith("1")).ToList(); if (projectfasongxiaoxisywjl.Count >= 100) { int j = 0; @@ -1118,7 +1338,7 @@ //涓氬姟缁忕悊涓虹┖ if (true) { - var projectfasongxiaoxisywjl = projectfasongxiaoxiDTOsduanxin.Where(x => x.Ywjl == null && x.Tel != null && x.Tel.StartsWith("1")).ToList(); + var projectfasongxiaoxisywjl = projectfasongxiaoxiDTOsduanxinzuizhong.Where(x => x.Ywjl == null && x.Tel != null && x.Tel.StartsWith("1")).ToList(); if (projectfasongxiaoxisywjl.Count >= 100) { int j = 0; @@ -1182,6 +1402,100 @@ } } + //鎺ㄩ�丄pp + foreach (var ywjl in Ywjl) + { + + var projectfasongxiaoxisywjl = projectfasongxiaoxiDTOsappzuizhong.Where(x => x.Ywjl == ywjl.Id && x.Tel != null && x.Tel.StartsWith("1")).ToList(); + + + for (int i = 0; i < projectfasongxiaoxisywjl.Count; i++) + { + string conment = "{" + + "\"title\": \"鏀块噰鍜ㄨ鍏徃涓撲笟鈥滄爣涔︽鏌モ�濄�佲�滄爣涔︽寚瀵尖�漒"," + + "\"content\": \"鏀块噰鍜ㄨ鍏徃涓撲笟鈥滄爣涔︽鏌モ�濄�佲�滄爣涔︽寚瀵尖�濓紝閫�浼戣祫娣辫瘎瀹′笓瀹跺湪寮�鏍囧墠鎸夌収璇勬爣娴佺▼涓烘偍浜ゅ弶妫�鏌ャ�佹寚瀵兼爣涔︼紝璁╄瘎瀹′笓瀹舵壘涓嶅嚭涓昏鏂规鎵e垎鐞嗙敱锛屽鏋滄偍鍦ㄥ弬鍔犫��" + projectfasongxiaoxisywjl[i].Projectname + "鈥濇姇鏍囧墠鎵炬斂閲囧挩璇㈡鏌ユ爣涔︼紝鑷冲皯鎻愬崌璇勫寰楀垎5-8鍒嗭紝涔熻涓爣鐨勫氨鏄吹鍏徃銆備簡瑙h鎯呰鍜ㄨ锛�" + ywjl.Phone + " \"," + + "\"getui_alias\": \"" + projectfasongxiaoxisywjl[i].Tel + "\"," + + "\"payload\": {\"text\": \"鏀块噰鍜ㄨ鍏徃涓撲笟鈥滄爣涔︽鏌モ�濄�佲�滄爣涔︽寚瀵尖�濓紝閫�浼戣祫娣辫瘎瀹′笓瀹跺湪寮�鏍囧墠鎸夌収璇勬爣娴佺▼涓烘偍浜ゅ弶妫�鏌ャ�佹寚瀵兼爣涔︼紝璁╄瘎瀹′笓瀹舵壘涓嶅嚭涓昏鏂规鎵e垎鐞嗙敱锛屽鏋滄偍鍦ㄥ弬鍔犫��" + projectfasongxiaoxisywjl[i].Projectname + "鈥濇姇鏍囧墠鎵炬斂閲囧挩璇㈡鏌ユ爣涔︼紝鑷冲皯鎻愬崌璇勫寰楀垎5-8鍒嗭紝涔熻涓爣鐨勫氨鏄吹鍏徃銆備簡瑙h鎯呰鍜ㄨ锛�" + ywjl.Phone + " \"}," + + "\"force_notification\": true" + + "}"; + + string result2 = SMSHelper.PushApp(conment); + _logger.LogInformation("result2:" + result2); + JObject jobjectresult = (JObject)JsonConvert.DeserializeObject(result2); + + if (jobjectresult["code"] != null && jobjectresult["code"].ToString() == "1") + { + var isOK = jobjectresult["isOK"].ToString(); + + + if (isOK.IndexOf(projectfasongxiaoxisywjl[i].Tel) >= 0) + { + var projectfasongxiaoxi = new Projectfasongxiaoxi(); + projectfasongxiaoxi.Id = Guid.NewGuid().ToString(); + projectfasongxiaoxi.ProjectmingxiId = projectfasongxiaoxisywjl[i].ProjectmingxiId; + projectfasongxiaoxi.Xiaoxileixing = projectfasongxiaoxisywjl[i].Xiaoxileixing; + projectfasongxiaoxi.Xiaoxizhonglei = projectfasongxiaoxisywjl[i].Xiaoxizhonglei; + projectfasongxiaoxi.Gyszl = projectfasongxiaoxisywjl[i].Gyszl; + projectfasongxiaoxi.Khname = projectfasongxiaoxisywjl[i].Khname; + projectfasongxiaoxi.RecStatus = "A"; + projectfasongxiaoxi.Createtime = DateTime.Now; + _context.Projectfasongxiaoxis.Add(projectfasongxiaoxi); + } + } + _context.SaveChanges(); + _logger.LogInformation(ywjl.UserName + "鎺ㄩ�乤pp缁欏鎴�" + projectfasongxiaoxisywjl[i].Khname); + + } + } + //涓氬姟缁忕悊涓虹┖ + if (true) + { + var projectfasongxiaoxisywjl = projectfasongxiaoxiDTOsappzuizhong.Where(x => x.Ywjl == null && x.Tel != null && x.Tel.StartsWith("1")).ToList(); + + for (int i = 0; i < projectfasongxiaoxisywjl.Count; i++) + { + string conment = "{" + + "\"title\": \"鏀块噰鍜ㄨ鍏徃涓撲笟鈥滄爣涔︽鏌モ�濄�佲�滄爣涔︽寚瀵尖�漒"," + + "\"content\": \"鏀块噰鍜ㄨ鍏徃涓撲笟鈥滄爣涔︽鏌モ�濄�佲�滄爣涔︽寚瀵尖�濓紝閫�浼戣祫娣辫瘎瀹′笓瀹跺湪寮�鏍囧墠鎸夌収璇勬爣娴佺▼涓烘偍浜ゅ弶妫�鏌ャ�佹寚瀵兼爣涔︼紝璁╄瘎瀹′笓瀹舵壘涓嶅嚭涓昏鏂规鎵e垎鐞嗙敱锛屽鏋滄偍鍦ㄥ弬鍔犫��" + projectfasongxiaoxisywjl[i].Projectname + "鈥濇姇鏍囧墠鎵炬斂閲囧挩璇㈡鏌ユ爣涔︼紝鑷冲皯鎻愬崌璇勫寰楀垎5-8鍒嗭紝涔熻涓爣鐨勫氨鏄吹鍏徃銆備簡瑙h鎯呰鍜ㄨ锛�400-028-8080 \"," + + "\"getui_alias\": \"" + projectfasongxiaoxisywjl[i].Tel + "\"," + + "\"payload\": {\"text\": \"鏀块噰鍜ㄨ鍏徃涓撲笟鈥滄爣涔︽鏌モ�濄�佲�滄爣涔︽寚瀵尖�濓紝閫�浼戣祫娣辫瘎瀹′笓瀹跺湪寮�鏍囧墠鎸夌収璇勬爣娴佺▼涓烘偍浜ゅ弶妫�鏌ャ�佹寚瀵兼爣涔︼紝璁╄瘎瀹′笓瀹舵壘涓嶅嚭涓昏鏂规鎵e垎鐞嗙敱锛屽鏋滄偍鍦ㄥ弬鍔犫��" + projectfasongxiaoxisywjl[i].Projectname + "鈥濇姇鏍囧墠鎵炬斂閲囧挩璇㈡鏌ユ爣涔︼紝鑷冲皯鎻愬崌璇勫寰楀垎5-8鍒嗭紝涔熻涓爣鐨勫氨鏄吹鍏徃銆備簡瑙h鎯呰鍜ㄨ锛�400-028-8080 \"}," + + "\"force_notification\": true" + + "}"; + + string result2 = SMSHelper.PushApp(conment); + _logger.LogInformation("result2:" + result2); + JObject jobjectresult = (JObject)JsonConvert.DeserializeObject(result2); + + if (jobjectresult["code"] != null && jobjectresult["code"].ToString() == "1") + { + var isOK = jobjectresult["isOK"].ToString(); + + + if (isOK.IndexOf(projectfasongxiaoxisywjl[i].Tel) >= 0) + { + var projectfasongxiaoxi = new Projectfasongxiaoxi(); + projectfasongxiaoxi.Id = Guid.NewGuid().ToString(); + projectfasongxiaoxi.ProjectmingxiId = projectfasongxiaoxisywjl[i].ProjectmingxiId; + projectfasongxiaoxi.Xiaoxileixing = projectfasongxiaoxisywjl[i].Xiaoxileixing; + projectfasongxiaoxi.Xiaoxizhonglei = projectfasongxiaoxisywjl[i].Xiaoxizhonglei; + projectfasongxiaoxi.Gyszl = projectfasongxiaoxisywjl[i].Gyszl; + projectfasongxiaoxi.Khname = projectfasongxiaoxisywjl[i].Khname; + projectfasongxiaoxi.RecStatus = "A"; + projectfasongxiaoxi.Createtime = DateTime.Now; + _context.Projectfasongxiaoxis.Add(projectfasongxiaoxi); + } + } + _context.SaveChanges(); + _logger.LogInformation( "鏃犱笟鍔$粡鐞嗘帹閫乤pp缁欏鎴�" + projectfasongxiaoxisywjl[i].Khname); + + } + + } + + + + + } catch (Exception ex) { @@ -1204,7 +1518,7 @@ { fbprojiectid.Add(project.Id); } - var fbprojectzhongbiaos = _context.Projectzhongbiaos.Where(x => fbprojiectid.Contains(x.ProjectId)).ToList(); + var fbprojectzhongbiaos = projectzhongbiaos.Where(x => fbprojiectid.Contains(x.ProjectId)).ToList(); var projectfasongxiaoxiDTOsduanxin = new List<ProjectfasongxiaoxiDTO>(); @@ -1260,6 +1574,7 @@ } + var projectfasongxiaoxiDTOsduanxinzuizhong = new List<ProjectfasongxiaoxiDTO>(); //鏌ヨ闇�瑕佸彂閫佺煭淇$殑瀹㈡埛 foreach (var projectfasongxiaoxiDTO1 in projectfasongxiaoxiDTOsduanxin) { @@ -1281,6 +1596,44 @@ projectfasongxiaoxiDTO1.Ywjl = cooperatecustomCustomer.Ywjl; projectfasongxiaoxiDTO1.KhId = cooperatecustomCustomer.Id; projectfasongxiaoxiDTO1.HuiyuanId = cooperatecustomCustomer.HuiyuanId; + projectfasongxiaoxiDTOsduanxinzuizhong.Add(projectfasongxiaoxiDTO1); + + //鏌ヨ璇ヤ紒涓氫笅鐨勫叾浠栦汉鍛� + var customerGuanlianhuiyuansqita = customerGuanlianhuiyuans.Where(x => x.Customerid == cooperatecustomCustomer.Id && x.Huiyuanid != cooperatecustomCustomer.HuiyuanId).ToList(); + if (customerGuanlianhuiyuansqita != null && customerGuanlianhuiyuansqita.Count > 0) + { + var huiyuanids = new List<Guid>(); + foreach (var customerGuanlianhuiyuan in customerGuanlianhuiyuansqita) + { + huiyuanids.Add(Guid.Parse(customerGuanlianhuiyuan.Huiyuanid)); + } + var frameworkUsers1 = frameworkUsers.Where(x => huiyuanids.Contains(x.Id)).ToList(); + if (frameworkUsers1 != null && frameworkUsers1.Count > 0) + { + foreach (var frameworkUser in frameworkUsers1) + { + var projectfasongxiaoxiDTO = new ProjectfasongxiaoxiDTO(); + projectfasongxiaoxiDTO.ProjectId = projectfasongxiaoxiDTO1.ProjectId; + projectfasongxiaoxiDTO.ProjectmingxiId = projectfasongxiaoxiDTO1.ProjectmingxiId; + projectfasongxiaoxiDTO.Xiaoxileixing = projectfasongxiaoxiDTO1.Xiaoxileixing; + projectfasongxiaoxiDTO.Xiaoxizhonglei = projectfasongxiaoxiDTO1.Xiaoxizhonglei; + projectfasongxiaoxiDTO.RecStatus = projectfasongxiaoxiDTO1.RecStatus; + projectfasongxiaoxiDTO.Createtime = projectfasongxiaoxiDTO1.Createtime; + projectfasongxiaoxiDTO.Gyszl = projectfasongxiaoxiDTO1.Gyszl; + projectfasongxiaoxiDTO.Khname = projectfasongxiaoxiDTO1.Khname; + projectfasongxiaoxiDTO.Tel = frameworkUser.Itcode; + projectfasongxiaoxiDTO.Ywjl = projectfasongxiaoxiDTO1.Ywjl; + projectfasongxiaoxiDTO.KhId = projectfasongxiaoxiDTO1.KhId; + projectfasongxiaoxiDTO.HuiyuanId = frameworkUser.Id.ToString().ToLower(); + projectfasongxiaoxiDTO.Projectname = projectfasongxiaoxiDTO1.Projectname; + projectfasongxiaoxiDTOsduanxinzuizhong.Add(projectfasongxiaoxiDTO); + } + } + } + + + + } } @@ -1297,9 +1650,44 @@ projectfasongxiaoxiDTO1.Ywjl = intentionCustomer.Ywjl; projectfasongxiaoxiDTO1.KhId = intentionCustomer.Id; projectfasongxiaoxiDTO1.HuiyuanId = intentionCustomer.HuiyuanId; + projectfasongxiaoxiDTOsduanxinzuizhong.Add(projectfasongxiaoxiDTO1); + + //鏌ヨ璇ヤ紒涓氫笅鐨勫叾浠栦汉鍛� + var customerGuanlianhuiyuansqita = customerGuanlianhuiyuans.Where(x => x.Customerid == intentionCustomer.Id && x.Huiyuanid != intentionCustomer.HuiyuanId).ToList(); + if (customerGuanlianhuiyuansqita != null && customerGuanlianhuiyuansqita.Count > 0) + { + var huiyuanids = new List<Guid>(); + foreach (var customerGuanlianhuiyuan in customerGuanlianhuiyuansqita) + { + huiyuanids.Add(Guid.Parse(customerGuanlianhuiyuan.Huiyuanid)); + } + var frameworkUsers1 = frameworkUsers.Where(x => huiyuanids.Contains(x.Id)).ToList(); + if (frameworkUsers1 != null && frameworkUsers1.Count > 0) + { + foreach (var frameworkUser in frameworkUsers1) + { + var projectfasongxiaoxiDTO = new ProjectfasongxiaoxiDTO(); + projectfasongxiaoxiDTO.ProjectId = projectfasongxiaoxiDTO1.ProjectId; + projectfasongxiaoxiDTO.ProjectmingxiId = projectfasongxiaoxiDTO1.ProjectmingxiId; + projectfasongxiaoxiDTO.Xiaoxileixing = projectfasongxiaoxiDTO1.Xiaoxileixing; + projectfasongxiaoxiDTO.Xiaoxizhonglei = projectfasongxiaoxiDTO1.Xiaoxizhonglei; + projectfasongxiaoxiDTO.RecStatus = projectfasongxiaoxiDTO1.RecStatus; + projectfasongxiaoxiDTO.Createtime = projectfasongxiaoxiDTO1.Createtime; + projectfasongxiaoxiDTO.Gyszl = projectfasongxiaoxiDTO1.Gyszl; + projectfasongxiaoxiDTO.Khname = projectfasongxiaoxiDTO1.Khname; + projectfasongxiaoxiDTO.Tel = frameworkUser.Itcode; + projectfasongxiaoxiDTO.Ywjl = projectfasongxiaoxiDTO1.Ywjl; + projectfasongxiaoxiDTO.KhId = projectfasongxiaoxiDTO1.KhId; + projectfasongxiaoxiDTO.HuiyuanId = frameworkUser.Id.ToString().ToLower(); + projectfasongxiaoxiDTO.Projectname = projectfasongxiaoxiDTO1.Projectname; + projectfasongxiaoxiDTOsduanxinzuizhong.Add(projectfasongxiaoxiDTO); + } + } + } } } + var projectfasongxiaoxiDTOsappzuizhong = new List<ProjectfasongxiaoxiDTO>(); //鏌ヨ闇�瑕佸彂閫丄pp娑堟伅鐨勫鎴� foreach (var projectfasongxiaoxiDTO1 in projectfasongxiaoxiDTOsapp) { @@ -1321,7 +1709,40 @@ projectfasongxiaoxiDTO1.Ywjl = cooperatecustomCustomer.Ywjl; projectfasongxiaoxiDTO1.KhId = cooperatecustomCustomer.Id; projectfasongxiaoxiDTO1.HuiyuanId = cooperatecustomCustomer.HuiyuanId; + projectfasongxiaoxiDTOsappzuizhong.Add(projectfasongxiaoxiDTO1); + //鏌ヨ璇ヤ紒涓氫笅鐨勫叾浠栦汉鍛� + var customerGuanlianhuiyuansqita = customerGuanlianhuiyuans.Where(x => x.Customerid == cooperatecustomCustomer.Id && x.Huiyuanid != cooperatecustomCustomer.HuiyuanId).ToList(); + if (customerGuanlianhuiyuansqita != null && customerGuanlianhuiyuansqita.Count > 0) + { + var huiyuanids = new List<Guid>(); + foreach (var customerGuanlianhuiyuan in customerGuanlianhuiyuansqita) + { + huiyuanids.Add(Guid.Parse(customerGuanlianhuiyuan.Huiyuanid)); + } + var frameworkUsers1 = frameworkUsers.Where(x => huiyuanids.Contains(x.Id)).ToList(); + if (frameworkUsers1 != null && frameworkUsers1.Count > 0) + { + foreach (var frameworkUser in frameworkUsers1) + { + var projectfasongxiaoxiDTO = new ProjectfasongxiaoxiDTO(); + projectfasongxiaoxiDTO.ProjectId = projectfasongxiaoxiDTO1.ProjectId; + projectfasongxiaoxiDTO.ProjectmingxiId = projectfasongxiaoxiDTO1.ProjectmingxiId; + projectfasongxiaoxiDTO.Xiaoxileixing = projectfasongxiaoxiDTO1.Xiaoxileixing; + projectfasongxiaoxiDTO.Xiaoxizhonglei = projectfasongxiaoxiDTO1.Xiaoxizhonglei; + projectfasongxiaoxiDTO.RecStatus = projectfasongxiaoxiDTO1.RecStatus; + projectfasongxiaoxiDTO.Createtime = projectfasongxiaoxiDTO1.Createtime; + projectfasongxiaoxiDTO.Gyszl = projectfasongxiaoxiDTO1.Gyszl; + projectfasongxiaoxiDTO.Khname = projectfasongxiaoxiDTO1.Khname; + projectfasongxiaoxiDTO.Tel = frameworkUser.Itcode; + projectfasongxiaoxiDTO.Ywjl = projectfasongxiaoxiDTO1.Ywjl; + projectfasongxiaoxiDTO.KhId = projectfasongxiaoxiDTO1.KhId; + projectfasongxiaoxiDTO.HuiyuanId = frameworkUser.Id.ToString().ToLower(); + projectfasongxiaoxiDTO.Projectname = projectfasongxiaoxiDTO1.Projectname; + projectfasongxiaoxiDTOsappzuizhong.Add(projectfasongxiaoxiDTO); + } + } + } } } else @@ -1337,170 +1758,47 @@ projectfasongxiaoxiDTO1.Ywjl = intentionCustomer.Ywjl; projectfasongxiaoxiDTO1.KhId = intentionCustomer.Id; projectfasongxiaoxiDTO1.HuiyuanId = intentionCustomer.HuiyuanId; + projectfasongxiaoxiDTOsappzuizhong.Add(projectfasongxiaoxiDTO1); + + //鏌ヨ璇ヤ紒涓氫笅鐨勫叾浠栦汉鍛� + var customerGuanlianhuiyuansqita = customerGuanlianhuiyuans.Where(x => x.Customerid == intentionCustomer.Id && x.Huiyuanid != intentionCustomer.HuiyuanId).ToList(); + if (customerGuanlianhuiyuansqita != null && customerGuanlianhuiyuansqita.Count > 0) + { + var huiyuanids = new List<Guid>(); + foreach (var customerGuanlianhuiyuan in customerGuanlianhuiyuansqita) + { + huiyuanids.Add(Guid.Parse(customerGuanlianhuiyuan.Huiyuanid)); + } + var frameworkUsers1 = frameworkUsers.Where(x => huiyuanids.Contains(x.Id)).ToList(); + if (frameworkUsers1 != null && frameworkUsers1.Count > 0) + { + foreach (var frameworkUser in frameworkUsers1) + { + var projectfasongxiaoxiDTO = new ProjectfasongxiaoxiDTO(); + projectfasongxiaoxiDTO.ProjectId = projectfasongxiaoxiDTO1.ProjectId; + projectfasongxiaoxiDTO.ProjectmingxiId = projectfasongxiaoxiDTO1.ProjectmingxiId; + projectfasongxiaoxiDTO.Xiaoxileixing = projectfasongxiaoxiDTO1.Xiaoxileixing; + projectfasongxiaoxiDTO.Xiaoxizhonglei = projectfasongxiaoxiDTO1.Xiaoxizhonglei; + projectfasongxiaoxiDTO.RecStatus = projectfasongxiaoxiDTO1.RecStatus; + projectfasongxiaoxiDTO.Createtime = projectfasongxiaoxiDTO1.Createtime; + projectfasongxiaoxiDTO.Gyszl = projectfasongxiaoxiDTO1.Gyszl; + projectfasongxiaoxiDTO.Khname = projectfasongxiaoxiDTO1.Khname; + projectfasongxiaoxiDTO.Tel = frameworkUser.Itcode; + projectfasongxiaoxiDTO.Ywjl = projectfasongxiaoxiDTO1.Ywjl; + projectfasongxiaoxiDTO.KhId = projectfasongxiaoxiDTO1.KhId; + projectfasongxiaoxiDTO.HuiyuanId = frameworkUser.Id.ToString().ToLower(); + projectfasongxiaoxiDTO.Projectname = projectfasongxiaoxiDTO1.Projectname; + projectfasongxiaoxiDTOsappzuizhong.Add(projectfasongxiaoxiDTO); + } + } + } } } - - - //鎺ㄩ�丄pp - foreach (var ywjl in Ywjl) - { - - var projectfasongxiaoxisywjl = projectfasongxiaoxiDTOsapp.Where(x => x.Ywjl == ywjl.Id && x.Tel != null && x.Tel.StartsWith("1")).ToList(); - int j = 0; - while (j * 1000 <= projectfasongxiaoxisywjl.Count) - { - j = j + 1; - string numberstring = ""; - string customename = ""; - if (projectfasongxiaoxisywjl != null && projectfasongxiaoxisywjl.Count > 0) - { - int countt = (j * 1000); - if (countt > projectfasongxiaoxisywjl.Count) - { - countt = projectfasongxiaoxisywjl.Count; - } - - for (int i = 0; i < countt; i++) - { - if (numberstring.IndexOf(projectfasongxiaoxisywjl[i + j - 1].Tel) >= 0) - { - continue; - } - numberstring += "\"" + projectfasongxiaoxisywjl[i + j - 1].Tel + "\","; - customename += projectfasongxiaoxisywjl[i + j - 1].Khname + ","; - - } - } - - if (numberstring.EndsWith(",")) - { - numberstring = numberstring.Substring(0, numberstring.Length - 1); - } - string conment = "{" - + "\"title\": \"鏀块噰鍜ㄨ鍏徃涓撲笟鈥滄爣涔︽鏌モ�濄�佲�滄爣涔︽寚瀵尖�漒"," - + "\"content\": \"鏀块噰鍜ㄨ鍏徃涓撲笟鈥滄爣涔︽鏌モ�濄�佲�滄爣涔︽寚瀵尖�濓紝閫�浼戣祫娣辫瘎瀹′笓瀹跺湪寮�鏍囧墠鎸夌収璇勬爣娴佺▼涓烘偍浜ゅ弶妫�鏌ャ�佹寚瀵兼爣涔︼紝璁╄瘎瀹′笓瀹舵壘涓嶅嚭涓昏鏂规鎵e垎鐞嗙敱锛岃嚦灏戝姪鎮ㄦ彁鍗囩患鍚堣瘎瀹″緱鍒�5-10鍒嗐�備簡瑙h鎯呰鍜ㄨ锛�" + ywjl.Phone + " \"," - + "\"getui_alias\": [" + numberstring + "]," - + "\"payload\": {\"text\": \"鏀块噰鍜ㄨ鍏徃涓撲笟鈥滄爣涔︽鏌モ�濄�佲�滄爣涔︽寚瀵尖�濓紝閫�浼戣祫娣辫瘎瀹′笓瀹跺湪寮�鏍囧墠鎸夌収璇勬爣娴佺▼涓烘偍浜ゅ弶妫�鏌ャ�佹寚瀵兼爣涔︼紝璁╄瘎瀹′笓瀹舵壘涓嶅嚭涓昏鏂规鎵e垎鐞嗙敱锛岃嚦灏戝姪鎮ㄦ彁鍗囩患鍚堣瘎瀹″緱鍒�5-10鍒嗐�備簡瑙h鎯呰鍜ㄨ锛�" + ywjl.Phone + " \"}," - + "\"force_notification\": true" - + "}"; - - string result2 = SMSHelper.PushApp(conment); - _logger.LogInformation("result2:" + result2); - JObject jobjectresult = (JObject)JsonConvert.DeserializeObject(result2); - - if (jobjectresult["code"] != null && jobjectresult["code"].ToString() == "1") - { - var isOK = jobjectresult["isOK"].ToString(); - - foreach (var projectfasongxiaoDTO in projectfasongxiaoxisywjl) - { - if (isOK.IndexOf(projectfasongxiaoDTO.Tel) >= 0) - { - var projectfasongxiaoxi = new Projectfasongxiaoxi(); - projectfasongxiaoxi.Id = Guid.NewGuid().ToString(); - projectfasongxiaoxi.ProjectmingxiId = projectfasongxiaoDTO.ProjectmingxiId; - projectfasongxiaoxi.Xiaoxileixing = projectfasongxiaoDTO.Xiaoxileixing; - projectfasongxiaoxi.Xiaoxizhonglei = projectfasongxiaoDTO.Xiaoxizhonglei; - projectfasongxiaoxi.Gyszl = projectfasongxiaoDTO.Gyszl; - projectfasongxiaoxi.Khname = projectfasongxiaoDTO.Khname; - projectfasongxiaoxi.RecStatus = "A"; - projectfasongxiaoxi.Createtime = DateTime.Now; - _context.Projectfasongxiaoxis.Add(projectfasongxiaoxi); - } - } - _context.SaveChanges(); - } - - - - _logger.LogInformation(ywjl.UserName + "鎺ㄩ�乤pp缁欏鎴�" + customename); - } - - - - } - //涓氬姟缁忕悊涓虹┖ - if (true) - { - var projectfasongxiaoxisywjl = projectfasongxiaoxiDTOsapp.Where(x => x.Ywjl == null && x.Tel != null && x.Tel.StartsWith("1")).ToList(); - int j = 0; - while (j * 1000 <= projectfasongxiaoxisywjl.Count) - { - j = j + 1; - string numberstring = ""; - string customename = ""; - if (projectfasongxiaoxisywjl != null && projectfasongxiaoxisywjl.Count > 0) - { - int countt = (j * 1000); - if (countt > projectfasongxiaoxisywjl.Count) - { - countt = projectfasongxiaoxisywjl.Count; - } - - for (int i = 0; i < countt; i++) - { - if (numberstring.IndexOf(projectfasongxiaoxisywjl[i + j - 1].Tel) >= 0) - { - continue; - } - numberstring += "\"" + projectfasongxiaoxisywjl[i + j - 1].Tel + "\","; - customename += projectfasongxiaoxisywjl[i + j - 1].Khname + ","; - - } - } - - if (numberstring.EndsWith(",")) - { - numberstring = numberstring.Substring(0, numberstring.Length - 1); - } - string conment = "{" - + "\"title\": \"鏀块噰鍜ㄨ鍏徃涓撲笟鈥滄爣涔︽鏌モ�濄�佲�滄爣涔︽寚瀵尖�漒"," - + "\"content\": \"鏀块噰鍜ㄨ鍏徃涓撲笟鈥滄爣涔︽鏌モ�濄�佲�滄爣涔︽寚瀵尖�濓紝閫�浼戣祫娣辫瘎瀹′笓瀹跺湪寮�鏍囧墠鎸夌収璇勬爣娴佺▼涓烘偍浜ゅ弶妫�鏌ャ�佹寚瀵兼爣涔︼紝璁╄瘎瀹′笓瀹舵壘涓嶅嚭涓昏鏂规鎵e垎鐞嗙敱锛岃嚦灏戝姪鎮ㄦ彁鍗囩患鍚堣瘎瀹″緱鍒�5-10鍒嗐�備簡瑙h鎯呰鍜ㄨ锛�400-028-8080 \"," - + "\"getui_alias\": [" + numberstring + "]," - + "\"payload\": {\"text\": \"鏀块噰鍜ㄨ鍏徃涓撲笟鈥滄爣涔︽鏌モ�濄�佲�滄爣涔︽寚瀵尖�濓紝閫�浼戣祫娣辫瘎瀹′笓瀹跺湪寮�鏍囧墠鎸夌収璇勬爣娴佺▼涓烘偍浜ゅ弶妫�鏌ャ�佹寚瀵兼爣涔︼紝璁╄瘎瀹′笓瀹舵壘涓嶅嚭涓昏鏂规鎵e垎鐞嗙敱锛岃嚦灏戝姪鎮ㄦ彁鍗囩患鍚堣瘎瀹″緱鍒�5-10鍒嗐�備簡瑙h鎯呰鍜ㄨ锛�400-028-8080 \"}," - + "\"force_notification\": true" - + "}"; - - string result2 = SMSHelper.PushApp(conment); - _logger.LogInformation("result2:" + result2); - JObject jobjectresult = (JObject)JsonConvert.DeserializeObject(result2); - - if (jobjectresult["code"] != null && jobjectresult["code"].ToString() == "1") - { - var isOK = jobjectresult["isOK"].ToString(); - - foreach (var projectfasongxiaoDTO in projectfasongxiaoxisywjl) - { - if (isOK.IndexOf(projectfasongxiaoDTO.Tel) >= 0) - { - var projectfasongxiaoxi = new Projectfasongxiaoxi(); - projectfasongxiaoxi.Id = Guid.NewGuid().ToString(); - projectfasongxiaoxi.ProjectmingxiId = projectfasongxiaoDTO.ProjectmingxiId; - projectfasongxiaoxi.Xiaoxileixing = projectfasongxiaoDTO.Xiaoxileixing; - projectfasongxiaoxi.Xiaoxizhonglei = projectfasongxiaoDTO.Xiaoxizhonglei; - projectfasongxiaoxi.Gyszl = projectfasongxiaoDTO.Gyszl; - projectfasongxiaoxi.Khname = projectfasongxiaoDTO.Khname; - projectfasongxiaoxi.RecStatus = "A"; - projectfasongxiaoxi.Createtime = DateTime.Now; - _context.Projectfasongxiaoxis.Add(projectfasongxiaoxi); - } - } - _context.SaveChanges(); - } - - - - _logger.LogInformation( "鏃犱笟鍔$粡鐞嗘帹閫乤pp缁欏鎴�" + customename); - } - - } - - //鍙戦�佺煭淇� foreach (var ywjl in Ywjl) { - var projectfasongxiaoxisywjl = projectfasongxiaoxiDTOsduanxin.Where(x => x.Ywjl == ywjl.Id && x.Tel != null && x.Tel.StartsWith("1")).ToList(); + var projectfasongxiaoxisywjl = projectfasongxiaoxiDTOsduanxinzuizhong.Where(x => x.Ywjl == ywjl.Id && x.Tel != null && x.Tel.StartsWith("1")).ToList(); if (projectfasongxiaoxisywjl.Count >= 100) { int j = 0; @@ -1569,7 +1867,7 @@ //涓氬姟缁忕悊涓虹┖ if (true) { - var projectfasongxiaoxisywjl = projectfasongxiaoxiDTOsduanxin.Where(x => x.Ywjl == null && x.Tel != null && x.Tel.StartsWith("1")).ToList(); + var projectfasongxiaoxisywjl = projectfasongxiaoxiDTOsduanxinzuizhong.Where(x => x.Ywjl == null && x.Tel != null && x.Tel.StartsWith("1")).ToList(); if (projectfasongxiaoxisywjl.Count >= 100) { int j = 0; @@ -1633,6 +1931,172 @@ } } + //鎺ㄩ�丄pp + foreach (var ywjl in Ywjl) + { + + var projectfasongxiaoxisywjl = projectfasongxiaoxiDTOsappzuizhong.Where(x => x.Ywjl == ywjl.Id && x.Tel != null && x.Tel.StartsWith("1")).ToList(); + int j = 0; + while (j * 1000 <= projectfasongxiaoxisywjl.Count) + { + j = j + 1; + string numberstring = ""; + string customename = ""; + if (projectfasongxiaoxisywjl != null && projectfasongxiaoxisywjl.Count > 0) + { + int countt = (j * 1000); + if (countt > projectfasongxiaoxisywjl.Count) + { + countt = projectfasongxiaoxisywjl.Count; + } + + for (int i = 0; i < countt; i++) + { + if (numberstring.IndexOf(projectfasongxiaoxisywjl[i + j - 1].Tel) >= 0) + { + continue; + } + numberstring += "\"" + projectfasongxiaoxisywjl[i + j - 1].Tel + "\","; + customename += projectfasongxiaoxisywjl[i + j - 1].Khname + ","; + + } + } + + if (numberstring.EndsWith(",")) + { + numberstring = numberstring.Substring(0, numberstring.Length - 1); + } + if (string.IsNullOrEmpty(numberstring)) + { + continue; + } + string conment = "{" + + "\"title\": \"鏀块噰鍜ㄨ鍏徃涓撲笟鈥滄爣涔︽鏌モ�濄�佲�滄爣涔︽寚瀵尖�漒"," + + "\"content\": \"鏀块噰鍜ㄨ鍏徃涓撲笟鈥滄爣涔︽鏌モ�濄�佲�滄爣涔︽寚瀵尖�濓紝閫�浼戣祫娣辫瘎瀹′笓瀹跺湪寮�鏍囧墠鎸夌収璇勬爣娴佺▼涓烘偍浜ゅ弶妫�鏌ャ�佹寚瀵兼爣涔︼紝璁╄瘎瀹′笓瀹舵壘涓嶅嚭涓昏鏂规鎵e垎鐞嗙敱锛岃嚦灏戝姪鎮ㄦ彁鍗囩患鍚堣瘎瀹″緱鍒�5-10鍒嗐�備簡瑙h鎯呰鍜ㄨ锛�" + ywjl.Phone + " \"," + + "\"getui_alias\": [" + numberstring + "]," + + "\"payload\": {\"text\": \"鏀块噰鍜ㄨ鍏徃涓撲笟鈥滄爣涔︽鏌モ�濄�佲�滄爣涔︽寚瀵尖�濓紝閫�浼戣祫娣辫瘎瀹′笓瀹跺湪寮�鏍囧墠鎸夌収璇勬爣娴佺▼涓烘偍浜ゅ弶妫�鏌ャ�佹寚瀵兼爣涔︼紝璁╄瘎瀹′笓瀹舵壘涓嶅嚭涓昏鏂规鎵e垎鐞嗙敱锛岃嚦灏戝姪鎮ㄦ彁鍗囩患鍚堣瘎瀹″緱鍒�5-10鍒嗐�備簡瑙h鎯呰鍜ㄨ锛�" + ywjl.Phone + " \"}," + + "\"force_notification\": true" + + "}"; + + string result2 = SMSHelper.PushApp(conment); + _logger.LogInformation("result2:" + result2); + JObject jobjectresult = (JObject)JsonConvert.DeserializeObject(result2); + + if (jobjectresult["code"] != null && jobjectresult["code"].ToString() == "1") + { + var isOK = jobjectresult["isOK"].ToString(); + + foreach (var projectfasongxiaoDTO in projectfasongxiaoxisywjl) + { + if (isOK.IndexOf(projectfasongxiaoDTO.Tel) >= 0) + { + var projectfasongxiaoxi = new Projectfasongxiaoxi(); + projectfasongxiaoxi.Id = Guid.NewGuid().ToString(); + projectfasongxiaoxi.ProjectmingxiId = projectfasongxiaoDTO.ProjectmingxiId; + projectfasongxiaoxi.Xiaoxileixing = projectfasongxiaoDTO.Xiaoxileixing; + projectfasongxiaoxi.Xiaoxizhonglei = projectfasongxiaoDTO.Xiaoxizhonglei; + projectfasongxiaoxi.Gyszl = projectfasongxiaoDTO.Gyszl; + projectfasongxiaoxi.Khname = projectfasongxiaoDTO.Khname; + projectfasongxiaoxi.RecStatus = "A"; + projectfasongxiaoxi.Createtime = DateTime.Now; + _context.Projectfasongxiaoxis.Add(projectfasongxiaoxi); + } + } + _context.SaveChanges(); + } + + + + _logger.LogInformation(ywjl.UserName + "鎺ㄩ�乤pp缁欏鎴�" + customename); + } + + + + } + //涓氬姟缁忕悊涓虹┖ + if (true) + { + var projectfasongxiaoxisywjl = projectfasongxiaoxiDTOsappzuizhong.Where(x => x.Ywjl == null && x.Tel != null && x.Tel.StartsWith("1")).ToList(); + int j = 0; + while (j * 1000 <= projectfasongxiaoxisywjl.Count) + { + j = j + 1; + string numberstring = ""; + string customename = ""; + if (projectfasongxiaoxisywjl != null && projectfasongxiaoxisywjl.Count > 0) + { + int countt = (j * 1000); + if (countt > projectfasongxiaoxisywjl.Count) + { + countt = projectfasongxiaoxisywjl.Count; + } + + for (int i = 0; i < countt; i++) + { + if (numberstring.IndexOf(projectfasongxiaoxisywjl[i + j - 1].Tel) >= 0) + { + continue; + } + numberstring += "\"" + projectfasongxiaoxisywjl[i + j - 1].Tel + "\","; + customename += projectfasongxiaoxisywjl[i + j - 1].Khname + ","; + + } + } + + if (numberstring.EndsWith(",")) + { + numberstring = numberstring.Substring(0, numberstring.Length - 1); + } + if (string.IsNullOrEmpty(numberstring)) + { + continue; + } + string conment = "{" + + "\"title\": \"鏀块噰鍜ㄨ鍏徃涓撲笟鈥滄爣涔︽鏌モ�濄�佲�滄爣涔︽寚瀵尖�漒"," + + "\"content\": \"鏀块噰鍜ㄨ鍏徃涓撲笟鈥滄爣涔︽鏌モ�濄�佲�滄爣涔︽寚瀵尖�濓紝閫�浼戣祫娣辫瘎瀹′笓瀹跺湪寮�鏍囧墠鎸夌収璇勬爣娴佺▼涓烘偍浜ゅ弶妫�鏌ャ�佹寚瀵兼爣涔︼紝璁╄瘎瀹′笓瀹舵壘涓嶅嚭涓昏鏂规鎵e垎鐞嗙敱锛岃嚦灏戝姪鎮ㄦ彁鍗囩患鍚堣瘎瀹″緱鍒�5-10鍒嗐�備簡瑙h鎯呰鍜ㄨ锛�400-028-8080 \"," + + "\"getui_alias\": [" + numberstring + "]," + + "\"payload\": {\"text\": \"鏀块噰鍜ㄨ鍏徃涓撲笟鈥滄爣涔︽鏌モ�濄�佲�滄爣涔︽寚瀵尖�濓紝閫�浼戣祫娣辫瘎瀹′笓瀹跺湪寮�鏍囧墠鎸夌収璇勬爣娴佺▼涓烘偍浜ゅ弶妫�鏌ャ�佹寚瀵兼爣涔︼紝璁╄瘎瀹′笓瀹舵壘涓嶅嚭涓昏鏂规鎵e垎鐞嗙敱锛岃嚦灏戝姪鎮ㄦ彁鍗囩患鍚堣瘎瀹″緱鍒�5-10鍒嗐�備簡瑙h鎯呰鍜ㄨ锛�400-028-8080 \"}," + + "\"force_notification\": true" + + "}"; + + string result2 = SMSHelper.PushApp(conment); + _logger.LogInformation("result2:" + result2); + JObject jobjectresult = (JObject)JsonConvert.DeserializeObject(result2); + + if (jobjectresult["code"] != null && jobjectresult["code"].ToString() == "1") + { + var isOK = jobjectresult["isOK"].ToString(); + + foreach (var projectfasongxiaoDTO in projectfasongxiaoxisywjl) + { + if (isOK.IndexOf(projectfasongxiaoDTO.Tel) >= 0) + { + var projectfasongxiaoxi = new Projectfasongxiaoxi(); + projectfasongxiaoxi.Id = Guid.NewGuid().ToString(); + projectfasongxiaoxi.ProjectmingxiId = projectfasongxiaoDTO.ProjectmingxiId; + projectfasongxiaoxi.Xiaoxileixing = projectfasongxiaoDTO.Xiaoxileixing; + projectfasongxiaoxi.Xiaoxizhonglei = projectfasongxiaoDTO.Xiaoxizhonglei; + projectfasongxiaoxi.Gyszl = projectfasongxiaoDTO.Gyszl; + projectfasongxiaoxi.Khname = projectfasongxiaoDTO.Khname; + projectfasongxiaoxi.RecStatus = "A"; + projectfasongxiaoxi.Createtime = DateTime.Now; + _context.Projectfasongxiaoxis.Add(projectfasongxiaoxi); + } + } + _context.SaveChanges(); + } + + + + _logger.LogInformation( "鏃犱笟鍔$粡鐞嗘帹閫乤pp缁欏鎴�" + customename); + } + + } + + + + + } catch (Exception ex) { @@ -1653,7 +2117,7 @@ { fbprojiectid.Add(project.Id); } - var fbprojectzhongbiaos = _context.Projectzhongbiaos.Where(x => fbprojiectid.Contains(x.ProjectId)).ToList(); + var fbprojectzhongbiaos = projectzhongbiaos.Where(x => fbprojiectid.Contains(x.ProjectId)).ToList(); var projectfasongxiaoxiDTOsduanxin = new List<ProjectfasongxiaoxiDTO>(); @@ -1704,6 +2168,7 @@ } } + var projectfasongxiaoxiDTOsduanxinzuizhong = new List<ProjectfasongxiaoxiDTO>(); //鏌ヨ闇�瑕佸彂閫佺煭淇$殑瀹㈡埛 foreach (var projectfasongxiaoxiDTO1 in projectfasongxiaoxiDTOsduanxin) { @@ -1725,6 +2190,44 @@ projectfasongxiaoxiDTO1.Ywjl = cooperatecustomCustomer.Ywjl; projectfasongxiaoxiDTO1.KhId = cooperatecustomCustomer.Id; projectfasongxiaoxiDTO1.HuiyuanId = cooperatecustomCustomer.HuiyuanId; + projectfasongxiaoxiDTOsduanxinzuizhong.Add(projectfasongxiaoxiDTO1); + + //鏌ヨ璇ヤ紒涓氫笅鐨勫叾浠栦汉鍛� + var customerGuanlianhuiyuansqita = customerGuanlianhuiyuans.Where(x => x.Customerid == cooperatecustomCustomer.Id && x.Huiyuanid != cooperatecustomCustomer.HuiyuanId).ToList(); + if (customerGuanlianhuiyuansqita != null && customerGuanlianhuiyuansqita.Count > 0) + { + var huiyuanids = new List<Guid>(); + foreach (var customerGuanlianhuiyuan in customerGuanlianhuiyuansqita) + { + huiyuanids.Add(Guid.Parse(customerGuanlianhuiyuan.Huiyuanid)); + } + var frameworkUsers1 = frameworkUsers.Where(x => huiyuanids.Contains(x.Id)).ToList(); + if (frameworkUsers1 != null && frameworkUsers1.Count > 0) + { + foreach (var frameworkUser in frameworkUsers1) + { + var projectfasongxiaoxiDTO = new ProjectfasongxiaoxiDTO(); + projectfasongxiaoxiDTO.ProjectId = projectfasongxiaoxiDTO1.ProjectId; + projectfasongxiaoxiDTO.ProjectmingxiId = projectfasongxiaoxiDTO1.ProjectmingxiId; + projectfasongxiaoxiDTO.Xiaoxileixing = projectfasongxiaoxiDTO1.Xiaoxileixing; + projectfasongxiaoxiDTO.Xiaoxizhonglei = projectfasongxiaoxiDTO1.Xiaoxizhonglei; + projectfasongxiaoxiDTO.RecStatus = projectfasongxiaoxiDTO1.RecStatus; + projectfasongxiaoxiDTO.Createtime = projectfasongxiaoxiDTO1.Createtime; + projectfasongxiaoxiDTO.Gyszl = projectfasongxiaoxiDTO1.Gyszl; + projectfasongxiaoxiDTO.Khname = projectfasongxiaoxiDTO1.Khname; + projectfasongxiaoxiDTO.Tel = frameworkUser.Itcode; + projectfasongxiaoxiDTO.Ywjl = projectfasongxiaoxiDTO1.Ywjl; + projectfasongxiaoxiDTO.KhId = projectfasongxiaoxiDTO1.KhId; + projectfasongxiaoxiDTO.HuiyuanId = frameworkUser.Id.ToString().ToLower(); + projectfasongxiaoxiDTO.Projectname = projectfasongxiaoxiDTO1.Projectname; + projectfasongxiaoxiDTOsduanxinzuizhong.Add(projectfasongxiaoxiDTO); + } + } + } + + + + } } @@ -1741,9 +2244,44 @@ projectfasongxiaoxiDTO1.Ywjl = intentionCustomer.Ywjl; projectfasongxiaoxiDTO1.KhId = intentionCustomer.Id; projectfasongxiaoxiDTO1.HuiyuanId = intentionCustomer.HuiyuanId; + projectfasongxiaoxiDTOsduanxinzuizhong.Add(projectfasongxiaoxiDTO1); + + //鏌ヨ璇ヤ紒涓氫笅鐨勫叾浠栦汉鍛� + var customerGuanlianhuiyuansqita = customerGuanlianhuiyuans.Where(x => x.Customerid == intentionCustomer.Id && x.Huiyuanid != intentionCustomer.HuiyuanId).ToList(); + if (customerGuanlianhuiyuansqita != null && customerGuanlianhuiyuansqita.Count > 0) + { + var huiyuanids = new List<Guid>(); + foreach (var customerGuanlianhuiyuan in customerGuanlianhuiyuansqita) + { + huiyuanids.Add(Guid.Parse(customerGuanlianhuiyuan.Huiyuanid)); + } + var frameworkUsers1 = frameworkUsers.Where(x => huiyuanids.Contains(x.Id)).ToList(); + if (frameworkUsers1 != null && frameworkUsers1.Count > 0) + { + foreach (var frameworkUser in frameworkUsers1) + { + var projectfasongxiaoxiDTO = new ProjectfasongxiaoxiDTO(); + projectfasongxiaoxiDTO.ProjectId = projectfasongxiaoxiDTO1.ProjectId; + projectfasongxiaoxiDTO.ProjectmingxiId = projectfasongxiaoxiDTO1.ProjectmingxiId; + projectfasongxiaoxiDTO.Xiaoxileixing = projectfasongxiaoxiDTO1.Xiaoxileixing; + projectfasongxiaoxiDTO.Xiaoxizhonglei = projectfasongxiaoxiDTO1.Xiaoxizhonglei; + projectfasongxiaoxiDTO.RecStatus = projectfasongxiaoxiDTO1.RecStatus; + projectfasongxiaoxiDTO.Createtime = projectfasongxiaoxiDTO1.Createtime; + projectfasongxiaoxiDTO.Gyszl = projectfasongxiaoxiDTO1.Gyszl; + projectfasongxiaoxiDTO.Khname = projectfasongxiaoxiDTO1.Khname; + projectfasongxiaoxiDTO.Tel = frameworkUser.Itcode; + projectfasongxiaoxiDTO.Ywjl = projectfasongxiaoxiDTO1.Ywjl; + projectfasongxiaoxiDTO.KhId = projectfasongxiaoxiDTO1.KhId; + projectfasongxiaoxiDTO.HuiyuanId = frameworkUser.Id.ToString().ToLower(); + projectfasongxiaoxiDTO.Projectname = projectfasongxiaoxiDTO1.Projectname; + projectfasongxiaoxiDTOsduanxinzuizhong.Add(projectfasongxiaoxiDTO); + } + } + } } } + var projectfasongxiaoxiDTOsappzuizhong = new List<ProjectfasongxiaoxiDTO>(); //鏌ヨ闇�瑕佸彂閫丄pp娑堟伅鐨勫鎴� foreach (var projectfasongxiaoxiDTO1 in projectfasongxiaoxiDTOsapp) { @@ -1765,7 +2303,40 @@ projectfasongxiaoxiDTO1.Ywjl = cooperatecustomCustomer.Ywjl; projectfasongxiaoxiDTO1.KhId = cooperatecustomCustomer.Id; projectfasongxiaoxiDTO1.HuiyuanId = cooperatecustomCustomer.HuiyuanId; + projectfasongxiaoxiDTOsappzuizhong.Add(projectfasongxiaoxiDTO1); + //鏌ヨ璇ヤ紒涓氫笅鐨勫叾浠栦汉鍛� + var customerGuanlianhuiyuansqita = customerGuanlianhuiyuans.Where(x => x.Customerid == cooperatecustomCustomer.Id && x.Huiyuanid != cooperatecustomCustomer.HuiyuanId).ToList(); + if (customerGuanlianhuiyuansqita != null && customerGuanlianhuiyuansqita.Count > 0) + { + var huiyuanids = new List<Guid>(); + foreach (var customerGuanlianhuiyuan in customerGuanlianhuiyuansqita) + { + huiyuanids.Add(Guid.Parse(customerGuanlianhuiyuan.Huiyuanid)); + } + var frameworkUsers1 = frameworkUsers.Where(x => huiyuanids.Contains(x.Id)).ToList(); + if (frameworkUsers1 != null && frameworkUsers1.Count > 0) + { + foreach (var frameworkUser in frameworkUsers1) + { + var projectfasongxiaoxiDTO = new ProjectfasongxiaoxiDTO(); + projectfasongxiaoxiDTO.ProjectId = projectfasongxiaoxiDTO1.ProjectId; + projectfasongxiaoxiDTO.ProjectmingxiId = projectfasongxiaoxiDTO1.ProjectmingxiId; + projectfasongxiaoxiDTO.Xiaoxileixing = projectfasongxiaoxiDTO1.Xiaoxileixing; + projectfasongxiaoxiDTO.Xiaoxizhonglei = projectfasongxiaoxiDTO1.Xiaoxizhonglei; + projectfasongxiaoxiDTO.RecStatus = projectfasongxiaoxiDTO1.RecStatus; + projectfasongxiaoxiDTO.Createtime = projectfasongxiaoxiDTO1.Createtime; + projectfasongxiaoxiDTO.Gyszl = projectfasongxiaoxiDTO1.Gyszl; + projectfasongxiaoxiDTO.Khname = projectfasongxiaoxiDTO1.Khname; + projectfasongxiaoxiDTO.Tel = frameworkUser.Itcode; + projectfasongxiaoxiDTO.Ywjl = projectfasongxiaoxiDTO1.Ywjl; + projectfasongxiaoxiDTO.KhId = projectfasongxiaoxiDTO1.KhId; + projectfasongxiaoxiDTO.HuiyuanId = frameworkUser.Id.ToString().ToLower(); + projectfasongxiaoxiDTO.Projectname = projectfasongxiaoxiDTO1.Projectname; + projectfasongxiaoxiDTOsappzuizhong.Add(projectfasongxiaoxiDTO); + } + } + } } } else @@ -1781,170 +2352,47 @@ projectfasongxiaoxiDTO1.Ywjl = intentionCustomer.Ywjl; projectfasongxiaoxiDTO1.KhId = intentionCustomer.Id; projectfasongxiaoxiDTO1.HuiyuanId = intentionCustomer.HuiyuanId; + projectfasongxiaoxiDTOsappzuizhong.Add(projectfasongxiaoxiDTO1); + + //鏌ヨ璇ヤ紒涓氫笅鐨勫叾浠栦汉鍛� + var customerGuanlianhuiyuansqita = customerGuanlianhuiyuans.Where(x => x.Customerid == intentionCustomer.Id && x.Huiyuanid != intentionCustomer.HuiyuanId).ToList(); + if (customerGuanlianhuiyuansqita != null && customerGuanlianhuiyuansqita.Count > 0) + { + var huiyuanids = new List<Guid>(); + foreach (var customerGuanlianhuiyuan in customerGuanlianhuiyuansqita) + { + huiyuanids.Add(Guid.Parse(customerGuanlianhuiyuan.Huiyuanid)); + } + var frameworkUsers1 = frameworkUsers.Where(x => huiyuanids.Contains(x.Id)).ToList(); + if (frameworkUsers1 != null && frameworkUsers1.Count > 0) + { + foreach (var frameworkUser in frameworkUsers1) + { + var projectfasongxiaoxiDTO = new ProjectfasongxiaoxiDTO(); + projectfasongxiaoxiDTO.ProjectId = projectfasongxiaoxiDTO1.ProjectId; + projectfasongxiaoxiDTO.ProjectmingxiId = projectfasongxiaoxiDTO1.ProjectmingxiId; + projectfasongxiaoxiDTO.Xiaoxileixing = projectfasongxiaoxiDTO1.Xiaoxileixing; + projectfasongxiaoxiDTO.Xiaoxizhonglei = projectfasongxiaoxiDTO1.Xiaoxizhonglei; + projectfasongxiaoxiDTO.RecStatus = projectfasongxiaoxiDTO1.RecStatus; + projectfasongxiaoxiDTO.Createtime = projectfasongxiaoxiDTO1.Createtime; + projectfasongxiaoxiDTO.Gyszl = projectfasongxiaoxiDTO1.Gyszl; + projectfasongxiaoxiDTO.Khname = projectfasongxiaoxiDTO1.Khname; + projectfasongxiaoxiDTO.Tel = frameworkUser.Itcode; + projectfasongxiaoxiDTO.Ywjl = projectfasongxiaoxiDTO1.Ywjl; + projectfasongxiaoxiDTO.KhId = projectfasongxiaoxiDTO1.KhId; + projectfasongxiaoxiDTO.HuiyuanId = frameworkUser.Id.ToString().ToLower(); + projectfasongxiaoxiDTO.Projectname = projectfasongxiaoxiDTO1.Projectname; + projectfasongxiaoxiDTOsappzuizhong.Add(projectfasongxiaoxiDTO); + } + } + } } } - - - //鎺ㄩ�丄pp - foreach (var ywjl in Ywjl) - { - - var projectfasongxiaoxisywjl = projectfasongxiaoxiDTOsapp.Where(x => x.Ywjl == ywjl.Id && x.Tel != null && x.Tel.StartsWith("1")).ToList(); - int j = 0; - while (j * 1000 <= projectfasongxiaoxisywjl.Count) - { - j = j + 1; - string numberstring = ""; - string customename = ""; - if (projectfasongxiaoxisywjl != null && projectfasongxiaoxisywjl.Count > 0) - { - int countt = (j * 1000); - if (countt > projectfasongxiaoxisywjl.Count) - { - countt = projectfasongxiaoxisywjl.Count; - } - - for (int i = 0; i < countt; i++) - { - if (numberstring.IndexOf(projectfasongxiaoxisywjl[i + j - 1].Tel) >= 0) - { - continue; - } - numberstring += "\"" + projectfasongxiaoxisywjl[i + j - 1].Tel + "\","; - customename += projectfasongxiaoxisywjl[i + j - 1].Khname + ","; - - } - } - - if (numberstring.EndsWith(",")) - { - numberstring = numberstring.Substring(0, numberstring.Length - 1); - } - string conment = "{" - + "\"title\": \"鏀块噰鍜ㄨ鍏徃涓撲笟鈥滄爣涔︽鏌モ�濄�佲�滄爣涔︽寚瀵尖�漒"," - + "\"content\": \"鏀块噰鍜ㄨ鍏徃涓撲笟鈥滄爣涔︽鏌モ�濄�佲�滄爣涔︽寚瀵尖�濓紝閫�浼戣祫娣辫瘎瀹′笓瀹跺湪寮�鏍囧墠鎸夌収璇勬爣娴佺▼涓烘偍浜ゅ弶妫�鏌ャ�佹寚瀵兼爣涔︼紝璁╂偍寰楅綈鍏ㄩ儴瀹㈣鍒嗗拰涓昏鍒嗭紝浠庢涓嶅啀涓烘爣涔﹀埗浣滄搷蹇冦�備簡瑙h鎯呰鍜ㄨ锛�" + ywjl.Phone + " \"," - + "\"getui_alias\": [" + numberstring + "]," - + "\"payload\": {\"text\": \"鏀块噰鍜ㄨ鍏徃涓撲笟鈥滄爣涔︽鏌モ�濄�佲�滄爣涔︽寚瀵尖�濓紝閫�浼戣祫娣辫瘎瀹′笓瀹跺湪寮�鏍囧墠鎸夌収璇勬爣娴佺▼涓烘偍浜ゅ弶妫�鏌ャ�佹寚瀵兼爣涔︼紝璁╂偍寰楅綈鍏ㄩ儴瀹㈣鍒嗗拰涓昏鍒嗭紝浠庢涓嶅啀涓烘爣涔﹀埗浣滄搷蹇冦�備簡瑙h鎯呰鍜ㄨ锛�" + ywjl.Phone + " \"}," - + "\"force_notification\": true" - + "}"; - - string result2 = SMSHelper.PushApp(conment); - _logger.LogInformation("result2:" + result2); - JObject jobjectresult = (JObject)JsonConvert.DeserializeObject(result2); - - if (jobjectresult["code"] != null && jobjectresult["code"].ToString() == "1") - { - var isOK = jobjectresult["isOK"].ToString(); - - foreach (var projectfasongxiaoDTO in projectfasongxiaoxisywjl) - { - if (isOK.IndexOf(projectfasongxiaoDTO.Tel) >= 0) - { - var projectfasongxiaoxi = new Projectfasongxiaoxi(); - projectfasongxiaoxi.Id = Guid.NewGuid().ToString(); - projectfasongxiaoxi.ProjectmingxiId = projectfasongxiaoDTO.ProjectmingxiId; - projectfasongxiaoxi.Xiaoxileixing = projectfasongxiaoDTO.Xiaoxileixing; - projectfasongxiaoxi.Xiaoxizhonglei = projectfasongxiaoDTO.Xiaoxizhonglei; - projectfasongxiaoxi.Gyszl = projectfasongxiaoDTO.Gyszl; - projectfasongxiaoxi.Khname = projectfasongxiaoDTO.Khname; - projectfasongxiaoxi.RecStatus = "A"; - projectfasongxiaoxi.Createtime = DateTime.Now; - _context.Projectfasongxiaoxis.Add(projectfasongxiaoxi); - } - } - _context.SaveChanges(); - } - - - - _logger.LogInformation(ywjl.UserName + "鎺ㄩ�乤pp缁欏鎴�" + customename); - } - - - - } - //涓氬姟缁忕悊涓虹┖ - if (true) - { - var projectfasongxiaoxisywjl = projectfasongxiaoxiDTOsapp.Where(x => x.Ywjl == null && x.Tel != null && x.Tel.StartsWith("1")).ToList(); - int j = 0; - while (j * 1000 <= projectfasongxiaoxisywjl.Count) - { - j = j + 1; - string numberstring = ""; - string customename = ""; - if (projectfasongxiaoxisywjl != null && projectfasongxiaoxisywjl.Count > 0) - { - int countt = (j * 1000); - if (countt > projectfasongxiaoxisywjl.Count) - { - countt = projectfasongxiaoxisywjl.Count; - } - - for (int i = 0; i < countt; i++) - { - if (numberstring.IndexOf(projectfasongxiaoxisywjl[i + j - 1].Tel) >= 0) - { - continue; - } - numberstring += "\"" + projectfasongxiaoxisywjl[i + j - 1].Tel + "\","; - customename += projectfasongxiaoxisywjl[i + j - 1].Khname + ","; - - } - } - - if (numberstring.EndsWith(",")) - { - numberstring = numberstring.Substring(0, numberstring.Length - 1); - } - string conment = "{" - + "\"title\": \"鏀块噰鍜ㄨ鍏徃涓撲笟鈥滄爣涔︽鏌モ�濄�佲�滄爣涔︽寚瀵尖�漒"," - + "\"content\": \"鏀块噰鍜ㄨ鍏徃涓撲笟鈥滄爣涔︽鏌モ�濄�佲�滄爣涔︽寚瀵尖�濓紝閫�浼戣祫娣辫瘎瀹′笓瀹跺湪寮�鏍囧墠鎸夌収璇勬爣娴佺▼涓烘偍浜ゅ弶妫�鏌ャ�佹寚瀵兼爣涔︼紝璁╂偍寰楅綈鍏ㄩ儴瀹㈣鍒嗗拰涓昏鍒嗭紝浠庢涓嶅啀涓烘爣涔﹀埗浣滄搷蹇冦�備簡瑙h鎯呰鍜ㄨ锛�400-028-8080 \"," - + "\"getui_alias\": [" + numberstring + "]," - + "\"payload\": {\"text\": \"鏀块噰鍜ㄨ鍏徃涓撲笟鈥滄爣涔︽鏌モ�濄�佲�滄爣涔︽寚瀵尖�濓紝閫�浼戣祫娣辫瘎瀹′笓瀹跺湪寮�鏍囧墠鎸夌収璇勬爣娴佺▼涓烘偍浜ゅ弶妫�鏌ャ�佹寚瀵兼爣涔︼紝璁╂偍寰楅綈鍏ㄩ儴瀹㈣鍒嗗拰涓昏鍒嗭紝浠庢涓嶅啀涓烘爣涔﹀埗浣滄搷蹇冦�備簡瑙h鎯呰鍜ㄨ锛�400-028-8080 \"}," - + "\"force_notification\": true" - + "}"; - - string result2 = SMSHelper.PushApp(conment); - _logger.LogInformation("result2:" + result2); - JObject jobjectresult = (JObject)JsonConvert.DeserializeObject(result2); - - if (jobjectresult["code"] != null && jobjectresult["code"].ToString() == "1") - { - var isOK = jobjectresult["isOK"].ToString(); - - foreach (var projectfasongxiaoDTO in projectfasongxiaoxisywjl) - { - if (isOK.IndexOf(projectfasongxiaoDTO.Tel) >= 0) - { - var projectfasongxiaoxi = new Projectfasongxiaoxi(); - projectfasongxiaoxi.Id = Guid.NewGuid().ToString(); - projectfasongxiaoxi.ProjectmingxiId = projectfasongxiaoDTO.ProjectmingxiId; - projectfasongxiaoxi.Xiaoxileixing = projectfasongxiaoDTO.Xiaoxileixing; - projectfasongxiaoxi.Xiaoxizhonglei = projectfasongxiaoDTO.Xiaoxizhonglei; - projectfasongxiaoxi.Gyszl = projectfasongxiaoDTO.Gyszl; - projectfasongxiaoxi.Khname = projectfasongxiaoDTO.Khname; - projectfasongxiaoxi.RecStatus = "A"; - projectfasongxiaoxi.Createtime = DateTime.Now; - _context.Projectfasongxiaoxis.Add(projectfasongxiaoxi); - } - } - _context.SaveChanges(); - } - - - - _logger.LogInformation("鏃犱笟鍔$粡鐞嗘帹閫乤pp缁欏鎴�" + customename); - } - - } - - //鍙戦�佺煭淇� foreach (var ywjl in Ywjl) { - var projectfasongxiaoxisywjl = projectfasongxiaoxiDTOsduanxin.Where(x => x.Ywjl == ywjl.Id && x.Tel != null && x.Tel.StartsWith("1")).ToList(); + var projectfasongxiaoxisywjl = projectfasongxiaoxiDTOsduanxinzuizhong.Where(x => x.Ywjl == ywjl.Id && x.Tel != null && x.Tel.StartsWith("1")).ToList(); if (projectfasongxiaoxisywjl.Count >= 100) { int j = 0; @@ -2013,7 +2461,7 @@ //涓氬姟缁忕悊涓虹┖ if (true) { - var projectfasongxiaoxisywjl = projectfasongxiaoxiDTOsduanxin.Where(x => x.Ywjl == null && x.Tel != null && x.Tel.StartsWith("1")).ToList(); + var projectfasongxiaoxisywjl = projectfasongxiaoxiDTOsduanxinzuizhong.Where(x => x.Ywjl == null && x.Tel != null && x.Tel.StartsWith("1")).ToList(); if (projectfasongxiaoxisywjl.Count >= 100) { int j = 0; @@ -2077,6 +2525,172 @@ } } + //鎺ㄩ�丄pp + foreach (var ywjl in Ywjl) + { + + var projectfasongxiaoxisywjl = projectfasongxiaoxiDTOsappzuizhong.Where(x => x.Ywjl == ywjl.Id && x.Tel != null && x.Tel.StartsWith("1")).ToList(); + int j = 0; + while (j * 1000 <= projectfasongxiaoxisywjl.Count) + { + j = j + 1; + string numberstring = ""; + string customename = ""; + if (projectfasongxiaoxisywjl != null && projectfasongxiaoxisywjl.Count > 0) + { + int countt = (j * 1000); + if (countt > projectfasongxiaoxisywjl.Count) + { + countt = projectfasongxiaoxisywjl.Count; + } + + for (int i = 0; i < countt; i++) + { + if (numberstring.IndexOf(projectfasongxiaoxisywjl[i + j - 1].Tel) >= 0) + { + continue; + } + numberstring += "\"" + projectfasongxiaoxisywjl[i + j - 1].Tel + "\","; + customename += projectfasongxiaoxisywjl[i + j - 1].Khname + ","; + + } + } + + if (numberstring.EndsWith(",")) + { + numberstring = numberstring.Substring(0, numberstring.Length - 1); + } + if (string.IsNullOrEmpty(numberstring)) + { + continue; + } + string conment = "{" + + "\"title\": \"鏀块噰鍜ㄨ鍏徃涓撲笟鈥滄爣涔︽鏌モ�濄�佲�滄爣涔︽寚瀵尖�漒"," + + "\"content\": \"鏀块噰鍜ㄨ鍏徃涓撲笟鈥滄爣涔︽鏌モ�濄�佲�滄爣涔︽寚瀵尖�濓紝閫�浼戣祫娣辫瘎瀹′笓瀹跺湪寮�鏍囧墠鎸夌収璇勬爣娴佺▼涓烘偍浜ゅ弶妫�鏌ャ�佹寚瀵兼爣涔︼紝璁╂偍寰楅綈鍏ㄩ儴瀹㈣鍒嗗拰涓昏鍒嗭紝浠庢涓嶅啀涓烘爣涔﹀埗浣滄搷蹇冦�備簡瑙h鎯呰鍜ㄨ锛�" + ywjl.Phone + " \"," + + "\"getui_alias\": [" + numberstring + "]," + + "\"payload\": {\"text\": \"鏀块噰鍜ㄨ鍏徃涓撲笟鈥滄爣涔︽鏌モ�濄�佲�滄爣涔︽寚瀵尖�濓紝閫�浼戣祫娣辫瘎瀹′笓瀹跺湪寮�鏍囧墠鎸夌収璇勬爣娴佺▼涓烘偍浜ゅ弶妫�鏌ャ�佹寚瀵兼爣涔︼紝璁╂偍寰楅綈鍏ㄩ儴瀹㈣鍒嗗拰涓昏鍒嗭紝浠庢涓嶅啀涓烘爣涔﹀埗浣滄搷蹇冦�備簡瑙h鎯呰鍜ㄨ锛�" + ywjl.Phone + " \"}," + + "\"force_notification\": true" + + "}"; + + string result2 = SMSHelper.PushApp(conment); + _logger.LogInformation("result2:" + result2); + JObject jobjectresult = (JObject)JsonConvert.DeserializeObject(result2); + + if (jobjectresult["code"] != null && jobjectresult["code"].ToString() == "1") + { + var isOK = jobjectresult["isOK"].ToString(); + + foreach (var projectfasongxiaoDTO in projectfasongxiaoxisywjl) + { + if (isOK.IndexOf(projectfasongxiaoDTO.Tel) >= 0) + { + var projectfasongxiaoxi = new Projectfasongxiaoxi(); + projectfasongxiaoxi.Id = Guid.NewGuid().ToString(); + projectfasongxiaoxi.ProjectmingxiId = projectfasongxiaoDTO.ProjectmingxiId; + projectfasongxiaoxi.Xiaoxileixing = projectfasongxiaoDTO.Xiaoxileixing; + projectfasongxiaoxi.Xiaoxizhonglei = projectfasongxiaoDTO.Xiaoxizhonglei; + projectfasongxiaoxi.Gyszl = projectfasongxiaoDTO.Gyszl; + projectfasongxiaoxi.Khname = projectfasongxiaoDTO.Khname; + projectfasongxiaoxi.RecStatus = "A"; + projectfasongxiaoxi.Createtime = DateTime.Now; + _context.Projectfasongxiaoxis.Add(projectfasongxiaoxi); + } + } + _context.SaveChanges(); + } + + + + _logger.LogInformation(ywjl.UserName + "鎺ㄩ�乤pp缁欏鎴�" + customename); + } + + + + } + //涓氬姟缁忕悊涓虹┖ + if (true) + { + var projectfasongxiaoxisywjl = projectfasongxiaoxiDTOsappzuizhong.Where(x => x.Ywjl == null && x.Tel != null && x.Tel.StartsWith("1")).ToList(); + int j = 0; + while (j * 1000 <= projectfasongxiaoxisywjl.Count) + { + j = j + 1; + string numberstring = ""; + string customename = ""; + if (projectfasongxiaoxisywjl != null && projectfasongxiaoxisywjl.Count > 0) + { + int countt = (j * 1000); + if (countt > projectfasongxiaoxisywjl.Count) + { + countt = projectfasongxiaoxisywjl.Count; + } + + for (int i = 0; i < countt; i++) + { + if (numberstring.IndexOf(projectfasongxiaoxisywjl[i + j - 1].Tel) >= 0) + { + continue; + } + numberstring += "\"" + projectfasongxiaoxisywjl[i + j - 1].Tel + "\","; + customename += projectfasongxiaoxisywjl[i + j - 1].Khname + ","; + + } + } + + if (numberstring.EndsWith(",")) + { + numberstring = numberstring.Substring(0, numberstring.Length - 1); + } + if (string.IsNullOrEmpty(numberstring)) + { + continue; + } + string conment = "{" + + "\"title\": \"鏀块噰鍜ㄨ鍏徃涓撲笟鈥滄爣涔︽鏌モ�濄�佲�滄爣涔︽寚瀵尖�漒"," + + "\"content\": \"鏀块噰鍜ㄨ鍏徃涓撲笟鈥滄爣涔︽鏌モ�濄�佲�滄爣涔︽寚瀵尖�濓紝閫�浼戣祫娣辫瘎瀹′笓瀹跺湪寮�鏍囧墠鎸夌収璇勬爣娴佺▼涓烘偍浜ゅ弶妫�鏌ャ�佹寚瀵兼爣涔︼紝璁╂偍寰楅綈鍏ㄩ儴瀹㈣鍒嗗拰涓昏鍒嗭紝浠庢涓嶅啀涓烘爣涔﹀埗浣滄搷蹇冦�備簡瑙h鎯呰鍜ㄨ锛�400-028-8080 \"," + + "\"getui_alias\": [" + numberstring + "]," + + "\"payload\": {\"text\": \"鏀块噰鍜ㄨ鍏徃涓撲笟鈥滄爣涔︽鏌モ�濄�佲�滄爣涔︽寚瀵尖�濓紝閫�浼戣祫娣辫瘎瀹′笓瀹跺湪寮�鏍囧墠鎸夌収璇勬爣娴佺▼涓烘偍浜ゅ弶妫�鏌ャ�佹寚瀵兼爣涔︼紝璁╂偍寰楅綈鍏ㄩ儴瀹㈣鍒嗗拰涓昏鍒嗭紝浠庢涓嶅啀涓烘爣涔﹀埗浣滄搷蹇冦�備簡瑙h鎯呰鍜ㄨ锛�400-028-8080 \"}," + + "\"force_notification\": true" + + "}"; + + string result2 = SMSHelper.PushApp(conment); + _logger.LogInformation("result2:" + result2); + JObject jobjectresult = (JObject)JsonConvert.DeserializeObject(result2); + + if (jobjectresult["code"] != null && jobjectresult["code"].ToString() == "1") + { + var isOK = jobjectresult["isOK"].ToString(); + + foreach (var projectfasongxiaoDTO in projectfasongxiaoxisywjl) + { + if (isOK.IndexOf(projectfasongxiaoDTO.Tel) >= 0) + { + var projectfasongxiaoxi = new Projectfasongxiaoxi(); + projectfasongxiaoxi.Id = Guid.NewGuid().ToString(); + projectfasongxiaoxi.ProjectmingxiId = projectfasongxiaoDTO.ProjectmingxiId; + projectfasongxiaoxi.Xiaoxileixing = projectfasongxiaoDTO.Xiaoxileixing; + projectfasongxiaoxi.Xiaoxizhonglei = projectfasongxiaoDTO.Xiaoxizhonglei; + projectfasongxiaoxi.Gyszl = projectfasongxiaoDTO.Gyszl; + projectfasongxiaoxi.Khname = projectfasongxiaoDTO.Khname; + projectfasongxiaoxi.RecStatus = "A"; + projectfasongxiaoxi.Createtime = DateTime.Now; + _context.Projectfasongxiaoxis.Add(projectfasongxiaoxi); + } + } + _context.SaveChanges(); + } + + + + _logger.LogInformation("鏃犱笟鍔$粡鐞嗘帹閫乤pp缁欏鎴�" + customename); + } + + } + + + + + } catch (Exception ex) { @@ -2097,25 +2711,14 @@ var fbprojectsDshxZhiyichengli = projects.Where(x => x.DshxZhiyichengli == "D").ToList(); var fbprojectsDshxTousuchengli = projects.Where(x => x.DshxTousuchengli == "D").ToList(); + var fbprojectzhongbiaosZbZhiyichengli = projectzhongbiaos.Where(x => x.ZbZhiyichengli == "D" ).ToList(); + var fbprojectzhongbiaosZbTousuchengli = projectzhongbiaos.Where(x => x.ZbTousuchengli == "D" ).ToList(); + var fbprojectreasonsWxZhiyichengli = projectreasons.Where(x => x.WxZhiyichengli == "D" ).ToList(); + var fbprojectreasonsWxTousuchengli = projectreasons.Where(x => x.WxTousuchengli == "D" ).ToList(); - var fbprojiectid = new List<string>(); - foreach (var project in projects) - { - fbprojiectid.Add(project.Id); - } - var fbprojectzhongbiaos = _context.Projectzhongbiaos.Where(x => fbprojiectid.Contains(x.ProjectId)).ToList(); - - - - var fbprojectzhongbiaosZbZhiyichengli = _context.Projectzhongbiaos.Where(x => x.ZbZhiyichengli == "D" && fbprojiectid.Contains(x.ProjectId) ).ToList(); - var fbprojectzhongbiaosZbTousuchengli = _context.Projectzhongbiaos.Where(x => x.ZbTousuchengli == "D" && fbprojiectid.Contains(x.ProjectId)).ToList(); - - var fbprojectreasonsWxZhiyichengli = _context.Projectreasons.Where(x => x.WxZhiyichengli == "D" && fbprojiectid.Contains(x.ProjectId)).ToList(); - var fbprojectreasonsWxTousuchengli = _context.Projectreasons.Where(x => x.WxTousuchengli == "D" && fbprojiectid.Contains(x.ProjectId)).ToList(); - - var fbprojectyouxiaosYxZhiyichengli = _context.Projectyouxiaos.Where(x => x.YxZhiyichengli == "D" && fbprojiectid.Contains(x.ProjectId)).ToList(); - var fbprojectyouxiaosYxTousuchengli = _context.Projectyouxiaos.Where(x => x.YxTousuchengli == "D" && fbprojiectid.Contains(x.ProjectId)).ToList(); + var fbprojectyouxiaosYxZhiyichengli = projectyouxiaos.Where(x => x.YxZhiyichengli == "D" ).ToList(); + var fbprojectyouxiaosYxTousuchengli = projectyouxiaos.Where(x => x.YxTousuchengli == "D" ).ToList(); var projectfasongxiaoxiDTOsduanxin = new List<ProjectfasongxiaoxiDTO>(); @@ -2531,6 +3134,7 @@ } } + var projectfasongxiaoxiDTOsduanxinzuizhong = new List<ProjectfasongxiaoxiDTO>(); //鏌ヨ闇�瑕佸彂閫佺煭淇$殑瀹㈡埛 foreach (var projectfasongxiaoxiDTO1 in projectfasongxiaoxiDTOsduanxin) { @@ -2552,6 +3156,44 @@ projectfasongxiaoxiDTO1.Ywjl = cooperatecustomCustomer.Ywjl; projectfasongxiaoxiDTO1.KhId = cooperatecustomCustomer.Id; projectfasongxiaoxiDTO1.HuiyuanId = cooperatecustomCustomer.HuiyuanId; + projectfasongxiaoxiDTOsduanxinzuizhong.Add(projectfasongxiaoxiDTO1); + + //鏌ヨ璇ヤ紒涓氫笅鐨勫叾浠栦汉鍛� + var customerGuanlianhuiyuansqita = customerGuanlianhuiyuans.Where(x => x.Customerid == cooperatecustomCustomer.Id && x.Huiyuanid != cooperatecustomCustomer.HuiyuanId).ToList(); + if (customerGuanlianhuiyuansqita != null && customerGuanlianhuiyuansqita.Count > 0) + { + var huiyuanids = new List<Guid>(); + foreach (var customerGuanlianhuiyuan in customerGuanlianhuiyuansqita) + { + huiyuanids.Add(Guid.Parse(customerGuanlianhuiyuan.Huiyuanid)); + } + var frameworkUsers1 = frameworkUsers.Where(x => huiyuanids.Contains(x.Id)).ToList(); + if (frameworkUsers1 != null && frameworkUsers1.Count > 0) + { + foreach (var frameworkUser in frameworkUsers1) + { + var projectfasongxiaoxiDTO = new ProjectfasongxiaoxiDTO(); + projectfasongxiaoxiDTO.ProjectId = projectfasongxiaoxiDTO1.ProjectId; + projectfasongxiaoxiDTO.ProjectmingxiId = projectfasongxiaoxiDTO1.ProjectmingxiId; + projectfasongxiaoxiDTO.Xiaoxileixing = projectfasongxiaoxiDTO1.Xiaoxileixing; + projectfasongxiaoxiDTO.Xiaoxizhonglei = projectfasongxiaoxiDTO1.Xiaoxizhonglei; + projectfasongxiaoxiDTO.RecStatus = projectfasongxiaoxiDTO1.RecStatus; + projectfasongxiaoxiDTO.Createtime = projectfasongxiaoxiDTO1.Createtime; + projectfasongxiaoxiDTO.Gyszl = projectfasongxiaoxiDTO1.Gyszl; + projectfasongxiaoxiDTO.Khname = projectfasongxiaoxiDTO1.Khname; + projectfasongxiaoxiDTO.Tel = frameworkUser.Itcode; + projectfasongxiaoxiDTO.Ywjl = projectfasongxiaoxiDTO1.Ywjl; + projectfasongxiaoxiDTO.KhId = projectfasongxiaoxiDTO1.KhId; + projectfasongxiaoxiDTO.HuiyuanId = frameworkUser.Id.ToString().ToLower(); + projectfasongxiaoxiDTO.Projectname = projectfasongxiaoxiDTO1.Projectname; + projectfasongxiaoxiDTOsduanxinzuizhong.Add(projectfasongxiaoxiDTO); + } + } + } + + + + } } @@ -2568,9 +3210,44 @@ projectfasongxiaoxiDTO1.Ywjl = intentionCustomer.Ywjl; projectfasongxiaoxiDTO1.KhId = intentionCustomer.Id; projectfasongxiaoxiDTO1.HuiyuanId = intentionCustomer.HuiyuanId; + projectfasongxiaoxiDTOsduanxinzuizhong.Add(projectfasongxiaoxiDTO1); + + //鏌ヨ璇ヤ紒涓氫笅鐨勫叾浠栦汉鍛� + var customerGuanlianhuiyuansqita = customerGuanlianhuiyuans.Where(x => x.Customerid == intentionCustomer.Id && x.Huiyuanid != intentionCustomer.HuiyuanId).ToList(); + if (customerGuanlianhuiyuansqita != null && customerGuanlianhuiyuansqita.Count > 0) + { + var huiyuanids = new List<Guid>(); + foreach (var customerGuanlianhuiyuan in customerGuanlianhuiyuansqita) + { + huiyuanids.Add(Guid.Parse(customerGuanlianhuiyuan.Huiyuanid)); + } + var frameworkUsers1 = frameworkUsers.Where(x => huiyuanids.Contains(x.Id)).ToList(); + if (frameworkUsers1 != null && frameworkUsers1.Count > 0) + { + foreach (var frameworkUser in frameworkUsers1) + { + var projectfasongxiaoxiDTO = new ProjectfasongxiaoxiDTO(); + projectfasongxiaoxiDTO.ProjectId = projectfasongxiaoxiDTO1.ProjectId; + projectfasongxiaoxiDTO.ProjectmingxiId = projectfasongxiaoxiDTO1.ProjectmingxiId; + projectfasongxiaoxiDTO.Xiaoxileixing = projectfasongxiaoxiDTO1.Xiaoxileixing; + projectfasongxiaoxiDTO.Xiaoxizhonglei = projectfasongxiaoxiDTO1.Xiaoxizhonglei; + projectfasongxiaoxiDTO.RecStatus = projectfasongxiaoxiDTO1.RecStatus; + projectfasongxiaoxiDTO.Createtime = projectfasongxiaoxiDTO1.Createtime; + projectfasongxiaoxiDTO.Gyszl = projectfasongxiaoxiDTO1.Gyszl; + projectfasongxiaoxiDTO.Khname = projectfasongxiaoxiDTO1.Khname; + projectfasongxiaoxiDTO.Tel = frameworkUser.Itcode; + projectfasongxiaoxiDTO.Ywjl = projectfasongxiaoxiDTO1.Ywjl; + projectfasongxiaoxiDTO.KhId = projectfasongxiaoxiDTO1.KhId; + projectfasongxiaoxiDTO.HuiyuanId = frameworkUser.Id.ToString().ToLower(); + projectfasongxiaoxiDTO.Projectname = projectfasongxiaoxiDTO1.Projectname; + projectfasongxiaoxiDTOsduanxinzuizhong.Add(projectfasongxiaoxiDTO); + } + } + } } } + var projectfasongxiaoxiDTOsappzuizhong = new List<ProjectfasongxiaoxiDTO>(); //鏌ヨ闇�瑕佸彂閫丄pp娑堟伅鐨勫鎴� foreach (var projectfasongxiaoxiDTO1 in projectfasongxiaoxiDTOsapp) { @@ -2592,7 +3269,40 @@ projectfasongxiaoxiDTO1.Ywjl = cooperatecustomCustomer.Ywjl; projectfasongxiaoxiDTO1.KhId = cooperatecustomCustomer.Id; projectfasongxiaoxiDTO1.HuiyuanId = cooperatecustomCustomer.HuiyuanId; + projectfasongxiaoxiDTOsappzuizhong.Add(projectfasongxiaoxiDTO1); + //鏌ヨ璇ヤ紒涓氫笅鐨勫叾浠栦汉鍛� + var customerGuanlianhuiyuansqita = customerGuanlianhuiyuans.Where(x => x.Customerid == cooperatecustomCustomer.Id && x.Huiyuanid != cooperatecustomCustomer.HuiyuanId).ToList(); + if (customerGuanlianhuiyuansqita != null && customerGuanlianhuiyuansqita.Count > 0) + { + var huiyuanids = new List<Guid>(); + foreach (var customerGuanlianhuiyuan in customerGuanlianhuiyuansqita) + { + huiyuanids.Add(Guid.Parse(customerGuanlianhuiyuan.Huiyuanid)); + } + var frameworkUsers1 = frameworkUsers.Where(x => huiyuanids.Contains(x.Id)).ToList(); + if (frameworkUsers1 != null && frameworkUsers1.Count > 0) + { + foreach (var frameworkUser in frameworkUsers1) + { + var projectfasongxiaoxiDTO = new ProjectfasongxiaoxiDTO(); + projectfasongxiaoxiDTO.ProjectId = projectfasongxiaoxiDTO1.ProjectId; + projectfasongxiaoxiDTO.ProjectmingxiId = projectfasongxiaoxiDTO1.ProjectmingxiId; + projectfasongxiaoxiDTO.Xiaoxileixing = projectfasongxiaoxiDTO1.Xiaoxileixing; + projectfasongxiaoxiDTO.Xiaoxizhonglei = projectfasongxiaoxiDTO1.Xiaoxizhonglei; + projectfasongxiaoxiDTO.RecStatus = projectfasongxiaoxiDTO1.RecStatus; + projectfasongxiaoxiDTO.Createtime = projectfasongxiaoxiDTO1.Createtime; + projectfasongxiaoxiDTO.Gyszl = projectfasongxiaoxiDTO1.Gyszl; + projectfasongxiaoxiDTO.Khname = projectfasongxiaoxiDTO1.Khname; + projectfasongxiaoxiDTO.Tel = frameworkUser.Itcode; + projectfasongxiaoxiDTO.Ywjl = projectfasongxiaoxiDTO1.Ywjl; + projectfasongxiaoxiDTO.KhId = projectfasongxiaoxiDTO1.KhId; + projectfasongxiaoxiDTO.HuiyuanId = frameworkUser.Id.ToString().ToLower(); + projectfasongxiaoxiDTO.Projectname = projectfasongxiaoxiDTO1.Projectname; + projectfasongxiaoxiDTOsappzuizhong.Add(projectfasongxiaoxiDTO); + } + } + } } } else @@ -2608,172 +3318,47 @@ projectfasongxiaoxiDTO1.Ywjl = intentionCustomer.Ywjl; projectfasongxiaoxiDTO1.KhId = intentionCustomer.Id; projectfasongxiaoxiDTO1.HuiyuanId = intentionCustomer.HuiyuanId; + projectfasongxiaoxiDTOsappzuizhong.Add(projectfasongxiaoxiDTO1); + + //鏌ヨ璇ヤ紒涓氫笅鐨勫叾浠栦汉鍛� + var customerGuanlianhuiyuansqita = customerGuanlianhuiyuans.Where(x => x.Customerid == intentionCustomer.Id && x.Huiyuanid != intentionCustomer.HuiyuanId).ToList(); + if (customerGuanlianhuiyuansqita != null && customerGuanlianhuiyuansqita.Count > 0) + { + var huiyuanids = new List<Guid>(); + foreach (var customerGuanlianhuiyuan in customerGuanlianhuiyuansqita) + { + huiyuanids.Add(Guid.Parse(customerGuanlianhuiyuan.Huiyuanid)); + } + var frameworkUsers1 = frameworkUsers.Where(x => huiyuanids.Contains(x.Id)).ToList(); + if (frameworkUsers1 != null && frameworkUsers1.Count > 0) + { + foreach (var frameworkUser in frameworkUsers1) + { + var projectfasongxiaoxiDTO = new ProjectfasongxiaoxiDTO(); + projectfasongxiaoxiDTO.ProjectId = projectfasongxiaoxiDTO1.ProjectId; + projectfasongxiaoxiDTO.ProjectmingxiId = projectfasongxiaoxiDTO1.ProjectmingxiId; + projectfasongxiaoxiDTO.Xiaoxileixing = projectfasongxiaoxiDTO1.Xiaoxileixing; + projectfasongxiaoxiDTO.Xiaoxizhonglei = projectfasongxiaoxiDTO1.Xiaoxizhonglei; + projectfasongxiaoxiDTO.RecStatus = projectfasongxiaoxiDTO1.RecStatus; + projectfasongxiaoxiDTO.Createtime = projectfasongxiaoxiDTO1.Createtime; + projectfasongxiaoxiDTO.Gyszl = projectfasongxiaoxiDTO1.Gyszl; + projectfasongxiaoxiDTO.Khname = projectfasongxiaoxiDTO1.Khname; + projectfasongxiaoxiDTO.Tel = frameworkUser.Itcode; + projectfasongxiaoxiDTO.Ywjl = projectfasongxiaoxiDTO1.Ywjl; + projectfasongxiaoxiDTO.KhId = projectfasongxiaoxiDTO1.KhId; + projectfasongxiaoxiDTO.HuiyuanId = frameworkUser.Id.ToString().ToLower(); + projectfasongxiaoxiDTO.Projectname = projectfasongxiaoxiDTO1.Projectname; + projectfasongxiaoxiDTOsappzuizhong.Add(projectfasongxiaoxiDTO); + } + } + } } } - - - //鎺ㄩ�丄pp - foreach (var ywjl in Ywjl) - { - - var projectfasongxiaoxisywjl = projectfasongxiaoxiDTOsapp.Where(x => x.Ywjl == ywjl.Id && x.Tel != null && x.Tel.StartsWith("1")).ToList(); - int j = 0; - while (j * 1000 <= projectfasongxiaoxisywjl.Count) - { - j = j + 1; - string numberstring = ""; - string customename = ""; - if (projectfasongxiaoxisywjl != null && projectfasongxiaoxisywjl.Count > 0) - { - int countt = (j * 1000); - if (countt > projectfasongxiaoxisywjl.Count) - { - countt = projectfasongxiaoxisywjl.Count; - } - - for (int i = 0; i < countt; i++) - { - if (numberstring.IndexOf(projectfasongxiaoxisywjl[i + j - 1].Tel) >= 0) - { - continue; - } - numberstring += "\"" + projectfasongxiaoxisywjl[i + j - 1].Tel + "\","; - customename += projectfasongxiaoxisywjl[i + j - 1].Khname + ","; - - } - } - - if (numberstring.EndsWith(",")) - { - numberstring = numberstring.Substring(0, numberstring.Length - 1); - } - string conment = "{" - + "\"title\": \"鏀块噰鍜ㄨ鍏徃涓撲笟涓轰緵搴斿晢浠f嫙璐ㄧ枒鍑姐�佹姇璇変功\"," - + "\"content\": \"鏀块噰鍜ㄨ鍏徃涓撲笟涓轰緵搴斿晢浠f嫙璐ㄧ枒鍑姐�佹姇璇変功锛岃祫娣辨斂搴滈噰璐硶寰嬩笓瀹躲��3000澶氫欢璐ㄧ枒鎶曡瘔鎴愬姛妗堜緥锛屾壘鏀块噰鍜ㄨ锛岃姳閽辨洿灏戙�佽儨绠楁洿楂橈紝鎺ュ彈鎺ㄩ闄╀唬鐞嗭紝璐ㄧ枒鎶曡瘔鎴愬姛鍐嶆敹璐广�備簡瑙h鎯呰鍜ㄨ锛�" + ywjl.Phone + " \"," - + "\"getui_alias\": [" + numberstring + "]," - + "\"payload\": {\"text\": \"鏀块噰鍜ㄨ鍏徃涓撲笟涓轰緵搴斿晢浠f嫙璐ㄧ枒鍑姐�佹姇璇変功锛岃祫娣辨斂搴滈噰璐硶寰嬩笓瀹躲��3000澶氫欢璐ㄧ枒鎶曡瘔鎴愬姛妗堜緥锛屾壘鏀块噰鍜ㄨ锛岃姳閽辨洿灏戙�佽儨绠楁洿楂橈紝鎺ュ彈鎺ㄩ闄╀唬鐞嗭紝璐ㄧ枒鎶曡瘔鎴愬姛鍐嶆敹璐广�備簡瑙h鎯呰鍜ㄨ锛�" + ywjl.Phone + " \"}," - + "\"force_notification\": true" - + "}"; - - string result2 = SMSHelper.PushApp(conment); - _logger.LogInformation("result2:" + result2); - JObject jobjectresult = (JObject)JsonConvert.DeserializeObject(result2); - - if (jobjectresult["code"] != null && jobjectresult["code"].ToString() == "1") - { - var isOK = jobjectresult["isOK"].ToString(); - - foreach (var projectfasongxiaoDTO in projectfasongxiaoxisywjl) - { - if (isOK.IndexOf(projectfasongxiaoDTO.Tel) >= 0) - { - var projectfasongxiaoxi = new Projectfasongxiaoxi(); - projectfasongxiaoxi.Id = Guid.NewGuid().ToString(); - projectfasongxiaoxi.ProjectmingxiId = projectfasongxiaoDTO.ProjectmingxiId; - projectfasongxiaoxi.Xiaoxileixing = projectfasongxiaoDTO.Xiaoxileixing; - projectfasongxiaoxi.Xiaoxizhonglei = projectfasongxiaoDTO.Xiaoxizhonglei; - projectfasongxiaoxi.Gyszl = projectfasongxiaoDTO.Gyszl; - projectfasongxiaoxi.Khname = projectfasongxiaoDTO.Khname; - projectfasongxiaoxi.RecStatus = "A"; - projectfasongxiaoxi.Createtime = DateTime.Now; - _context.Projectfasongxiaoxis.Add(projectfasongxiaoxi); - } - } - _context.SaveChanges(); - } - - - - _logger.LogInformation(ywjl.UserName + "鎺ㄩ�乤pp缁欏鎴�" + customename); - } - - - - - } - //涓氬姟缁忕悊涓虹┖ - if (true) - { - var projectfasongxiaoxisywjl = projectfasongxiaoxiDTOsapp.Where(x => x.Ywjl == null && x.Tel != null && x.Tel.StartsWith("1")).ToList(); - int j = 0; - while (j * 1000 <= projectfasongxiaoxisywjl.Count) - { - j = j + 1; - string numberstring = ""; - string customename = ""; - if (projectfasongxiaoxisywjl != null && projectfasongxiaoxisywjl.Count > 0) - { - int countt = (j * 1000); - if (countt > projectfasongxiaoxisywjl.Count) - { - countt = projectfasongxiaoxisywjl.Count; - } - for (int i = 0; i < countt; i++) - { - if (numberstring.IndexOf(projectfasongxiaoxisywjl[i + j - 1].Tel) >= 0) - { - continue; - } - numberstring += "\"" + projectfasongxiaoxisywjl[i + j - 1].Tel + "\","; - customename += projectfasongxiaoxisywjl[i + j - 1].Khname + ","; - - } - } - - if (numberstring.EndsWith(",")) - { - numberstring = numberstring.Substring(0, numberstring.Length - 1); - } - string conment = "{" - + "\"title\": \"鏀块噰鍜ㄨ鍏徃涓撲笟涓轰緵搴斿晢浠f嫙璐ㄧ枒鍑姐�佹姇璇変功\"," - + "\"content\": \"鏀块噰鍜ㄨ鍏徃涓撲笟涓轰緵搴斿晢浠f嫙璐ㄧ枒鍑姐�佹姇璇変功锛岃祫娣辨斂搴滈噰璐硶寰嬩笓瀹躲��3000澶氫欢璐ㄧ枒鎶曡瘔鎴愬姛妗堜緥锛屾壘鏀块噰鍜ㄨ锛岃姳閽辨洿灏戙�佽儨绠楁洿楂橈紝鎺ュ彈鎺ㄩ闄╀唬鐞嗭紝璐ㄧ枒鎶曡瘔鎴愬姛鍐嶆敹璐广�備簡瑙h鎯呰鍜ㄨ锛�400-028-8080 \"," - + "\"getui_alias\": [" + numberstring + "]," - + "\"payload\": {\"text\": \"鏀块噰鍜ㄨ鍏徃涓撲笟涓轰緵搴斿晢浠f嫙璐ㄧ枒鍑姐�佹姇璇変功锛岃祫娣辨斂搴滈噰璐硶寰嬩笓瀹躲��3000澶氫欢璐ㄧ枒鎶曡瘔鎴愬姛妗堜緥锛屾壘鏀块噰鍜ㄨ锛岃姳閽辨洿灏戙�佽儨绠楁洿楂橈紝鎺ュ彈鎺ㄩ闄╀唬鐞嗭紝璐ㄧ枒鎶曡瘔鎴愬姛鍐嶆敹璐广�備簡瑙h鎯呰鍜ㄨ锛�400-028-8080 \"}," - + "\"force_notification\": true" - + "}"; - - string result2 = SMSHelper.PushApp(conment); - _logger.LogInformation("result2:" + result2); - JObject jobjectresult = (JObject)JsonConvert.DeserializeObject(result2); - - if (jobjectresult["code"] != null && jobjectresult["code"].ToString() == "1") - { - var isOK = jobjectresult["isOK"].ToString(); - - foreach (var projectfasongxiaoDTO in projectfasongxiaoxisywjl) - { - if (isOK.IndexOf(projectfasongxiaoDTO.Tel) >= 0) - { - var projectfasongxiaoxi = new Projectfasongxiaoxi(); - projectfasongxiaoxi.Id = Guid.NewGuid().ToString(); - projectfasongxiaoxi.ProjectmingxiId = projectfasongxiaoDTO.ProjectmingxiId; - projectfasongxiaoxi.Xiaoxileixing = projectfasongxiaoDTO.Xiaoxileixing; - projectfasongxiaoxi.Xiaoxizhonglei = projectfasongxiaoDTO.Xiaoxizhonglei; - projectfasongxiaoxi.Gyszl = projectfasongxiaoDTO.Gyszl; - projectfasongxiaoxi.Khname = projectfasongxiaoDTO.Khname; - projectfasongxiaoxi.RecStatus = "A"; - projectfasongxiaoxi.Createtime = DateTime.Now; - _context.Projectfasongxiaoxis.Add(projectfasongxiaoxi); - } - } - _context.SaveChanges(); - } - - - - _logger.LogInformation("鏃犱笟鍔$粡鐞嗘帹閫乤pp缁欏鎴�" + customename); - } - - - - } - - //鍙戦�佺煭淇� foreach (var ywjl in Ywjl) { - var projectfasongxiaoxisywjl = projectfasongxiaoxiDTOsduanxin.Where(x => x.Ywjl == ywjl.Id && x.Tel != null && x.Tel.StartsWith("1")).ToList(); + var projectfasongxiaoxisywjl = projectfasongxiaoxiDTOsduanxinzuizhong.Where(x => x.Ywjl == ywjl.Id && x.Tel != null && x.Tel.StartsWith("1")).ToList(); if (projectfasongxiaoxisywjl.Count >= 100) { int j = 0; @@ -2842,7 +3427,7 @@ //涓氬姟缁忕悊涓虹┖ if (true) { - var projectfasongxiaoxisywjl = projectfasongxiaoxiDTOsduanxin.Where(x => x.Ywjl == null && x.Tel != null && x.Tel.StartsWith("1")).ToList(); + var projectfasongxiaoxisywjl = projectfasongxiaoxiDTOsduanxinzuizhong.Where(x => x.Ywjl == null && x.Tel != null && x.Tel.StartsWith("1")).ToList(); if (projectfasongxiaoxisywjl.Count >= 100) { int j = 0; @@ -2900,6 +3485,174 @@ } } } + + //鎺ㄩ�丄pp + foreach (var ywjl in Ywjl) + { + + var projectfasongxiaoxisywjl = projectfasongxiaoxiDTOsappzuizhong.Where(x => x.Ywjl == ywjl.Id && x.Tel != null && x.Tel.StartsWith("1")).ToList(); + int j = 0; + while (j * 1000 <= projectfasongxiaoxisywjl.Count) + { + j = j + 1; + string numberstring = ""; + string customename = ""; + if (projectfasongxiaoxisywjl != null && projectfasongxiaoxisywjl.Count > 0) + { + int countt = (j * 1000); + if (countt > projectfasongxiaoxisywjl.Count) + { + countt = projectfasongxiaoxisywjl.Count; + } + + for (int i = 0; i < countt; i++) + { + if (numberstring.IndexOf(projectfasongxiaoxisywjl[i + j - 1].Tel) >= 0) + { + continue; + } + numberstring += "\"" + projectfasongxiaoxisywjl[i + j - 1].Tel + "\","; + customename += projectfasongxiaoxisywjl[i + j - 1].Khname + ","; + + } + } + + if (numberstring.EndsWith(",")) + { + numberstring = numberstring.Substring(0, numberstring.Length - 1); + } + if (string.IsNullOrEmpty(numberstring)) + { + continue; + } + string conment = "{" + + "\"title\": \"鏀块噰鍜ㄨ鍏徃涓撲笟涓轰緵搴斿晢浠f嫙璐ㄧ枒鍑姐�佹姇璇変功\"," + + "\"content\": \"鏀块噰鍜ㄨ鍏徃涓撲笟涓轰緵搴斿晢浠f嫙璐ㄧ枒鍑姐�佹姇璇変功锛岃祫娣辨斂搴滈噰璐硶寰嬩笓瀹躲��3000澶氫欢璐ㄧ枒鎶曡瘔鎴愬姛妗堜緥锛屾壘鏀块噰鍜ㄨ锛岃姳閽辨洿灏戙�佽儨绠楁洿楂橈紝鎺ュ彈鎺ㄩ闄╀唬鐞嗭紝璐ㄧ枒鎶曡瘔鎴愬姛鍐嶆敹璐广�備簡瑙h鎯呰鍜ㄨ锛�" + ywjl.Phone + " \"," + + "\"getui_alias\": [" + numberstring + "]," + + "\"payload\": {\"text\": \"鏀块噰鍜ㄨ鍏徃涓撲笟涓轰緵搴斿晢浠f嫙璐ㄧ枒鍑姐�佹姇璇変功锛岃祫娣辨斂搴滈噰璐硶寰嬩笓瀹躲��3000澶氫欢璐ㄧ枒鎶曡瘔鎴愬姛妗堜緥锛屾壘鏀块噰鍜ㄨ锛岃姳閽辨洿灏戙�佽儨绠楁洿楂橈紝鎺ュ彈鎺ㄩ闄╀唬鐞嗭紝璐ㄧ枒鎶曡瘔鎴愬姛鍐嶆敹璐广�備簡瑙h鎯呰鍜ㄨ锛�" + ywjl.Phone + " \"}," + + "\"force_notification\": true" + + "}"; + + string result2 = SMSHelper.PushApp(conment); + _logger.LogInformation("result2:" + result2); + JObject jobjectresult = (JObject)JsonConvert.DeserializeObject(result2); + + if (jobjectresult["code"] != null && jobjectresult["code"].ToString() == "1") + { + var isOK = jobjectresult["isOK"].ToString(); + + foreach (var projectfasongxiaoDTO in projectfasongxiaoxisywjl) + { + if (isOK.IndexOf(projectfasongxiaoDTO.Tel) >= 0) + { + var projectfasongxiaoxi = new Projectfasongxiaoxi(); + projectfasongxiaoxi.Id = Guid.NewGuid().ToString(); + projectfasongxiaoxi.ProjectmingxiId = projectfasongxiaoDTO.ProjectmingxiId; + projectfasongxiaoxi.Xiaoxileixing = projectfasongxiaoDTO.Xiaoxileixing; + projectfasongxiaoxi.Xiaoxizhonglei = projectfasongxiaoDTO.Xiaoxizhonglei; + projectfasongxiaoxi.Gyszl = projectfasongxiaoDTO.Gyszl; + projectfasongxiaoxi.Khname = projectfasongxiaoDTO.Khname; + projectfasongxiaoxi.RecStatus = "A"; + projectfasongxiaoxi.Createtime = DateTime.Now; + _context.Projectfasongxiaoxis.Add(projectfasongxiaoxi); + } + } + _context.SaveChanges(); + } + + + + _logger.LogInformation(ywjl.UserName + "鎺ㄩ�乤pp缁欏鎴�" + customename); + } + + + + + } + //涓氬姟缁忕悊涓虹┖ + if (true) + { + var projectfasongxiaoxisywjl = projectfasongxiaoxiDTOsappzuizhong.Where(x => x.Ywjl == null && x.Tel != null && x.Tel.StartsWith("1")).ToList(); + int j = 0; + while (j * 1000 <= projectfasongxiaoxisywjl.Count) + { + j = j + 1; + string numberstring = ""; + string customename = ""; + if (projectfasongxiaoxisywjl != null && projectfasongxiaoxisywjl.Count > 0) + { + int countt = (j * 1000); + if (countt > projectfasongxiaoxisywjl.Count) + { + countt = projectfasongxiaoxisywjl.Count; + } + for (int i = 0; i < countt; i++) + { + if (numberstring.IndexOf(projectfasongxiaoxisywjl[i + j - 1].Tel) >= 0) + { + continue; + } + numberstring += "\"" + projectfasongxiaoxisywjl[i + j - 1].Tel + "\","; + customename += projectfasongxiaoxisywjl[i + j - 1].Khname + ","; + + } + } + + if (numberstring.EndsWith(",")) + { + numberstring = numberstring.Substring(0, numberstring.Length - 1); + } + if (string.IsNullOrEmpty(numberstring)) + { + continue; + } + string conment = "{" + + "\"title\": \"鏀块噰鍜ㄨ鍏徃涓撲笟涓轰緵搴斿晢浠f嫙璐ㄧ枒鍑姐�佹姇璇変功\"," + + "\"content\": \"鏀块噰鍜ㄨ鍏徃涓撲笟涓轰緵搴斿晢浠f嫙璐ㄧ枒鍑姐�佹姇璇変功锛岃祫娣辨斂搴滈噰璐硶寰嬩笓瀹躲��3000澶氫欢璐ㄧ枒鎶曡瘔鎴愬姛妗堜緥锛屾壘鏀块噰鍜ㄨ锛岃姳閽辨洿灏戙�佽儨绠楁洿楂橈紝鎺ュ彈鎺ㄩ闄╀唬鐞嗭紝璐ㄧ枒鎶曡瘔鎴愬姛鍐嶆敹璐广�備簡瑙h鎯呰鍜ㄨ锛�400-028-8080 \"," + + "\"getui_alias\": [" + numberstring + "]," + + "\"payload\": {\"text\": \"鏀块噰鍜ㄨ鍏徃涓撲笟涓轰緵搴斿晢浠f嫙璐ㄧ枒鍑姐�佹姇璇変功锛岃祫娣辨斂搴滈噰璐硶寰嬩笓瀹躲��3000澶氫欢璐ㄧ枒鎶曡瘔鎴愬姛妗堜緥锛屾壘鏀块噰鍜ㄨ锛岃姳閽辨洿灏戙�佽儨绠楁洿楂橈紝鎺ュ彈鎺ㄩ闄╀唬鐞嗭紝璐ㄧ枒鎶曡瘔鎴愬姛鍐嶆敹璐广�備簡瑙h鎯呰鍜ㄨ锛�400-028-8080 \"}," + + "\"force_notification\": true" + + "}"; + + string result2 = SMSHelper.PushApp(conment); + _logger.LogInformation("result2:" + result2); + JObject jobjectresult = (JObject)JsonConvert.DeserializeObject(result2); + + if (jobjectresult["code"] != null && jobjectresult["code"].ToString() == "1") + { + var isOK = jobjectresult["isOK"].ToString(); + + foreach (var projectfasongxiaoDTO in projectfasongxiaoxisywjl) + { + if (isOK.IndexOf(projectfasongxiaoDTO.Tel) >= 0) + { + var projectfasongxiaoxi = new Projectfasongxiaoxi(); + projectfasongxiaoxi.Id = Guid.NewGuid().ToString(); + projectfasongxiaoxi.ProjectmingxiId = projectfasongxiaoDTO.ProjectmingxiId; + projectfasongxiaoxi.Xiaoxileixing = projectfasongxiaoDTO.Xiaoxileixing; + projectfasongxiaoxi.Xiaoxizhonglei = projectfasongxiaoDTO.Xiaoxizhonglei; + projectfasongxiaoxi.Gyszl = projectfasongxiaoDTO.Gyszl; + projectfasongxiaoxi.Khname = projectfasongxiaoDTO.Khname; + projectfasongxiaoxi.RecStatus = "A"; + projectfasongxiaoxi.Createtime = DateTime.Now; + _context.Projectfasongxiaoxis.Add(projectfasongxiaoxi); + } + } + _context.SaveChanges(); + } + + + + _logger.LogInformation("鏃犱笟鍔$粡鐞嗘帹閫乤pp缁欏鎴�" + customename); + } + + + + } + + + + } catch (Exception ex) { @@ -3040,6 +3793,18 @@ cooperatecustomCustomerDTO.ShrAddress = hit["area"].ToString() + hit["address"].ToString(); resultEntity = _cooperatecustomCustomerService.save(cooperatecustomCustomerDTO); + //2023-03-23 娣诲姞鍦ㄨ亴浼佷笟 + var customerGuanlianhuiyuan1 = _context.CustomerGuanlianhuiyuans.Where(x => x.Huiyuanid == cooperatecustomCustomerDTO.HuiyuanId && x.Customerid == cooperatecustomCustomerDTO.Id).FirstOrDefault(); + if (customerGuanlianhuiyuan1 == null) + { + CustomerGuanlianhuiyuan customerGuanlianhuiyuan = new CustomerGuanlianhuiyuan(); + customerGuanlianhuiyuan.Id = Guid.NewGuid().ToString(); + customerGuanlianhuiyuan.Huiyuanid = cooperatecustomCustomerDTO.HuiyuanId; + customerGuanlianhuiyuan.Customerid = cooperatecustomCustomerDTO.Id; + customerGuanlianhuiyuan.Customertype = "鍚堜綔瀹㈡埛"; + _context.CustomerGuanlianhuiyuans.Add(customerGuanlianhuiyuan); + _context.SaveChanges(); + } if (!resultEntity.Result) { throw new Exception("淇濆瓨鍚堜綔瀹㈡埛:" + cooperatecustomCustomerDTO.Name + "鍑洪敊锛�"); @@ -3052,6 +3817,18 @@ cooperatecustomCustomerDTO.ShrTel = hit["mobile"].ToString(); cooperatecustomCustomerDTO.ShrAddress = hit["area"].ToString() + hit["address"].ToString(); resultEntity = _cooperatecustomCustomerService.save(cooperatecustomCustomerDTO); + //2023-03-23 娣诲姞鍦ㄨ亴浼佷笟 + var customerGuanlianhuiyuan1 = _context.CustomerGuanlianhuiyuans.Where(x => x.Huiyuanid == cooperatecustomCustomerDTO.HuiyuanId && x.Customerid == cooperatecustomCustomerDTO.Id).FirstOrDefault(); + if (customerGuanlianhuiyuan1 == null) + { + CustomerGuanlianhuiyuan customerGuanlianhuiyuan = new CustomerGuanlianhuiyuan(); + customerGuanlianhuiyuan.Id = Guid.NewGuid().ToString(); + customerGuanlianhuiyuan.Huiyuanid = cooperatecustomCustomerDTO.HuiyuanId; + customerGuanlianhuiyuan.Customerid = cooperatecustomCustomerDTO.Id; + customerGuanlianhuiyuan.Customertype = "鍚堜綔瀹㈡埛"; + _context.CustomerGuanlianhuiyuans.Add(customerGuanlianhuiyuan); + _context.SaveChanges(); + } if (!resultEntity.Result) { throw new Exception("淇濆瓨鍚堜綔瀹㈡埛:" + cooperatecustomCustomerDTO.Name + "鍑洪敊锛�"); @@ -3065,6 +3842,18 @@ cooperatecustomCustomerDTO.ShrTel = hit["mobile"].ToString(); cooperatecustomCustomerDTO.ShrAddress = hit["area"].ToString() + hit["address"].ToString(); resultEntity = _cooperatecustomCustomerService.save(cooperatecustomCustomerDTO); + //2023-03-23 娣诲姞鍦ㄨ亴浼佷笟 + var customerGuanlianhuiyuan1 = _context.CustomerGuanlianhuiyuans.Where(x => x.Huiyuanid == cooperatecustomCustomerDTO.HuiyuanId && x.Customerid == cooperatecustomCustomerDTO.Id).FirstOrDefault(); + if (customerGuanlianhuiyuan1 == null) + { + CustomerGuanlianhuiyuan customerGuanlianhuiyuan = new CustomerGuanlianhuiyuan(); + customerGuanlianhuiyuan.Id = Guid.NewGuid().ToString(); + customerGuanlianhuiyuan.Huiyuanid = cooperatecustomCustomerDTO.HuiyuanId; + customerGuanlianhuiyuan.Customerid = cooperatecustomCustomerDTO.Id; + customerGuanlianhuiyuan.Customertype = "鍚堜綔瀹㈡埛"; + _context.CustomerGuanlianhuiyuans.Add(customerGuanlianhuiyuan); + _context.SaveChanges(); + } if (!resultEntity.Result) { throw new Exception("淇濆瓨鍚堜綔瀹㈡埛:" + cooperatecustomCustomerDTO.Name + "鍑洪敊锛�"); @@ -3139,6 +3928,18 @@ cooperatecustomCustomerDTO.Modifytime = cooperatecustomCustomerDTO.Createtime; resultEntity = _cooperatecustomCustomerService.save(cooperatecustomCustomerDTO); + //2023-03-23 娣诲姞鍦ㄨ亴浼佷笟 + var customerGuanlianhuiyuan1 = _context.CustomerGuanlianhuiyuans.Where(x => x.Huiyuanid == cooperatecustomCustomerDTO.HuiyuanId && x.Customerid == cooperatecustomCustomerDTO.Id).FirstOrDefault(); + if (customerGuanlianhuiyuan1 == null) + { + CustomerGuanlianhuiyuan customerGuanlianhuiyuan = new CustomerGuanlianhuiyuan(); + customerGuanlianhuiyuan.Id = Guid.NewGuid().ToString(); + customerGuanlianhuiyuan.Huiyuanid = cooperatecustomCustomerDTO.HuiyuanId; + customerGuanlianhuiyuan.Customerid = cooperatecustomCustomerDTO.Id; + customerGuanlianhuiyuan.Customertype = "鍚堜綔瀹㈡埛"; + _context.CustomerGuanlianhuiyuans.Add(customerGuanlianhuiyuan); + _context.SaveChanges(); + } if (!resultEntity.Result) { throw new Exception("淇濆瓨鍚堜綔瀹㈡埛:" + cooperatecustomCustomerDTO.Name + "鍑洪敊锛�"); @@ -3148,6 +3949,18 @@ { cooperatecustomCustomerDTO.HuiyuanId = hit["ID"].ToString(); resultEntity = _cooperatecustomCustomerService.save(cooperatecustomCustomerDTO); + //2023-03-23 娣诲姞鍦ㄨ亴浼佷笟 + var customerGuanlianhuiyuan1 = _context.CustomerGuanlianhuiyuans.Where(x => x.Huiyuanid == cooperatecustomCustomerDTO.HuiyuanId && x.Customerid == cooperatecustomCustomerDTO.Id).FirstOrDefault(); + if (customerGuanlianhuiyuan1 == null) + { + CustomerGuanlianhuiyuan customerGuanlianhuiyuan = new CustomerGuanlianhuiyuan(); + customerGuanlianhuiyuan.Id = Guid.NewGuid().ToString(); + customerGuanlianhuiyuan.Huiyuanid = cooperatecustomCustomerDTO.HuiyuanId; + customerGuanlianhuiyuan.Customerid = cooperatecustomCustomerDTO.Id; + customerGuanlianhuiyuan.Customertype = "鍚堜綔瀹㈡埛"; + _context.CustomerGuanlianhuiyuans.Add(customerGuanlianhuiyuan); + _context.SaveChanges(); + } if (!resultEntity.Result) { throw new Exception("淇濆瓨鍚堜綔瀹㈡埛:" + cooperatecustomCustomerDTO.Name + "鍑洪敊锛�"); -- Gitblit v1.9.1