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 | 1266 ++++++++++++++++++++++++++++----------------------------
 1 files changed, 635 insertions(+), 631 deletions(-)

diff --git a/zhengcaioa/zhengcaioa/Timer/TimerGetShopUsersService.cs b/zhengcaioa/zhengcaioa/Timer/TimerGetShopUsersService.cs
index dd4d546..259a77a 100644
--- a/zhengcaioa/zhengcaioa/Timer/TimerGetShopUsersService.cs
+++ b/zhengcaioa/zhengcaioa/Timer/TimerGetShopUsersService.cs
@@ -60,12 +60,13 @@
             {
                 _logger.LogInformation("TimerGetShopUsersService 寮�濮嬫墽琛�");
                 _logger.LogInformation(datenow.ToString("yyyy-MM-dd HH:mm:ss"));
-                if (datenowfasongxiaoxi.Day == DateTime.Now.Day && DateTime.Now.Hour == 20)
+                if (datenowfasongxiaoxi.Day == DateTime.Now.Day && DateTime.Now.Hour == 12)
                 //if (true)
                 {
 
                     try
                     {
+                        datenowfasongxiaoxi.AddDays(1);
                         this.fasongxiaoxi();
 
                     }
@@ -73,7 +74,6 @@
                     {
                         _logger.LogInformation(ex.ToString());
                     }
-                    datenowfasongxiaoxi.AddDays(1);
                 }
 
                 //姣忎釜灏忔椂璁$畻涓�娆�
@@ -614,6 +614,141 @@
                     }
                 }
 
