语音通知修改

CallCenterApi/CallCenterApi.BLL/T_CTI_Task.cs

@@ -143,6 +143,8 @@ namespace CallCenterApi.BLL
 
                     model.y_YJCount = Convert.ToInt32(dt.Rows[n]["y_YJCount"]);
                     model.y_HMCount = Convert.ToInt32(dt.Rows[n]["y_HMCount"]);
+                    model.PlanStartDate = dt.Rows[n]["PlanStartDate"] == DBNull.Value ? DateTime.Now : Convert.ToDateTime(dt.Rows[n]["PlanStartDate"]);
+                    model.PlanEndDate = dt.Rows[n]["PlanEndDate"] == DBNull.Value ? DateTime.Now : Convert.ToDateTime(dt.Rows[n]["PlanEndDate"]);
                     model.StartTime1 = dt.Rows[n]["StartTime1"] == DBNull.Value ? DateTime.Now : Convert.ToDateTime(dt.Rows[n]["StartTime1"]);
                     model.EndTime1 = dt.Rows[n]["EndTime1"] == DBNull.Value ? DateTime.Now : Convert.ToDateTime(dt.Rows[n]["EndTime1"]);
                     model.StartTime2 = dt.Rows[n]["StartTime2"] == DBNull.Value ? DateTime.Now : Convert.ToDateTime(dt.Rows[n]["StartTime2"]);

CallCenterApi/CallCenterApi.DAL/T_CTI_Task.cs

