团组短信提醒修改：接收人变为List

OASystem/OASystem.Api/OAMethodLib/Quartz/Business/DeleReminderMessage.cs

@@ -2,6 +2,7 @@
 using OASystem.Domain.Dtos.Business;
 using OASystem.Domain.Entities.Business;
 using OASystem.Domain.Entities.Groups;
+using OASystem.Domain.ViewModels.Groups;
 using OASystem.Infrastructure.Repositories.Groups;
 
 namespace OASystem.API.OAMethodLib.Quartz.Business
@@ -16,38 +17,43 @@ namespace OASystem.API.OAMethodLib.Quartz.Business
         public static async void PostMessage()
         {
             DeleReminderConfig _deleReminderConfig = AutofacIocManager.Instance.GetService<DeleReminderConfig>();
-            string postPhoneNumber = string.IsNullOrEmpty(_deleReminderConfig.PhoneNumber) ? _deleReminderConfig.Test : _deleReminderConfig.PhoneNumber;
+            List<string> list_PhoneNumbers = _deleReminderConfig.PhoneNumber.Split(',').ToList();
 
             //sqladd2day查询0A2014数据库，正式使用新OA后将两次查询合并
             DateTime dtNow = DateTime.Now;
-            string today = dtNow.ToString("yyyy-MM-dd");
             string add2day = dtNow.AddDays(2).ToString("yyyy-MM-dd");
+            string add7day = dtNow.AddDays(7).ToString("yyyy-MM-dd");
 
             _grpDeleRep.ChangeDataBase(DBEnum.OA2014DB);
-            string sql = string.Format(@" Select * From DelegationInfo With(Nolock) Where IsdDel=0 And VisitEndDate in ('{0}','{1}') ", today, add2day);
-            List<Grp_DelegationInfo> list_source = _grpDeleRep._sqlSugar.SqlQueryable<Grp_DelegationInfo>(sql).ToList();
+            string sql = string.Format(@" Select * From DelegationInfo With(Nolock) Where IsDel=0 And VisitEndDate ='{0}' Or VisitStartDate='{1}' ", add2day, add7day);
+            List<OA2021_DelegationInfo> list_source = _grpDeleRep._sqlSugar.SqlQueryable<OA2021_DelegationInfo>(sql).ToList();
 
             _grpDeleRep.ChangeDataBase(DBEnum.OA2023DB);
             if (list_source.Count > 0)
             {
-                List<Grp_DelegationInfo> listToday = list_source.Where(s => s.VisitEndDate.Equals(today)).ToList();
-                List<Grp_DelegationInfo> listAdd2day = list_source.Where(s => s.VisitEndDate.Equals(add2day)).ToList();
+                List<OA2021_DelegationInfo> listAdd7day = list_source.Where(s => s.VisitStartDate.Equals(add7day)).ToList();
+                List<OA2021_DelegationInfo> listAdd2day = list_source.Where(s => s.VisitEndDate.Equals(add2day)).ToList();
 
-                if (listToday.Count > 0)
+                if (listAdd7day.Count > 0)
                 {
                     string teamNames = "";
-                    listToday.ForEach(s => teamNames += s.TeamName + "、");
+                    listAdd7day.ForEach(s => teamNames += s.TeamName + "、");
                     teamNames = teamNames.TrimEnd('、');
                     //发送短信
-                    string templateParam = JsonConvert.SerializeObject(new { teams = teamNames, date = "今日" });
-                    string postResult = AliMessagePost.PostMessage(postPhoneNumber, "泛美国际团组", "SMS_461575447", templateParam);
-                    Bus_MsgPostInfo _entity = new Bus_MsgPostInfo();
-                    _entity.Source = "ALiYun";
-                    _entity.TeamNames = teamNames;
-                    _entity.PostType = "Dele2";
-                    _entity.PhoneNumber = postPhoneNumber;
-                    _entity.PostResult = postResult;
-                    _grpDeleRep.AddAsync(_entity);
+                    string add7dayZH = dtNow.AddDays(7).ToString("yyyy年MM月dd日");
+                    string templateParam = JsonConvert.SerializeObject(new { teams = teamNames, date = add7dayZH });
+
+                    foreach (string postPhoneNumber in list_PhoneNumbers)
+                    {
+                        string postResult = AliMessagePost.PostMessage(postPhoneNumber, "泛美国际团组", "SMS_461505530", templateParam);
+                        Bus_MsgPostInfo _entity = new Bus_MsgPostInfo();
+                        _entity.Source = "ALiYun";
+                        _entity.TeamNames = teamNames;
+                        _entity.PostType = "Dele2";
+                        _entity.PhoneNumber = postPhoneNumber;
+                        _entity.PostResult = postResult;
+                        _grpDeleRep._sqlSugar.Insertable<Bus_MsgPostInfo>(_entity);
+                    }
                 }
 
                 if (listAdd2day.Count > 0)
@@ -58,14 +64,18 @@ namespace OASystem.API.OAMethodLib.Quartz.Business
                     //发送短信
                     string add2dayZH = dtNow.AddDays(2).ToString("yyyy年MM月dd日");
                     string templateParam = JsonConvert.SerializeObject(new { teams = teamNames, date = add2dayZH });
-                    string postResult = AliMessagePost.PostMessage(postPhoneNumber, "泛美国际团组", "SMS_461575447", templateParam);
-                    Bus_MsgPostInfo _entity = new Bus_MsgPostInfo();
-                    _entity.Source = "ALiYun";
-                    _entity.TeamNames = teamNames;
-                    _entity.PostType = "Dele1";
-                    _entity.PhoneNumber = postPhoneNumber;
-                    _entity.PostResult = postResult;
-                    _grpDeleRep.AddAsync(_entity);
+                    foreach (string postPhoneNumber in list_PhoneNumbers)
+                    {
+                        string postResult = AliMessagePost.PostMessage(postPhoneNumber, "泛美国际团组", "SMS_461575447", templateParam);
+                        Bus_MsgPostInfo _entity = new Bus_MsgPostInfo();
+                        _entity.Source = "ALiYun";
+                        _entity.TeamNames = teamNames;
+                        _entity.PostType = "Dele1";
+                        _entity.PhoneNumber = postPhoneNumber;
+                        _entity.PostResult = postResult;
+                        _grpDeleRep._sqlSugar.Insertable<Bus_MsgPostInfo>(_entity);
+                    }
+
 
                 }
             }