+                //鍙戦�佺煭淇�
+                foreach (var ywjl in Ywjl)
+                {
+                    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)
+                        {
+                            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 (numberstring.Split(',').Length >= 100)
+                            {
+                                string sss = SMSHelper.PushWToUserMES(numberstring, "鏀块噰鍜ㄨ鍏徃鐨勨�滄爣涔﹂璇勫鈥濇湇鍔★紝鐢�3浣嶉��浼戣祫娣辫瘎瀹′笓瀹跺湪寮�鏍囧墠鎸夌収璇勬爣娴佺▼涓烘偍浜ゅ弶妫�鏌ユ爣涔︼紝鏉滅粷搴熸爣 銆佸府鍔╂偍寰楀埌鍏ㄩ儴缁煎悎璇勫寰楀垎锛岀粡鏀块噰鍜ㄨ鍏徃妫�鏌ヨ繃鐨勬爣涔︼紝涓嶅彲鑳借搴熸爣锛岃鎯呰鍜ㄨ锛�" + ywjl.Phone);
+                                if (int.Parse(sss) >= 0)
+                                {
+                                    foreach (var projectfasongxiaoDTO in projectfasongxiaoxisywjl)
+                                    {
+                                        var projectfasongxiaoxi = new Projectfasongxiaoxi();
+                                        projectfasongxiaoxi.Id = Guid.NewGuid().ToString();
+                                        projectfasongxiaoxi.ProjectId = projectfasongxiaoDTO.ProjectId;
+                                        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 + "鍙戦�佺煭淇$粰瀹㈡埛" + customename);
+                            }
+                        }
+
+
+
+
+
+                    }
+
+                }
+                //涓氬姟缁忕悊涓虹┖
+                if (true)
+                {
+                    var projectfasongxiaoxisywjl = projectfasongxiaoxiDTOsduanxinzuizhong.Where(x => x.Ywjl == null && x.Tel != null && x.Tel.StartsWith("1")).ToList();
+                    if (projectfasongxiaoxisywjl.Count >= 100)
+                    {
+                        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 (numberstring.Split(',').Length >= 100)
+                            {
+                                string sss = SMSHelper.PushWToUserMES(numberstring, "鏀块噰鍜ㄨ鍏徃鐨勨�滄爣涔﹂璇勫鈥濇湇鍔★紝鐢�3浣嶉��浼戣祫娣辫瘎瀹′笓瀹跺湪寮�鏍囧墠鎸夌収璇勬爣娴佺▼涓烘偍浜ゅ弶妫�鏌ユ爣涔︼紝鏉滅粷搴熸爣 銆佸府鍔╂偍寰楀埌鍏ㄩ儴缁煎悎璇勫寰楀垎锛岀粡鏀块噰鍜ㄨ鍏徃妫�鏌ヨ繃鐨勬爣涔︼紝涓嶅彲鑳借搴熸爣锛岃鎯呰鍜ㄨ锛�400-028-8080");
+                                if (int.Parse(sss) >= 0)
+                                {
+                                    foreach (var projectfasongxiaoDTO in projectfasongxiaoxisywjl)
+                                    {
+                                        var projectfasongxiaoxi = new Projectfasongxiaoxi();
+                                        projectfasongxiaoxi.Id = Guid.NewGuid().ToString();
+                                        projectfasongxiaoxi.ProjectId = projectfasongxiaoDTO.ProjectId;
+                                        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("鏃犲鎴风粡鐞嗗彂閫佺煭淇$粰瀹㈡埛" + customename);
+                            }
+                        }
+
+
+
+
+                    }
+                }
 
                 //鎺ㄩ�丄pp
                 foreach (var ywjl in Ywjl)
@@ -781,141 +916,7 @@
 
 
 
-                //鍙戦�佺煭淇�
-                foreach (var ywjl in Ywjl)
-                {
-                    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)
-                        {
-                            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 (numberstring.Split(',').Length >= 100)
-                            {
-                                string sss = SMSHelper.PushWToUserMES(numberstring, "鏀块噰鍜ㄨ鍏徃鐨勨�滄爣涔﹂璇勫鈥濇湇鍔★紝鐢�3浣嶉��浼戣祫娣辫瘎瀹′笓瀹跺湪寮�鏍囧墠鎸夌収璇勬爣娴佺▼涓烘偍浜ゅ弶妫�鏌ユ爣涔︼紝鏉滅粷搴熸爣 銆佸府鍔╂偍寰楀埌鍏ㄩ儴缁煎悎璇勫寰楀垎锛岀粡鏀块噰鍜ㄨ鍏徃妫�鏌ヨ繃鐨勬爣涔︼紝涓嶅彲鑳借搴熸爣锛岃鎯呰鍜ㄨ锛�" + ywjl.Phone);
-                                if (int.Parse(sss) >= 0)
-                                {
-                                    foreach (var projectfasongxiaoDTO in projectfasongxiaoxisywjl)
-                                    {
-                                        var projectfasongxiaoxi = new Projectfasongxiaoxi();
-                                        projectfasongxiaoxi.Id = Guid.NewGuid().ToString();
-                                        projectfasongxiaoxi.ProjectId = projectfasongxiaoDTO.ProjectId;
-                                        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 + "鍙戦�佺煭淇$粰瀹㈡埛" + customename);
-                            }
-                        }
-
-                       
-
-
-
-                    }
-
-                }
-                //涓氬姟缁忕悊涓虹┖
-                if (true)
-                {
-                    var projectfasongxiaoxisywjl = projectfasongxiaoxiDTOsduanxinzuizhong.Where(x => x.Ywjl == null && x.Tel != null && x.Tel.StartsWith("1")).ToList();
-                    if (projectfasongxiaoxisywjl.Count >= 100)
-                    {
-                        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 (numberstring.Split(',').Length >= 100)
-                            {
-                                string sss = SMSHelper.PushWToUserMES(numberstring, "鏀块噰鍜ㄨ鍏徃鐨勨�滄爣涔﹂璇勫鈥濇湇鍔★紝鐢�3浣嶉��浼戣祫娣辫瘎瀹′笓瀹跺湪寮�鏍囧墠鎸夌収璇勬爣娴佺▼涓烘偍浜ゅ弶妫�鏌ユ爣涔︼紝鏉滅粷搴熸爣 銆佸府鍔╂偍寰楀埌鍏ㄩ儴缁煎悎璇勫寰楀垎锛岀粡鏀块噰鍜ㄨ鍏徃妫�鏌ヨ繃鐨勬爣涔︼紝涓嶅彲鑳借搴熸爣锛岃鎯呰鍜ㄨ锛�400-028-8080");
-                                if (int.Parse(sss) >= 0)
-                                {
-                                    foreach (var projectfasongxiaoDTO in projectfasongxiaoxisywjl)
-                                    {
-                                        var projectfasongxiaoxi = new Projectfasongxiaoxi();
-                                        projectfasongxiaoxi.Id = Guid.NewGuid().ToString();
-                                        projectfasongxiaoxi.ProjectId = projectfasongxiaoDTO.ProjectId;
-                                        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("鏃犲鎴风粡鐞嗗彂閫佺煭淇$粰瀹㈡埛" + customename);
-                            }
-                        }
-
-
-                           
-
-                    }
-                }
+              
 
 
                 
@@ -1265,100 +1266,6 @@
                         }
                     }
                 }