@@ -39,9 +39,9 @@ namespace CallCenterApi.DAL
         {
             StringBuilder strSql = new StringBuilder();
             strSql.Append("insert into T_CTI_Task(");
-            strSql.Append("TaskName,State,AddTime,y_YJCount,y_HMCount,Pre,Concurrency,ConcurrencyType,StartTime1,EndTime1,StartTime2,EndTime2,TaskCategoryId,TaskContent,IsExcuteNow,LoopTime)");
+            strSql.Append("TaskName,State,AddTime,y_YJCount,y_HMCount,Pre,Concurrency,ConcurrencyType,PlanStartDate,PlanEndDate,StartTime1,EndTime1,StartTime2,EndTime2,TaskCategoryId,TaskContent,IsExcuteNow,LoopTime)");
             strSql.Append(" values (");
-            strSql.Append("@TaskName,@State,@AddTime,@y_YJCount,@y_HMCount,@Pre,@Concurrency,@ConcurrencyType,@StartTime1,@EndTime1,@StartTime2,@EndTime2,@TaskCategoryId,@TaskContent,@IsExcuteNow,@LoopTime)");
+            strSql.Append("@TaskName,@State,@AddTime,@y_YJCount,@y_HMCount,@Pre,@Concurrency,@ConcurrencyType,@PlanStartDate,@PlanEndDate,@StartTime1,@EndTime1,@StartTime2,@EndTime2,@TaskCategoryId,@TaskContent,@IsExcuteNow,@LoopTime)");
             strSql.Append(";select @@IDENTITY");
             SqlParameter[] parameters = {
                     new SqlParameter("@TaskName", SqlDbType.VarChar,200),
@@ -59,7 +59,9 @@ namespace CallCenterApi.DAL
                     new SqlParameter("@TaskCategoryId", SqlDbType.Int),
                     new SqlParameter("@TaskContent", SqlDbType.NVarChar,500),
                     new SqlParameter("@IsExcuteNow", SqlDbType.Bit),
-                    new SqlParameter("@LoopTime", SqlDbType.Int)
+                    new SqlParameter("@LoopTime", SqlDbType.Int),
+                    new SqlParameter("@PlanStartDate",SqlDbType.DateTime),
+                    new SqlParameter("@PlanEndDate",SqlDbType.DateTime)
         };
             parameters[0].Value = model.TaskName;
             parameters[1].Value = model.State;
@@ -77,6 +79,8 @@ namespace CallCenterApi.DAL
             parameters[13].Value = model.TaskContent;
             parameters[14].Value = model.IsExcuteNow;
             parameters[15].Value = model.LoopTime;
+            parameters[16].Value = model.PlanStartDate;
+            parameters[17].Value = model.PlanEndDate;
             object obj = DbHelperSQL.GetSingle(strSql.ToString(), parameters);
             if (obj == null)
             {
@@ -102,6 +106,8 @@ namespace CallCenterApi.DAL
             strSql.Append("Pre=@Pre, ");
             strSql.Append("Concurrency=@Concurrency, ");
             strSql.Append("ConcurrencyType=@ConcurrencyType, ");
+            strSql.Append("PlanStartDate=@PlanStartDate, ");
+            strSql.Append("PlanEndDate=@PlanEndDate, ");
             strSql.Append("StartTime1=@StartTime1, ");
             strSql.Append("EndTime1=@EndTime1, ");
             strSql.Append("StartTime2=@StartTime2, ");
@@ -128,7 +134,9 @@ namespace CallCenterApi.DAL
                     new SqlParameter("@TaskCategoryId", SqlDbType.Int),
                     new SqlParameter("@TaskContent", SqlDbType.NVarChar,500),
                     new SqlParameter("@IsExcuteNow", SqlDbType.Bit),
-                    new SqlParameter("@LoopTime", SqlDbType.Int)
+                    new SqlParameter("@LoopTime", SqlDbType.Int),
+                    new SqlParameter("@PlanStartDate",SqlDbType.DateTime),
+                    new SqlParameter("@PlanEndDate",SqlDbType.DateTime)
             };
             parameters[0].Value = model.TaskName;
             parameters[1].Value = model.State;
@@ -147,7 +155,8 @@ namespace CallCenterApi.DAL
             parameters[14].Value = model.TaskContent;
             parameters[15].Value = model.IsExcuteNow;
             parameters[16].Value = model.LoopTime;
-
+            parameters[17].Value = model.PlanStartDate;
+            parameters[18].Value = model.PlanEndDate;
 
             int rows = DbHelperSQL.ExecuteSql(strSql.ToString(), parameters);
             if (rows > 0)
@@ -265,7 +274,7 @@ namespace CallCenterApi.DAL
         {
 
             StringBuilder strSql = new StringBuilder();
-            strSql.Append("select  top 1 TaskID,TaskName,State,AddTime,y_YJCount,y_HMCount,Pre,Concurrency,ConcurrencyType,StartTime1,EndTime1,StartTime2,EndTime2,TaskCategoryId,TaskContent,IsExcuteNow,LoopTime from T_CTI_Task ");
+            strSql.Append("select  top 1 TaskID,TaskName,State,AddTime,y_YJCount,y_HMCount,Pre,Concurrency,ConcurrencyType,PlanStartDate,PlanEndDate,StartTime1,EndTime1,StartTime2,EndTime2,TaskCategoryId,TaskContent,IsExcuteNow,LoopTime from T_CTI_Task ");
             strSql.Append(" where State>=0 and  TaskID=@TaskID ");
             SqlParameter[] parameters = {
                     new SqlParameter("@TaskID", SqlDbType.BigInt)
@@ -313,6 +322,8 @@ namespace CallCenterApi.DAL
                     model.ConcurrencyType = int.Parse(ds.Tables[0].Rows[0]["ConcurrencyType"].ToString());
                 }
 
+                model.PlanStartDate = ds.Tables[0].Rows[0]["PlanStartDate"] == DBNull.Value ? DateTime.Now : Convert.ToDateTime(ds.Tables[0].Rows[0]["PlanStartDate"]);
+                model.PlanEndDate = ds.Tables[0].Rows[0]["PlanEndDate"] == DBNull.Value ? DateTime.Now : Convert.ToDateTime(ds.Tables[0].Rows[0]["PlanEndDate"]);
                 model.StartTime1 = ds.Tables[0].Rows[0]["StartTime1"] == DBNull.Value ? DateTime.Now : Convert.ToDateTime(ds.Tables[0].Rows[0]["StartTime1"]);
                 model.EndTime1 = ds.Tables[0].Rows[0]["EndTime1"] == DBNull.Value ? DateTime.Now : Convert.ToDateTime(ds.Tables[0].Rows[0]["EndTime1"]);
                 model.StartTime2 = ds.Tables[0].Rows[0]["StartTime2"] == DBNull.Value ? DateTime.Now : Convert.ToDateTime(ds.Tables[0].Rows[0]["StartTime2"]);

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/callout/CallPlanController.cs

@@ -106,6 +106,8 @@ namespace CallCenterApi.Interface.Controllers.callout
                 //concurrencytypestr = model.ConcurrencyType == 0 ? "并发数" : "并发速率",
                 //concurrencytype = model.ConcurrencyType,
                 //concurrency = model.Concurrency,
+                planstartdate = model.PlanStartDate.ToString("yyyy-MM-dd") ?? "",
+                planenddate = model.PlanEndDate.ToString("yyyy-MM-dd") ?? "",
                 starttime1 = model.StartTime1.ToString("HH:mm:ss") ?? "",
                 endtime1 = model.EndTime1.ToString("HH:mm:ss") ?? "",
                 starttime2 = model.StartTime2.ToString("HH:mm:ss") ?? "",
@@ -161,6 +163,8 @@ namespace CallCenterApi.Interface.Controllers.callout
                 model.y_YJCount = 0;
                 model.State = Convert.ToBoolean(model.IsExcuteNow) ? 1 : 2;
                 model.AddTime = DateTime.Now;
+                model.PlanStartDate = input.PlanStartDate ?? DateTime.Now;
+                model.PlanEndDate = input.PlanEndDate?.AddDays(1).AddSeconds(-1) ?? DateTime.Now;
                 model.StartTime1 = input.StartTime1 ?? DateTime.Now;
                 model.EndTime1 = input.EndTime1 ?? DateTime.Now;
                 model.StartTime2 = input.StartTime2 ?? DateTime.Now;
@@ -278,6 +282,8 @@ namespace CallCenterApi.Interface.Controllers.callout
                 return Error("输入的并发数和进号速率必须不小于1");
             model.ConcurrencyType = input.ConcurrencyType;
             model.Concurrency = input.ConcurrencyType == 0 ? (int)input.Concurrency : input.Concurrency;
+            model.PlanStartDate = input.PlanStartDate ?? DateTime.Now;
+            model.PlanEndDate = input.PlanEndDate?.AddDays(1).AddSeconds(-1) ?? DateTime.Now;
             model.StartTime1 = input.StartTime1 ?? DateTime.Now;
             model.EndTime1 = input.EndTime1 ?? DateTime.Now;
             model.StartTime2 = input.StartTime2 ?? DateTime.Now;

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Models/Dto/CallPlan.cs

@@ -20,6 +20,8 @@ namespace CallCenterApi.Interface.Models.Dto
         public string concurrencytypestr { get; set; }
         public int concurrencytype { get; set; }
         public float concurrency { get; set; }
+        public string planstartdate { get; set; }
+        public string planenddate { get; set; }
         public string starttime1 { get; set; }
         public string endtime1 { get; set; }
         public string starttime2 { get; set; }

CallCenterApi/CallCenterApi.Model/T_CTI_Task.cs

@@ -68,6 +68,14 @@ namespace CallCenterApi.Model
         /// </summary>
         public float Concurrency { get; set; }
         /// <summary>
+        /// 任务发送时间
+        /// </summary>
+        public DateTime PlanStartDate { get; set; }
+        /// <summary>
+        /// 任务结束时间
+        /// </summary>
+        public DateTime PlanEndDate { get; set; }
+        /// <summary>
         /// 生效开始时间段1
         /// </summary>
         public DateTime StartTime1 { get; set; }

CallCenterCommon/CallCenter.QuartzService/CallPlanWork.cs

@@ -19,8 +19,8 @@ namespace CallCenter.QuartzService
         private List<long> taskIdList = new List<long>();
         private void MyWork_DoWork(object sender, EventArgs e)
         {
-            var taskList = taskBLL.DataTableToList(taskBLL.GetTaskList(" State>0 ").Tables[0]);
             var now = DateTime.Now;
+            var taskList = taskBLL.DataTableToList(taskBLL.GetTaskList(" State>0 ").Tables[0]).Where(x => x.PlanStartDate < now && now < x.PlanEndDate).ToList();
 
             #region 外呼任务状态由【暂停】=>【处理中】
             var startList = taskList.Where(x => x.State == (int)EnumTaskState.暂停 && ((x.StartTime1.TimeOfDay < now.TimeOfDay && now.TimeOfDay < x.EndTime1.TimeOfDay) || (x.StartTime2.TimeOfDay < now.TimeOfDay && now.TimeOfDay < x.EndTime2.TimeOfDay))).ToList();