OASystem/OASystem.Api/appsettings.json

@@ -15,7 +15,7 @@
     "FilterUser": "51,180"
   },
   "DeleReminderConfig": {
-    "PhoneNumber": "17380669807",
+    "PhoneNumber": "17380669807,13683474118",
     "Test": "18477317582"
   },
   "RateCurrency": [

OASystem/OASystem.Domain/Dtos/Business/DeleReminderConfig.cs

@@ -14,7 +14,7 @@ namespace OASystem.Domain.Dtos.Business
         public const string KEY = "DeleReminderConfig";
 
         /// <summary>
-        /// 财务经理手机号码
+        /// 财务手机号码
         /// </summary>
         public string PhoneNumber { get; set; }
 

OASystem/OASystem.Domain/Entities/Business/Bus_MsgPostInfo.cs

@@ -22,7 +22,7 @@ namespace OASystem.Domain.Entities.Business
         public string TeamNames { get; set; }
 
         /// <summary>
-        /// 短信类型,Dele1:团组结束日期提前2天通知，Dele2:团组结束当天通知
+        /// 短信类型,Dele1:团组结束日期提前2天通知，Dele2:团组开始日期提前7天通知
         /// </summary>
         [SugarColumn(ColumnDescription = "短信类型", IsNullable = false, ColumnDataType = "varchar(30)")]
         public string PostType { get; set; }

OASystem/OASystem.Domain/ViewModels/Groups/OA2021_DelegationInfo.cs

@@ -0,0 +1,390 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace OASystem.Domain.ViewModels.Groups
+{
+    /// <summary>
+    /// 团组信息类
+    /// </summary>
+    public class OA2021_DelegationInfo
+    {
+        int id;
+
+        /// <summary>
+        /// 主键编号
+        /// </summary>
+        public int Id
+        {
+            get { return id; }
+            set { id = value; }
+        }
+
+        string salesQuoteNo;
+
+        /// <summary>
+        /// 销售报价号
+        /// </summary>
+        public string SalesQuoteNo
+        {
+            get { return salesQuoteNo; }
+            set { salesQuoteNo = value; }
+        }
+
+        string salesDate;
+
+        /// <summary>
+        /// 销售日期
+        /// </summary>
+        public string SalesDate
+        {
+            get { return salesDate; }
+            set { salesDate = value; }
+        }
+
+        string clientName;
+
+        /// <summary>
+        /// 客户名称
+        /// </summary>
+        public string ClientName
+        {
+            get { return clientName; }
+            set { clientName = value; }
+        }
+
+        string clientUnit;
+
+        /// <summary>
+        /// 客户单位
+        /// </summary>
+        public string ClientUnit
+        {
+            get { return clientUnit; }
+            set { clientUnit = value; }
+        }
+
+        string tourCode;
+
+        /// <summary>
+        /// 团组号
+        /// </summary>
+        public string TourCode
+        {
+            get { return tourCode; }
+            set { tourCode = value; }
+        }
+
+        string teamName;
+
+        /// <summary>
+        /// 团组名称
+        /// </summary>
+        public string TeamName
+        {
+            get { return teamName; }
+            set { teamName = value; }
+        }
+
+        int teamDid;
+
+        /// <summary>
+        /// 团组类型（设置数据外键编号）
+        /// </summary>
+        public int TeamDid
+        {
+            get { return teamDid; }
+            set { teamDid = value; }
+        }
+
+        string visitDate;
+
+        /// <summary>
+        /// 出访时间
+        /// </summary>
+        public string VisitDate
+        {
+            get { return visitDate; }
+            set { visitDate = value; }
+        }
+
+        string visitStartDate;
+
+        /// <summary>
+        /// 出团时间起
+        /// </summary>
+        public string VisitStartDate
+        {
+            get { return visitStartDate; }
+            set { visitStartDate = value; }
+        }
+
+        string visitEndDate;
+
+        /// <summary>
+        /// 出团时间止
+        /// </summary>
+        public string VisitEndDate
+        {
+            get { return visitEndDate; }
+            set { visitEndDate = value; }
+        }
+
+        string visitCountry;
+
+        /// <summary>
+        /// 出访国家
+        /// </summary>
+        public string VisitCountry
+        {
+            get { return visitCountry; }
+            set { visitCountry = value; }
+        }
+
+        string visitPurpose;
+
+        /// <summary>
+        /// 出访目的
+        /// </summary>
+        public string VisitPurpose
+        {
+            get { return visitPurpose; }
+            set { visitPurpose = value; }
+        }
+
+        int visitDays;
+
+        /// <summary>
+        /// 出访天数
+        /// </summary>
+        public int VisitDays
+        {
+            get { return visitDays; }
+            set { visitDays = value; }
+        }
+
+        int visitPNumber;
+
+        /// <summary>
+        /// 出访人数
+        /// </summary>
+        public int VisitPNumber
+        {
+            get { return visitPNumber; }
+            set { visitPNumber = value; }
+        }
+
+        string speciaNeeds;
+
+        /// <summary>
+        /// 特殊需求
+        /// </summary>
+        public string SpecialNeeds
+        {
+            get { return speciaNeeds; }
+            set { speciaNeeds = value; }
+        }
+
+        string otherNeeds;
+
+        /// <summary>
+        /// 其他需求
+        /// </summary>
+        public string OtherNeeds
+        {
+            get { return otherNeeds; }
+            set { otherNeeds = value; }
+        }
+
+        string clientNeeds;
+
+        /// <summary>
+        /// 客户需求
+        /// </summary>
+        public string ClientNeeds
+        {
+            get { return clientNeeds; }
+            set { clientNeeds = value; }
+        }
+
+        string remark;
+
+        /// <summary>
+        /// 备注
+        /// </summary>
+        public string Remark
+        {
+            get { return remark; }
+            set { remark = value; }
+        }
+
+        int isState;
+
+        /// <summary>
+        /// 状态标识
+        /// </summary>
+        public int IsState
+        {
+            get { return isState; }
+            set { isState = value; }
+        }
+
+        int jietuanOperator;
+
+        /// <summary>
+        /// 接团操作人
+        /// </summary>
+        public int JietuanOperator
+        {
+            get { return jietuanOperator; }
+            set { jietuanOperator = value; }
+        }
+
+        string jietuanTime;
+
+        /// <summary>
+        /// 接团操作时间
+        /// </summary>
+        public string JietuanTime
+        {
+            get { return jietuanTime; }
+            set { jietuanTime = value; }
+        }
+
+        int groupsOperator;
+
+        /// <summary>
+        /// 团信息操作人
+        /// </summary>
+        public int GroupsOperator
+        {
+            get { return groupsOperator; }
+            set { groupsOperator = value; }
+        }
+
+        string groupsTime;
+
+        /// <summary>
+        /// 团信息操作时间
+        /// </summary>
+        public string GroupsTime
+        {
+            get { return groupsTime; }
+            set { groupsTime = value; }
+        }
+
+        int isDel;
+
+        /// <summary>
+        /// 删除标识
+        /// </summary>
+        public int IsDel
+        {
+            get { return isDel; }
+            set { isDel = value; }
+        }
+
+        string budgetCost;
+
+        /// <summary>
+        /// 预算成本
+        /// </summary>
+        public string BudgetCost
+        {
+            get { return budgetCost; }
+            set { budgetCost = value; }
+        }
+        int isSure;
+
+        /// <summary>
+        /// 是否操作完成
+        /// </summary>
+        public int IsSure
+        {
+            get { return isSure; }
+            set { isSure = value; }
+        }
+        DateTime sureTime;
+
+        /// <summary>
+        /// 预算成本
+        /// </summary>
+        public DateTime SureTime
+        {
+            get { return sureTime; }
+            set { sureTime = value; }
+        }
+
+        string tellPhone;
+
+        /// <summary>
+        /// 手机号
+        /// </summary>
+        public string TellPhone
+        {
+            get { return tellPhone; }
+            set { tellPhone = value; }
+        }
+
+
+        string teamLev;
+        /// <summary>
+        /// 团组客户级别
+        /// </summary>
+        public string TeamLev
+        {
+            get { return teamLev; }
+            set { teamLev = value; }
+        }
+        /// <summary>
+        /// 酒店投诉标识：0-未投诉；1-已投诉
+        /// </summary>
+        public int HotelComplain { get; set; }
+        /// <summary>
+        /// OP投诉标识：0-未投诉；1-已投诉
+        /// </summary>
+        public int OPComplain { get; set; }
+        /// <summary>
+        /// 签证投诉标识：0-未投诉；1-已投诉
+        /// </summary>
+        public int VisaComplain { get; set; }
+        /// <summary>
+        /// 商邀投诉标识：0-未投诉；1-已投诉
+        /// </summary>
+        public int OAComplain { get; set; }
+        /// <summary>
+        /// 机票投诉标识：0-未投诉；1-已投诉
+        /// </summary>
+        public int AirComplain { get; set; }
+        /// <summary>
+        /// 团组负责人标识（会展会务、策划、销售算提成需要查看团组负责人）
+        /// </summary>
+        public int Director { get; set; }
+
+        /// <summary>
+        /// 合同时间
+        /// </summary>
+        public string TontractTime { get; set; }
+
+        /// <summary>
+        /// 支付款项（预付）
+        /// </summary>
+        public string PaymentMoney { get; set; }
+
+        /// <summary>
+        /// 预付期限
+        /// </summary>
+        public string PayDay { get; set; }
+
+        #region 新增字段  出国任务审批部门名称、批件文号等 
+        public string CGRWSPBMMC { get; set; }
+        public string CGRWSPWH { get; set; }
+        public string ZZSCBMMC { get; set; }
+        public string ZZSCSPWH { get; set; }
+
+        #endregion
+
+    }
+}