-
-
-                //鎺ㄩ�丄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);
-
-                        }
-
-                }
-
-
-
                 //鍙戦�佺煭淇�
                 foreach (var ywjl in Ywjl)
                 {
@@ -1494,6 +1401,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)
@@ -1794,6 +1795,141 @@
                     }
                 }
 
+                //鍙戦�佺煭淇�
+                foreach (var ywjl in Ywjl)
+                {
+                    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)
+                        {
+                            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 (numberstring.Split(',').Length >= 100)
+                            {
+                                string sss = SMSHelper.PushWToUserMES(numberstring, "鏀块噰鍜ㄨ鍏徃涓撲笟鈥滄爣涔︽鏌モ�濄�佲�滄爣涔︽寚瀵尖�濓紝閫�浼戣祫娣辫瘎瀹′笓瀹跺湪寮�鏍囧墠鎸夌収璇勬爣娴佺▼涓烘偍浜ゅ弶妫�鏌ャ�佹寚瀵兼爣涔︼紝璁╄瘎瀹′笓瀹舵壘涓嶅嚭涓昏鏂规鎵e垎鐞嗙敱锛岃嚦灏戝姪鎮ㄦ彁鍗囩患鍚堣瘎瀹″緱鍒�5-10鍒嗐�備簡瑙h鎯呰鍜ㄨ锛�" + ywjl.Phone);
+                                if (int.Parse(sss) >= 0)
+                                {
+                                    foreach (var projectfasongxiaoDTO in projectfasongxiaoxisywjl)
+                                    {
+                                        var projectfasongxiaoxi = new Projectfasongxiaoxi();
+                                        projectfasongxiaoxi.Id = Guid.NewGuid().ToString();
+                                        projectfasongxiaoxi.ProjectId = projectfasongxiaoDTO.ProjectId;
+                                        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 + "鍙戦�佺煭淇$粰瀹㈡埛" + customename);
+                            }
+                        }
+
+
+
+
+
+                    }
+
+                }
+                //涓氬姟缁忕悊涓虹┖
+                if (true)
+                {
+                    var projectfasongxiaoxisywjl = projectfasongxiaoxiDTOsduanxinzuizhong.Where(x => x.Ywjl == null && x.Tel != null && x.Tel.StartsWith("1")).ToList();
+                    if (projectfasongxiaoxisywjl.Count >= 100)
+                    {
+                        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 (numberstring.Split(',').Length >= 100)
+                            {
+                                string sss = SMSHelper.PushWToUserMES(numberstring, "鏀块噰鍜ㄨ鍏徃涓撲笟鈥滄爣涔︽鏌モ�濄�佲�滄爣涔︽寚瀵尖�濓紝閫�浼戣祫娣辫瘎瀹′笓瀹跺湪寮�鏍囧墠鎸夌収璇勬爣娴佺▼涓烘偍浜ゅ弶妫�鏌ャ�佹寚瀵兼爣涔︼紝璁╄瘎瀹′笓瀹舵壘涓嶅嚭涓昏鏂规鎵e垎鐞嗙敱锛岃嚦灏戝姪鎮ㄦ彁鍗囩患鍚堣瘎瀹″緱鍒�5-10鍒嗐�備簡瑙h鎯呰鍜ㄨ锛�400-028-8080");
+                                if (int.Parse(sss) >= 0)
+                                {
+                                    foreach (var projectfasongxiaoDTO in projectfasongxiaoxisywjl)
+                                    {
+                                        var projectfasongxiaoxi = new Projectfasongxiaoxi();
+                                        projectfasongxiaoxi.Id = Guid.NewGuid().ToString();
+                                        projectfasongxiaoxi.ProjectId = projectfasongxiaoDTO.ProjectId;
+                                        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("鏃犲鎴风粡鐞嗗彂閫佺煭淇$粰瀹㈡埛" + customename);
+                            }
+                        }
+
+
+
+
+                    }
+                }
 
                 //鎺ㄩ�丄pp
                 foreach (var ywjl in Ywjl)
@@ -1959,141 +2095,7 @@
 
 
 
-                //鍙戦�佺煭淇�
-                foreach (var ywjl in Ywjl)
-                {
-                    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)
-                        {
-                            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 (numberstring.Split(',').Length >= 100)
-                            {
-                                string sss = SMSHelper.PushWToUserMES(numberstring, "鏀块噰鍜ㄨ鍏徃涓撲笟鈥滄爣涔︽鏌モ�濄�佲�滄爣涔︽寚瀵尖�濓紝閫�浼戣祫娣辫瘎瀹′笓瀹跺湪寮�鏍囧墠鎸夌収璇勬爣娴佺▼涓烘偍浜ゅ弶妫�鏌ャ�佹寚瀵兼爣涔︼紝璁╄瘎瀹′笓瀹舵壘涓嶅嚭涓昏鏂规鎵e垎鐞嗙敱锛岃嚦灏戝姪鎮ㄦ彁鍗囩患鍚堣瘎瀹″緱鍒�5-10鍒嗐�備簡瑙h鎯呰鍜ㄨ锛�" + ywjl.Phone);
-                                if (int.Parse(sss) >= 0)
-                                {
-                                    foreach (var projectfasongxiaoDTO in projectfasongxiaoxisywjl)
-                                    {
-                                        var projectfasongxiaoxi = new Projectfasongxiaoxi();
-                                        projectfasongxiaoxi.Id = Guid.NewGuid().ToString();
-                                        projectfasongxiaoxi.ProjectId = projectfasongxiaoDTO.ProjectId;
-                                        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 + "鍙戦�佺煭淇$粰瀹㈡埛" + customename);
-                            }
-                        }
-
-
-
-
-
-                    }
-
-                }
-                //涓氬姟缁忕悊涓虹┖
-                if (true)
-                {
-                    var projectfasongxiaoxisywjl = projectfasongxiaoxiDTOsduanxinzuizhong.Where(x => x.Ywjl == null && x.Tel != null && x.Tel.StartsWith("1")).ToList();
-                    if (projectfasongxiaoxisywjl.Count >= 100)
-                    {
-                        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 (numberstring.Split(',').Length >= 100)
-                            {
-                                string sss = SMSHelper.PushWToUserMES(numberstring, "鏀块噰鍜ㄨ鍏徃涓撲笟鈥滄爣涔︽鏌モ�濄�佲�滄爣涔︽寚瀵尖�濓紝閫�浼戣祫娣辫瘎瀹′笓瀹跺湪寮�鏍囧墠鎸夌収璇勬爣娴佺▼涓烘偍浜ゅ弶妫�鏌ャ�佹寚瀵兼爣涔︼紝璁╄瘎瀹′笓瀹舵壘涓嶅嚭涓昏鏂规鎵e垎鐞嗙敱锛岃嚦灏戝姪鎮ㄦ彁鍗囩患鍚堣瘎瀹″緱鍒�5-10鍒嗐�備簡瑙h鎯呰鍜ㄨ锛�400-028-8080");
-                                if (int.Parse(sss) >= 0)
-                                {
-                                    foreach (var projectfasongxiaoDTO in projectfasongxiaoxisywjl)
-                                    {
-                                        var projectfasongxiaoxi = new Projectfasongxiaoxi();
-                                        projectfasongxiaoxi.Id = Guid.NewGuid().ToString();
-                                        projectfasongxiaoxi.ProjectId = projectfasongxiaoDTO.ProjectId;
-                                        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("鏃犲鎴风粡鐞嗗彂閫佺煭淇$粰瀹㈡埛" + customename);
-                            }
-                        }
-
-
-
-
-                    }
-                }
+               
 
             }
             catch (Exception ex)
@@ -2387,6 +2389,141 @@
                     }
                 }
 
+                //鍙戦�佺煭淇�
+                foreach (var ywjl in Ywjl)
+                {
+                    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)
+                        {
+                            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 (numberstring.Split(',').Length >= 100)
+                            {
+                                string sss = SMSHelper.PushWToUserMES(numberstring, "鏀块噰鍜ㄨ鍏徃涓撲笟鈥滄爣涔︽鏌モ�濄�佲�滄爣涔︽寚瀵尖�濓紝閫�浼戣祫娣辫瘎瀹′笓瀹跺湪寮�鏍囧墠鎸夌収璇勬爣娴佺▼涓烘偍浜ゅ弶妫�鏌ャ�佹寚瀵兼爣涔︼紝璁╂偍寰楅綈鍏ㄩ儴瀹㈣鍒嗗拰涓昏鍒嗭紝浠庢涓嶅啀涓烘爣涔﹀埗浣滄搷蹇冦�備簡瑙h鎯呰鍜ㄨ锛�" + ywjl.Phone);
+                                if (int.Parse(sss) >= 0)
+                                {
+                                    foreach (var projectfasongxiaoDTO in projectfasongxiaoxisywjl)
+                                    {
+                                        var projectfasongxiaoxi = new Projectfasongxiaoxi();
+                                        projectfasongxiaoxi.Id = Guid.NewGuid().ToString();
+                                        projectfasongxiaoxi.ProjectId = projectfasongxiaoDTO.ProjectId;
+                                        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 + "鍙戦�佺煭淇$粰瀹㈡埛" + customename);
+                            }
+                        }
+
+
+
+
+
+                    }
+
+                }
+                //涓氬姟缁忕悊涓虹┖
+                if (true)
+                {
+                    var projectfasongxiaoxisywjl = projectfasongxiaoxiDTOsduanxinzuizhong.Where(x => x.Ywjl == null && x.Tel != null && x.Tel.StartsWith("1")).ToList();
+                    if (projectfasongxiaoxisywjl.Count >= 100)
+                    {
+                        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 (numberstring.Split(',').Length >= 100)
+                            {
+                                string sss = SMSHelper.PushWToUserMES(numberstring, "鏀块噰鍜ㄨ鍏徃涓撲笟鈥滄爣涔︽鏌モ�濄�佲�滄爣涔︽寚瀵尖�濓紝閫�浼戣祫娣辫瘎瀹′笓瀹跺湪寮�鏍囧墠鎸夌収璇勬爣娴佺▼涓烘偍浜ゅ弶妫�鏌ャ�佹寚瀵兼爣涔︼紝璁╂偍寰楅綈鍏ㄩ儴瀹㈣鍒嗗拰涓昏鍒嗭紝浠庢涓嶅啀涓烘爣涔﹀埗浣滄搷蹇冦�備簡瑙h鎯呰鍜ㄨ锛�400-028-8080");
+                                if (int.Parse(sss) >= 0)
+                                {
+                                    foreach (var projectfasongxiaoDTO in projectfasongxiaoxisywjl)
+                                    {
+                                        var projectfasongxiaoxi = new Projectfasongxiaoxi();
+                                        projectfasongxiaoxi.Id = Guid.NewGuid().ToString();
+                                        projectfasongxiaoxi.ProjectId = projectfasongxiaoDTO.ProjectId;
+                                        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("鏃犲鎴风粡鐞嗗彂閫佺煭淇$粰瀹㈡埛" + customename);
+                            }
+                        }
+
+
+
+
+                    }
+                }
 
                 //鎺ㄩ�丄pp
                 foreach (var ywjl in Ywjl)
@@ -2552,141 +2689,7 @@
 
 
 
-                //鍙戦�佺煭淇�
-                foreach (var ywjl in Ywjl)
-                {
-                    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)
-                        {
-                            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 (numberstring.Split(',').Length >= 100)
-                            {
-                                string sss = SMSHelper.PushWToUserMES(numberstring, "鏀块噰鍜ㄨ鍏徃涓撲笟鈥滄爣涔︽鏌モ�濄�佲�滄爣涔︽寚瀵尖�濓紝閫�浼戣祫娣辫瘎瀹′笓瀹跺湪寮�鏍囧墠鎸夌収璇勬爣娴佺▼涓烘偍浜ゅ弶妫�鏌ャ�佹寚瀵兼爣涔︼紝璁╂偍寰楅綈鍏ㄩ儴瀹㈣鍒嗗拰涓昏鍒嗭紝浠庢涓嶅啀涓烘爣涔﹀埗浣滄搷蹇冦�備簡瑙h鎯呰鍜ㄨ锛�" + ywjl.Phone);
-                                if (int.Parse(sss) >= 0)
-                                {
-                                    foreach (var projectfasongxiaoDTO in projectfasongxiaoxisywjl)
-                                    {
-                                        var projectfasongxiaoxi = new Projectfasongxiaoxi();
-                                        projectfasongxiaoxi.Id = Guid.NewGuid().ToString();
-                                        projectfasongxiaoxi.ProjectId = projectfasongxiaoDTO.ProjectId;
-                                        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 + "鍙戦�佺煭淇$粰瀹㈡埛" + customename);
-                            }
-                        }
-
-
-
-
-
-                    }
-
-                }
-                //涓氬姟缁忕悊涓虹┖
-                if (true)
-                {
-                    var projectfasongxiaoxisywjl = projectfasongxiaoxiDTOsduanxinzuizhong.Where(x => x.Ywjl == null && x.Tel != null && x.Tel.StartsWith("1")).ToList();
-                    if (projectfasongxiaoxisywjl.Count >= 100)
-                    {
-                        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 (numberstring.Split(',').Length >= 100)
-                            {
-                                string sss = SMSHelper.PushWToUserMES(numberstring, "鏀块噰鍜ㄨ鍏徃涓撲笟鈥滄爣涔︽鏌モ�濄�佲�滄爣涔︽寚瀵尖�濓紝閫�浼戣祫娣辫瘎瀹′笓瀹跺湪寮�鏍囧墠鎸夌収璇勬爣娴佺▼涓烘偍浜ゅ弶妫�鏌ャ�佹寚瀵兼爣涔︼紝璁╂偍寰楅綈鍏ㄩ儴瀹㈣鍒嗗拰涓昏鍒嗭紝浠庢涓嶅啀涓烘爣涔﹀埗浣滄搷蹇冦�備簡瑙h鎯呰鍜ㄨ锛�400-028-8080");
-                                if (int.Parse(sss) >= 0)
-                                {
-                                    foreach (var projectfasongxiaoDTO in projectfasongxiaoxisywjl)
-                                    {
-                                        var projectfasongxiaoxi = new Projectfasongxiaoxi();
-                                        projectfasongxiaoxi.Id = Guid.NewGuid().ToString();
-                                        projectfasongxiaoxi.ProjectId = projectfasongxiaoDTO.ProjectId;
-                                        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("鏃犲鎴风粡鐞嗗彂閫佺煭淇$粰瀹㈡埛" + customename);
-                            }
-                        }
-
-
-
-
-                    }
-                }
+                
 
             }
             catch (Exception ex)
@@ -3352,6 +3355,136 @@
                     }
                 }
 
+                //鍙戦�佺煭淇�
+                foreach (var ywjl in Ywjl)
+                {
+                    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)
+                        {
+                            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 (numberstring.Split(',').Length >= 100)
+                            {
+                                string sss = SMSHelper.PushWToUserMES(numberstring, "鏀块噰鍜ㄨ鍏徃涓撲笟涓轰緵搴斿晢浠f嫙璐ㄧ枒鍑姐�佹姇璇変功锛岃祫娣辨斂搴滈噰璐硶寰嬩笓瀹躲��3000澶氫欢璐ㄧ枒鎶曡瘔鎴愬姛妗堜緥锛屾壘鏀块噰鍜ㄨ锛岃姳閽辨洿灏戙�佽儨绠楁洿楂橈紝鎺ュ彈鎺ㄩ闄╀唬鐞嗭紝璐ㄧ枒鎶曡瘔鎴愬姛鍐嶆敹璐广�備簡瑙h鎯呰鍜ㄨ锛�" + ywjl.Phone);
+                                if (int.Parse(sss) >= 0)
+                                {
+                                    foreach (var projectfasongxiaoDTO in projectfasongxiaoxisywjl)
+                                    {
+                                        var projectfasongxiaoxi = new Projectfasongxiaoxi();
+                                        projectfasongxiaoxi.Id = Guid.NewGuid().ToString();
+                                        projectfasongxiaoxi.ProjectId = projectfasongxiaoDTO.ProjectId;
+                                        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 + "鍙戦�佺煭淇$粰瀹㈡埛" + customename);
+                            }
+                        }
+
+
+
+
+
+                    }
+
+                }
+                //涓氬姟缁忕悊涓虹┖
+                if (true)
+                {
+                    var projectfasongxiaoxisywjl = projectfasongxiaoxiDTOsduanxinzuizhong.Where(x => x.Ywjl == null && x.Tel != null && x.Tel.StartsWith("1")).ToList();
+                    if (projectfasongxiaoxisywjl.Count >= 100)
+                    {
+                        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 (numberstring.Split(',').Length >= 100)
+                            {
+                                string sss = SMSHelper.PushWToUserMES(numberstring, "鏀块噰鍜ㄨ鍏徃涓撲笟涓轰緵搴斿晢浠f嫙璐ㄧ枒鍑姐�佹姇璇変功锛岃祫娣辨斂搴滈噰璐硶寰嬩笓瀹躲��3000澶氫欢璐ㄧ枒鎶曡瘔鎴愬姛妗堜緥锛屾壘鏀块噰鍜ㄨ锛岃姳閽辨洿灏戙�佽儨绠楁洿楂橈紝鎺ュ彈鎺ㄩ闄╀唬鐞嗭紝璐ㄧ枒鎶曡瘔鎴愬姛鍐嶆敹璐广�備簡瑙h鎯呰鍜ㄨ锛�400-028-8080");
+                                if (int.Parse(sss) >= 0)
+                                {
+                                    foreach (var projectfasongxiaoDTO in projectfasongxiaoxisywjl)
+                                    {
+                                        var projectfasongxiaoxi = new Projectfasongxiaoxi();
+                                        projectfasongxiaoxi.Id = Guid.NewGuid().ToString();
+                                        projectfasongxiaoxi.ProjectId = projectfasongxiaoDTO.ProjectId;
+                                        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("鏃犲鎴风粡鐞嗗彂閫佺煭淇$粰瀹㈡埛" + customename);
+                            }
+                        }
+                    }
+                }
 
                 //鎺ㄩ�丄pp
                 foreach (var ywjl in Ywjl)
@@ -3519,136 +3652,7 @@
 
 
 
-                //鍙戦�佺煭淇�
-                foreach (var ywjl in Ywjl)
-                {
-                    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)
-                        {
-                            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 (numberstring.Split(',').Length >= 100)
-                            {
-                                string sss = SMSHelper.PushWToUserMES(numberstring, "鏀块噰鍜ㄨ鍏徃涓撲笟涓轰緵搴斿晢浠f嫙璐ㄧ枒鍑姐�佹姇璇変功锛岃祫娣辨斂搴滈噰璐硶寰嬩笓瀹躲��3000澶氫欢璐ㄧ枒鎶曡瘔鎴愬姛妗堜緥锛屾壘鏀块噰鍜ㄨ锛岃姳閽辨洿灏戙�佽儨绠楁洿楂橈紝鎺ュ彈鎺ㄩ闄╀唬鐞嗭紝璐ㄧ枒鎶曡瘔鎴愬姛鍐嶆敹璐广�備簡瑙h鎯呰鍜ㄨ锛�" + ywjl.Phone);
-                                if (int.Parse(sss) >= 0)
-                                {
-                                    foreach (var projectfasongxiaoDTO in projectfasongxiaoxisywjl)
-                                    {
-                                        var projectfasongxiaoxi = new Projectfasongxiaoxi();
-                                        projectfasongxiaoxi.Id = Guid.NewGuid().ToString();
-                                        projectfasongxiaoxi.ProjectId = projectfasongxiaoDTO.ProjectId;
-                                        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 + "鍙戦�佺煭淇$粰瀹㈡埛" + customename);
-                            }
-                        }
-
-
-
-
-
-                    }
-
-                }
-                //涓氬姟缁忕悊涓虹┖
-                if (true)
-                {
-                    var projectfasongxiaoxisywjl = projectfasongxiaoxiDTOsduanxinzuizhong.Where(x => x.Ywjl == null && x.Tel != null && x.Tel.StartsWith("1")).ToList();
-                    if (projectfasongxiaoxisywjl.Count >= 100)
-                    {
-                        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 (numberstring.Split(',').Length >= 100)
-                            {
-                                string sss = SMSHelper.PushWToUserMES(numberstring, "鏀块噰鍜ㄨ鍏徃涓撲笟涓轰緵搴斿晢浠f嫙璐ㄧ枒鍑姐�佹姇璇変功锛岃祫娣辨斂搴滈噰璐硶寰嬩笓瀹躲��3000澶氫欢璐ㄧ枒鎶曡瘔鎴愬姛妗堜緥锛屾壘鏀块噰鍜ㄨ锛岃姳閽辨洿灏戙�佽儨绠楁洿楂橈紝鎺ュ彈鎺ㄩ闄╀唬鐞嗭紝璐ㄧ枒鎶曡瘔鎴愬姛鍐嶆敹璐广�備簡瑙h鎯呰鍜ㄨ锛�400-028-8080");
-                                if (int.Parse(sss) >= 0)
-                                {
-                                    foreach (var projectfasongxiaoDTO in projectfasongxiaoxisywjl)
-                                    {
-                                        var projectfasongxiaoxi = new Projectfasongxiaoxi();
-                                        projectfasongxiaoxi.Id = Guid.NewGuid().ToString();
-                                        projectfasongxiaoxi.ProjectId = projectfasongxiaoDTO.ProjectId;
-                                        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("鏃犲鎴风粡鐞嗗彂閫佺煭淇$粰瀹㈡埛" + customename);
-                            }
-                        }
-                    }
-                }
+             
             }
             catch (Exception ex)
             {

--
Gitblit v1.9.1