外呼任务代码调整

CallCenterApi/CallCenterApi.BLL/CallResult.cs

@@ -31,7 +31,10 @@ namespace CallCenterApi.BLL
             }
             return modelList;
         }
-
+        public Model.CallResult GetModel(string callId)
+        {
+            return dal.GetModel(callId);
+        }
 
         #endregion  BasicMethod
         #region  ExtensionMethod

CallCenterApi/CallCenterApi.BLL/T_Call_TaskTelNum.cs

@@ -130,6 +130,10 @@ namespace CallCenterApi.BLL
         {
             return dal.GetList(strWhere);
         }
+        public DataSet GetPhoneList(string strWhere)
+        {
+            return dal.GetPhoneList(strWhere);
+        }
         /// <summary>
         /// 获得前几行数据
         /// </summary>

CallCenterApi/CallCenterApi.DAL/CallRecords.cs

@@ -2,6 +2,7 @@
 using System;
 using System.Collections.Generic;
 using System.Data;
+using System.Data.SqlClient;
 using System.Linq;
 using System.Text;
 
@@ -23,18 +24,34 @@ namespace CallCenterApi.DAL
                 model.Id = row["Id"] == DBNull.Value ? 0 : Convert.ToInt32(row["Id"]);
                 model.TaskId = row["itemid"] == DBNull.Value ? 0 : Convert.ToInt32(row["itemid"]);
                 model.CallNumber = row["Callee"] == DBNull.Value ? "" : row["Callee"].ToString();
-                model.Usercode = row["AgentId"] == DBNull.Value ? "" : row["AgentId"].ToString();
+                model.Usercode = row["agentid"] == DBNull.Value ? "" : row["agentid"].ToString();
                 model.StartDate = row["StartDate"] == DBNull.Value ? (DateTime?)null : Convert.ToDateTime(row["StartDate"].ToString());
                 model.GetInAgentDate = row["GetInAgentDate"] == DBNull.Value ? (DateTime?)null : Convert.ToDateTime(row["GetInAgentDate"].ToString());
                 model.EndDate = row["EndDate"] == DBNull.Value ? (DateTime?)null : Convert.ToDateTime(row["EndDate"].ToString());
                 model.RecordPath = row["RecordPath"] == DBNull.Value ? "" : row["RecordPath"].ToString();
                 model.Username = row["Username"] == DBNull.Value ? "" : row["Username"].ToString();
-                model.State = row["State"] == DBNull.Value ? "" : row["State"].ToString();
-                model.TalkTime = row["TalkTime"] == DBNull.Value ? 0 : Convert.ToInt32(row["TalkTime"]);
+                model.State = row["calltype"] == DBNull.Value ? "" : row["calltype"].ToString();
+                model.TalkTime = row["talktime"] == DBNull.Value ? 0 : Convert.ToInt32(row["talktime"]);
+            }
+            return model;
+        }
+        public Model.CallResult GetModel(string callId)
+        {
+            string sql = "select itemid,RecordPath from CallResult where id=@callid";
+            var ds = DbHelperSQL.Query(sql, new SqlParameter[] {
+                new SqlParameter("@callid",callId)
+            });
+            var model = new Model.CallResult();
+            if (ds.Tables.Count > 0)
+            {
+                if (ds.Tables[0].Rows.Count > 0)
+                {
+                    model.TaskId = ds.Tables[0].Rows[0]["itemid"] == DBNull.Value ? 0 : Convert.ToInt32(ds.Tables[0].Rows[0]["itemid"]);
+                    model.RecordPath = ds.Tables[0].Rows[0]["RecordPath"] == DBNull.Value ? "" : ds.Tables[0].Rows[0]["RecordPath"].ToString();
+                }
             }
             return model;
         }
-
         #endregion  BasicMethod
         #region  ExtensionMethod
 

CallCenterApi/CallCenterApi.DAL/T_CTI_TaskDaily.cs

@@ -16,7 +16,7 @@ namespace CallCenterApi.DAL
         public DataSet GetList(string strWhere)
         {
             StringBuilder strSql = new StringBuilder();
-            strSql.Append("select [Date],TaskId,AllCount,CalledCount,connectedCount,ConnectedAgentCount,UpdateTime ");
+            strSql.Append("select [Date],TaskId,TaskName,AllCount,CalledCount,connectedCount,ConnectedAgentCount ");
             strSql.Append(" FROM T_CTI_TaskDaily ");
             if (strWhere.Trim() != "")
             {
@@ -33,7 +33,7 @@ namespace CallCenterApi.DAL
         public DataSet GetList()
         {
             StringBuilder strSql = new StringBuilder();
-            strSql.Append("SELECT Date,Sum(AllCount)as AllCount,Sum(CalledCount)as CalledCount,sum(connectedcount)as connectedcount, sum(connectedagentcount)as connectedagentcount FROM T_CTI_TaskDaily group by Date");
+            strSql.Append("SELECT Date,Sum(CalledCount)as CalledCount,sum(connectedcount)as connectedcount, sum(connectedagentcount)as connectedagentcount FROM T_CTI_TaskDaily group by Date");
             return DbHelperSQL.Query(strSql.ToString());
         }
         /// <summary>
@@ -49,11 +49,31 @@ namespace CallCenterApi.DAL
                 {
                     model.TaskId = Convert.ToInt32(row["TaskId"]);
                 }
-                model.AllCount = Convert.ToInt32(row["AllCount"]);
-                model.CalledCount = Convert.ToInt32(row["CalledCount"]);
-                model.ConnectedCount = Convert.ToInt32(row["ConnectedCount"]);
-                model.ConnectedAgentCount = Convert.ToInt32(row["ConnectedAgentCount"]);
-                model.UpdateTime = Convert.ToDateTime(row["UpdateTime"]);
+                if (columns["TaskName"] != null)
+                {
+                    model.TaskName = row["TaskName"].ToString();
+                }
+                if (columns["AllCount"] != null)
+                {
+                    model.AllCount = row["AllCount"] == DBNull.Value ? 0 : Convert.ToInt32(row["AllCount"]);
+                }
+                if (columns["CalledCount"] != null)
+                {
+                    model.CalledCount = row["CalledCount"] == DBNull.Value ? 0 : Convert.ToInt32(row["CalledCount"]);
+                }
+                if (columns["ConnectedCount"] != null)
+                {
+                    model.ConnectedCount = row["ConnectedCount"] == DBNull.Value ? 0 : Convert.ToInt32(row["ConnectedCount"]);
+                }
+                if (columns["ConnectedAgentCount"] != null)
+                {
+                    model.ConnectedAgentCount = row["ConnectedAgentCount"] == DBNull.Value ? 0 : Convert.ToInt32(row["ConnectedAgentCount"]);
+                }
+
+
+
+
+                //model.UpdateTime = Convert.ToDateTime(row["UpdateTime"]);
             }
             return model;
         }

CallCenterApi/CallCenterApi.DAL/T_Call_TaskTelNum.cs

@@ -842,7 +842,17 @@ namespace CallCenterApi.DAL
             strSql.Append(" order by " + filedOrder);
             return DbHelperSQL.Query(strSql.ToString());
         }
-
+        public DataSet GetPhoneList(string strWhere)
+        {
+            StringBuilder strSql = new StringBuilder();
+            strSql.Append("select F_Phone ");
+            strSql.Append(" FROM T_Call_TaskTelNum ");
+            if (strWhere.Trim() != "")
+            {
+                strSql.Append(" where " + strWhere);
+            }
+            return DbHelperSQL.Query(strSql.ToString());
+        }
         /// <summary>
         /// 获取记录总数
         /// </summary>

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/CallCenterApi.Interface.csproj

@@ -278,6 +278,7 @@
     </Compile>
     <Compile Include="Models\Common\FormsPrincipal.cs" />
     <Compile Include="Models\Common\ListBase.cs" />
+    <Compile Include="Models\Dto\AutoCallResordDto.cs" />
     <Compile Include="Models\Dto\CallPlan.cs" />
     <Compile Include="Models\Dto\CategoryDto.cs" />
     <Compile Include="Models\Dto\ModuleInfoDto.cs" />

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/SeatGroupController.cs

@@ -21,46 +21,60 @@ namespace CallCenterApi.Interface.Controllers
         public ActionResult GetList()
         {
             ActionResult res = NoToken("未知错误，请重新登录");
-            
-                DataTable dt = new DataTable();
-                string strpageindex = RequestString.GetQueryString("page");
-                int pageindex = 1;
-                string strpagesize = RequestString.GetQueryString("pagesize");
-                int pagesize = 10;
-
-                string sql = "";
-                if (strpageindex.Trim() != "")
-                {
-                    pageindex = Convert.ToInt32(strpageindex);
-                }
-
-                if (strpagesize.Trim() != "")
-                {
-                    pagesize = Convert.ToInt32(strpagesize);
-                }
-                int recordCount = 0;
-                dt = BLL.PagerBLL.GetListPager(
-                    "T_Sys_SeatGroup",
-                    "F_ZXZID",
-                    "*",
-                    sql,
-                    "ORDER BY F_ZXZID desc",
-                    pagesize,
-                    pageindex,
-                    true,
-                    out recordCount);
-
-                var obj = new
-                {
-                    rows = dt,
-                    total = recordCount
-                };
-
-                res = Content(obj.ToJson());
-         
+
+            DataTable dt = new DataTable();
+            string strpageindex = RequestString.GetQueryString("page");
+            int pageindex = 1;
+            string strpagesize = RequestString.GetQueryString("pagesize");
+            int pagesize = 10;
+
+            string sql = "";
+            if (strpageindex.Trim() != "")
+            {
+                pageindex = Convert.ToInt32(strpageindex);
+            }
+
+            if (strpagesize.Trim() != "")
+            {
+                pagesize = Convert.ToInt32(strpagesize);
+            }
+            int recordCount = 0;
+            dt = BLL.PagerBLL.GetListPager(
+                "T_Sys_SeatGroup",
+                "F_ZXZID",
+                "*",
+                sql,
+                "ORDER BY F_ZXZID desc",
+                pagesize,
+                pageindex,
+                true,
+                out recordCount);
+
+            var obj = new
+            {
+                rows = dt,
+                total = recordCount
+            };
+
+            res = Content(obj.ToJson());
+
             return res;
         }
 
+        /// <summary>
+        /// 获取坐席组列表
+        /// </summary>
+        /// <returns></returns>
+        public ActionResult GetListDrop()
+        {
+            var list = seatBLL.DataTableToList(seatBLL.GetAllList().Tables[0]);
+            return Success("获取成功", list.Select(x => new
+            {
+                id = x.F_ZXZID,
+                name = x.F_ZXZName
+            }));
+        }
+
         //获取坐席组列表
         public ActionResult GetSeatList()
         {
@@ -194,6 +208,6 @@ namespace CallCenterApi.Interface.Controllers
             return NoToken("未知错误，请重新登录");
         }
 
-        
+
     }
 }

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

@@ -26,7 +26,8 @@ namespace CallCenterApi.Interface.Controllers.callout
         private BLL.CallResult callResultBLL = new BLL.CallResult();
         private BLL.T_CTI_TaskDaily taskDailyBLL = new BLL.T_CTI_TaskDaily();
         private BLL.T_CTI_TaskPhonePart taskPhonePartBLL = new BLL.T_CTI_TaskPhonePart();
-
+        private BLL.T_Sys_SeatGroup seatGroupBLL = new BLL.T_Sys_SeatGroup();
+        private BLL.T_Sys_SystemConfig systemConfigBLL = new BLL.T_Sys_SystemConfig();
 
         #region 外呼任务
         /// <summary>
@@ -60,28 +61,30 @@ namespace CallCenterApi.Interface.Controllers.callout
             var list = new List<CallPlanDto>();
 
             //查询坐席组
-            var agentGroupList = dictValueBLL.DataTableToList(dictValueBLL.GetList(" F_DictionaryFlag='ZXZ'").Tables[0]);
+            var agentGroupList = seatGroupBLL.DataTableToList(seatGroupBLL.GetList("").Tables[0]);
             //查询坐席
             var agentList = userAccount.DataTableToList(userAccount.GetList(" F_DeleteFlag=0 ").Tables[0]);
 
             foreach (var model in modelList)
             {
+                //计算数据
                 string calledRate = "0";
                 var allcount = model.y_HMCount ?? 0;
                 float calledcount = model.y_HCCount ?? 0;
-                calledRate = allcount == 0 ? "" : calledcount / allcount * 100 + "%";
+                calledRate = allcount == 0 ? "" : (calledcount / allcount * 100).ToString("f2") + "%";
 
                 string connectedRate = "0";
                 float connected = model.y_YJCount ?? 0;
-                connectedRate = calledcount == 0 ? "0" : connected / calledcount * 100 + "%";
+                connectedRate = calledcount == 0 ? "0" : (connected / calledcount * 100).ToString("f2") + "%";
 
-                var taskTellNumDt = taskTellNumBLL.GetList(" F_HCState=1 and F_YJState=1 and F_UserId>0 ").Tables[0];
+                var taskTellNumDt = taskTellNumBLL.GetList(" F_HCState=1 and F_YJState=1 and F_UserId>0  and F_TaskId=" + model.TaskID).Tables[0];
                 float connectedAgentCount = taskTellNumDt?.Rows.Count ?? 0;
                 var connectedAgentRate = "0";
-                connectedAgentRate = connected == 0 ? "0" : connectedAgentCount / connected * 100 + "%";
+                connectedAgentRate = connected == 0 ? "0" : (connectedAgentCount / connected * 100).ToString("f2") + "%";
 
-                var agentGroup = agentGroupList.SingleOrDefault(x => x.F_DictionaryValueId == model.AgentGroupId);
-                var agentCount = agentList.Where(x => x.F_GroupId == (agentGroup?.F_DictionaryValueId ?? 0)).Count();
+                var agentGroupStr = model.AgentGroupId == -999 ? "不转坐席" : "";
+                var agentGroup = agentGroupList.SingleOrDefault(x => x.F_ZXZID == model.AgentGroupId);
+                var agentCount = agentList.Where(x => x.F_SeartGroupID == (agentGroup?.F_ZXZID ?? 0)).Count();
                 list.Add(new CallPlanDto
                 {
                     id = model.TaskID,
@@ -99,7 +102,8 @@ namespace CallCenterApi.Interface.Controllers.callout
                     endtime1 = model.EndTime1.ToString("HH:mm:ss"),
                     starttime2 = model.StartTime2.ToString("HH:mm:ss"),
                     endtime2 = model.EndTime2.ToString("HH:mm:ss"),
-                    agentgroup = agentGroup?.F_Name ?? "",//坐席组
+                    agentgroup = agentGroup?.F_ZXZName ?? agentGroupStr,//坐席组
+                    agentgroupid = model.AgentGroupId,
                     agentcount = agentCount,//坐席组人数
                     allcount = model.y_HMCount ?? 0,     //号码总数
                     calledcount = model.y_HCCount ?? 0,  //已呼个数
@@ -130,30 +134,32 @@ namespace CallCenterApi.Interface.Controllers.callout
             //if (!Request.IsAuthenticated)
             //    return NoToken("未知错误，请重新登录");
             var model = taskBLL.GetModel(id);
-
+            if (model == null)
+                return Error("预测外呼任务不存在");
             //计算数据
             string calledRate = "0";
             var allcount = model.y_HMCount ?? 0;
             float calledcount = model.y_HCCount ?? 0;
-            calledRate = allcount == 0 ? "" : calledcount / allcount * 100 + "%";
+            calledRate = allcount == 0 ? "" : (calledcount / allcount * 100).ToString("f2") + "%";
 
             string connectedRate = "0";
             float connected = model.y_YJCount ?? 0;
-            connectedRate = calledcount == 0 ? "0" : connected / calledcount * 100 + "%";
+            connectedRate = calledcount == 0 ? "0" : (connected / calledcount * 100).ToString("f2") + "%";
 
-            var taskTellNumDt = taskTellNumBLL.GetList(" F_HCState=1 and F_YJState=1 and F_UserId>0 ").Tables[0];
+            var taskTellNumDt = taskTellNumBLL.GetList(" F_HCState=1 and F_YJState=1 and F_UserId>0 and F_TaskId=" + model.TaskID).Tables[0];
             float connectedAgentCount = taskTellNumDt?.Rows.Count ?? 0;
             var connectedAgentRate = "0";
-            connectedAgentRate = connected == 0 ? "0" : connectedAgentCount / connected * 100 + "%";
+            connectedAgentRate = connected == 0 ? "0" : (connectedAgentCount / connected * 100).ToString("f2") + "%";
 
             //查询坐席组
-            var agentGroupList = dictValueBLL.DataTableToList(dictValueBLL.GetList(" F_DictionaryFlag='ZXZ'").Tables[0]);
+            var agentGroupList = seatGroupBLL.DataTableToList(seatGroupBLL.GetList("").Tables[0]);
             //查询坐席
             var agentList = userAccount.DataTableToList(userAccount.GetList(" F_DeleteFlag=0 ").Tables[0]);
 
 
-            var agentGroup = agentGroupList.SingleOrDefault(x => x.F_DictionaryValueId == model.AgentGroupId);
-            var agentCount = agentList.Where(x => x.F_GroupId == (agentGroup?.F_DictionaryValueId ?? 0)).Count();
+            var agentGroupStr = model.AgentGroupId == -999 ? "不转坐席" : "";
+            var agentGroup = agentGroupList.SingleOrDefault(x => x.F_ZXZID == model.AgentGroupId);
+            var agentCount = agentList.Where(x => x.F_SeartGroupID == (agentGroup?.F_ZXZID ?? 0)).Count();
 
             return Success("获取成功", new CallPlanDto
             {
@@ -164,6 +170,8 @@ namespace CallCenterApi.Interface.Controllers.callout
                 addtime = Convert.ToDateTime(model.AddTime).ToString("yyyy-MM-dd HH:mm:ss"),
                 talkid = model.y_TkModelId ?? 0,
                 pre = model.Pre, //线路前缀
+                recordpathid = model.RecordFileId,
+                concurrencytypestr = model.ConcurrencyType == 0 ? "并发数" : "并发速率",
                 concurrencytype = model.ConcurrencyType,
                 concurrency = model.Concurrency,
                 planstartdate = model.PlanStartDate.ToString("yyyy-MM-dd"),
@@ -172,8 +180,8 @@ namespace CallCenterApi.Interface.Controllers.callout
                 endtime1 = model.EndTime1.ToString("HH:mm"),
                 starttime2 = model.StartTime2.ToString("HH:mm"),
                 endtime2 = model.EndTime2.ToString("HH:mm"),
-                agentgroupid = agentGroup?.F_DictionaryValueId ?? 0,
-                agentgroup = agentGroup?.F_Name ?? "",//坐席组
+                agentgroup = agentGroup?.F_ZXZName ?? agentGroupStr,//坐席组
+                agentgroupid = model.AgentGroupId,
                 agentcount = agentCount,//坐席组人数
                 allcount = model.y_HMCount ?? 0,     //号码总数
                 calledcount = model.y_HCCount ?? 0,  //已呼个数
@@ -215,6 +223,7 @@ namespace CallCenterApi.Interface.Controllers.callout
                     return Error("输入的并发数和进号速率必须不小于1");
                 model.ConcurrencyType = input.ConcurrencyType;
                 model.Concurrency = input.ConcurrencyType == 0 ? (int)input.Concurrency : input.Concurrency;
+                model.RecordFileId = input.RecordPathId;
                 model.y_HMCount = 0;
                 model.y_HCCount = 0;
                 model.y_YJCount = 0;
@@ -234,7 +243,7 @@ namespace CallCenterApi.Interface.Controllers.callout
                 model.y_NoAnswerCount = 0;
                 model.y_ShutDownCount = 0;
                 model.PlanStartDate = input.PlanStartDate;
-                model.PlanEndDate = input.PlanEndDate;
+                model.PlanEndDate = input.PlanEndDate.AddDays(1).AddSeconds(-1);
                 model.StartTime1 = input.StartTime1;
                 model.EndTime1 = input.EndTime1;
                 model.StartTime2 = input.StartTime2;
@@ -292,7 +301,7 @@ namespace CallCenterApi.Interface.Controllers.callout
                                 break;
                             case 4: //从Excel中导入
                                 NPOIHelper npoi = new NPOIHelper();
-                                var dtExcel = npoi.ExcelToTable(input.FilePath, 0);
+                                var dtExcel = npoi.ExcelToTable(input.PhoneStr, 1);
 
                                 break;
                         }
@@ -326,7 +335,7 @@ namespace CallCenterApi.Interface.Controllers.callout
             model.TaskType = input.Type;
             model.AgentGroupId = input.AgentGroupId;
             model.y_TkModelId = input.PagerId;
-            model.Pre = input.Pre;
+            //model.Pre = input.Pre;
             if (input.ConcurrencyType == 0)
             {
                 var num = 0;
@@ -339,11 +348,12 @@ namespace CallCenterApi.Interface.Controllers.callout
             model.ConcurrencyType = input.ConcurrencyType;
             model.Concurrency = input.ConcurrencyType == 0 ? (int)input.Concurrency : input.Concurrency;
             model.PlanStartDate = input.PlanStartDate;
-            model.PlanEndDate = input.PlanEndDate;
+            model.PlanEndDate = input.PlanEndDate.AddDays(1).AddSeconds(-1);
             model.StartTime1 = input.StartTime1;
             model.EndTime1 = input.EndTime1;
             model.StartTime2 = input.StartTime2;
             model.EndTime2 = input.EndTime2;
+            model.RecordFileId = input.RecordPathId;
             if (taskBLL.Update(model))
                 return Success("修改成功");
             return Error("修改失败");
@@ -381,17 +391,24 @@ namespace CallCenterApi.Interface.Controllers.callout
         /// <param name="id"></param>
         /// <param name="concurrency"></param>
         /// <returns></returns>
-        public ActionResult UpdateConcurrency(long id, float concurrency)
+        public ActionResult UpdateConcurrency(long id, float concurrency, int concurrencyType = 0)
         {
             //if (!Request.IsAuthenticated)
             //    return NoToken("未知错误，请重新登录");
             var model = taskBLL.GetModel(id);
             if (model == null)
                 return Error("该外呼任务不存在");
-            var num = 0;
-            if (!int.TryParse(concurrency.ToString(), out num))
-                return Error("并发数必须为不小于1的整数");
-            model.Concurrency = (int)concurrency;
+            if (concurrencyType == 0)
+            {
+                var num = 0;
+                if (!int.TryParse(concurrency.ToString(), out num))
+                    return Error("并发数必须为不小于1的整数");
+                concurrency = num;
+            }
+            if (concurrency < 1)
+                return Error("输入的并发数和进号速率必须不小于1");
+            model.ConcurrencyType = concurrencyType;
+            model.Concurrency = concurrency;
             if (taskBLL.Update(model))
                 return Success("修改成功");
             return Error("修改失败");
@@ -408,15 +425,80 @@ namespace CallCenterApi.Interface.Controllers.callout
             if (num > 0)
             {
                 var task = taskBLL.GetModel(id);
-
-
                 return Success("删除成功");
             }
             return Error("删除失败");
         }
+        /// <summary>
+        /// 去除号码前缀
+        /// </summary>
+        /// <param name="callId"></param>
+        /// <param name="tel"></param>
+        /// <returns></returns>
+        public ActionResult RemovePre(string callId, string tel)
+        {
+            //if (!Request.IsAuthenticated)
+            //    return NoToken("未知错误，请重新登录");
+            var callResult = callResultBLL.GetModel(callId);
+            if (callResult == null)
+                return Error("通话记录未正常添加");
+            var task = taskBLL.GetModel(callResult.TaskId);
+            if (task == null)
+                return Error("任务不存在");
+            var len = task.Pre.Length;
+            return Success("去除成功", tel.Substring(len));
+        }
+        /// <summary>
+        /// 更新外呼任务状态
+        /// </summary>
+        /// <returns></returns>
+        public ActionResult UpdateCallPlanState()
+        {
+            StringBuilder sb = new StringBuilder();
+            var log = LogFactory.GetLogger(this.GetType().ToString());
+            var list = taskBLL.DataTableToList(taskBLL.GetList(" state>=0 ").Tables[0]);
+            foreach (var task in list)
+            {
+                if (task.PlanStartDate <= DateTime.Now && task.PlanEndDate > DateTime.Now)
+                {
+                    if (task.State == 2)
+                    {
+                        if (task.PlanStartDate < DateTime.Now && DateTime.Now < task.StartTime1)
+                        {
+                            task.State = 0;
+                            if (!taskBLL.Update(task))
+                                return Error($"更新自动外呼任务状态为0=待处理失败,ID={task.TaskID},Name={task.TaskName}");
+                            log.Info($"更新自动外呼任务状态为0=待处理成功,ID={task.TaskID},Name={task.TaskName}");
+                        }
+                    }
+                    if (task.State == 0)
+                    {
+                        if ((DateTime.Now >= task.StartTime1 && DateTime.Now < task.EndTime1) || (DateTime.Now > task.StartTime2 && DateTime.Now < task.EndTime2))
+                        {
+                            task.State = 1;
+                            if (!taskBLL.Update(task))
+                                return Error($"更新自动外呼任务状态为1=处理中失败,ID={task.TaskID},Name={task.TaskName}");
+                            log.Info($"更新自动外呼任务状态为1=处理中成功,ID={task.TaskID},Name={task.TaskName}");
+
+                        }
+                    }
+                    if (task.State == 1)
+                    {
+                        if (task.PlanEndDate < DateTime.Now)
+                        {
+                            task.State = 0;
+                            if (!taskBLL.Update(task))
+                                return Error($"更新自动外呼任务状态为2=暂停失败,ID={task.TaskID},Name={task.TaskName}");
+                            log.Info($"更新自动外呼任务状态为2=暂停成功,ID={task.TaskID},Name={task.TaskName}");
+                        }
+                    }
+                }
+            }
+            return Success("处理完成");
+        }
         #endregion
 
-        #region 导入导出数据
+        #region 导入导出号码
         /// <summary>
         /// 导入号码信息
         /// </summary>
@@ -477,11 +559,11 @@ namespace CallCenterApi.Interface.Controllers.callout
             switch (type)
             {
                 case 1:
-                    var dt1 = taskTellNumBLL.GetList(" F_TaskId=" + task.TaskID + "  and F_HCState=1 and  F_YJState=0 ").Tables[0];
+                    var dt1 = taskTellNumBLL.GetPhoneList(" F_TaskId=" + task.TaskID + "  and F_HCState=1 and  (F_YJState=0 or F_YJState is null) ").Tables[0];
                     var msg1 = npoi.ExportToExcel(DateTime.Now.ToString("yyyyMMdd") + task.TaskName + "导出未接通号码", dt1);
                     return !string.IsNullOrWhiteSpace(msg1) ? Error(msg1) : Success("导出成功");
                 case 2:
-                    var dt2 = taskTellNumBLL.GetList(" F_TaskId=" + task.TaskID + " and F_HCState=1 and  F_YJState=1 ").Tables[0];
+                    var dt2 = taskTellNumBLL.GetPhoneList(" F_TaskId=" + task.TaskID + " and F_HCState=1 and  F_YJState=1 ").Tables[0];
                     var msg2 = npoi.ExportToExcel(DateTime.Now.ToString("yyyyMMdd") + task.TaskName + "导出已接通号码", dt2);
                     return !string.IsNullOrWhiteSpace(msg2) ? Error(msg2) : Success("导出成功");
             }
@@ -509,18 +591,36 @@ namespace CallCenterApi.Interface.Controllers.callout
         /// 获取自动放音文件
         /// </summary>
         /// <returns></returns>
-        public ActionResult GetRecordList()
+        public ActionResult GetRecordList(FilterTalkRecord filter)
         {
             //if (!Request.IsAuthenticated)
             //    return NoToken("未知错误，请重新登录");
-            var list = taskRecordBLL.DataTableToList(taskRecordBLL.GetList("").Tables[0]).Select(x => new
+            var recordCount = 0;
+            var dt = BLL.PagerBLL.GetListPager(
+                 "T_CTI_TaskRecord ",
+                 "id",
+                 "*",
+                 "",
+                 "ORDER BY id desc",
+                 filter.PageSize,
+                 filter.PageIndex,
+                 true,
+                 out recordCount);
+
+
+            var list = taskRecordBLL.DataTableToList(dt).Select(x => new
             {
                 id = x.Id,
                 name = x.Name,
                 recordpath = x.RecordPath,
                 recordtime = x.RecordTime,
             });
-            return Success("成功", list.ToList());
+            var obj = new
+            {
+                rows = list,
+                total = recordCount
+            };
+            return Content(obj.ToJson());
         }
         /// <summary>
         /// 获取录音
@@ -553,25 +653,40 @@ namespace CallCenterApi.Interface.Controllers.callout
             Model.T_CTI_TaskRecord model = new Model.T_CTI_TaskRecord();
             if (input.Id <= 0)
             {
-                var file = Request.Files[0];
+                var dir = Server.MapPath("~/UploadRecord/");
 
+                if (!Directory.Exists(dir))
+                {
+                    Directory.CreateDirectory(dir);
+                }
+                var file = Request.Files[0];
+                if (file.ContentType != "audio/x-wav" && file.ContentType != "audio/wav")
+                    return Error("上传录音格式必须为.wav");
 
+                var name = DateTime.Now.ToString("yyyyMMddHHmmss") + Guid.NewGuid().ToString("N").Substring(0, 10) + ".wav";
+                var path = dir + name;
+                Request.Files[0].SaveAs(path);
 
+                FileInfo fileInfo = new FileInfo(path);
+                var fileName = FileUp.UploadFile(fileInfo, "/", "120.194.141.197", "Administrator", "hykj@800100");
 
+                var sysConfig = systemConfigBLL.GetModel(40);
+                if (sysConfig == null)
+                    return Error("自动放音录音路径查询失败");
                 model.Name = input.Name;
-                model.RecordPath = input.RecordPath;
-                model.RecordTime = input.RecordTime;
+                model.RecordPath = sysConfig.F_ParamValue + fileName;
+                //model.RecordTime = input.RecordTime;
                 model.Remark = input.Remark;
 
                 if (taskRecordBLL.Add(model) > 0)
                     return Success("添加成功");
                 return Error("添加失败");
             }
-            return Success("");
+            return Success("添加失败");
         }
         #endregion
 
-        #region 话务统计
+        #region 话单查询
         /// <summary>
         /// 话务分析
         /// </summary>
@@ -588,16 +703,46 @@ namespace CallCenterApi.Interface.Controllers.callout
 
             //}
 
-            var fir = taskDailyBLL.DataTableToList(taskDailyBLL.GetList("").Tables[0]);
-            var sec = taskPhonePartBLL.DataTableToList(taskPhonePartBLL.GetList("").Tables[0]);
+            var fir = taskPhonePartBLL.DataTableToList(taskPhonePartBLL.GetList("").Tables[0]);
+            var sec = taskDailyBLL.DataTableToList(taskDailyBLL.GetList("").Tables[0]);
             var thi = taskDailyBLL.DataTableToList(taskDailyBLL.GetList().Tables[0]);
 
-
             var obj = new
             {
-                fir = fir,
-                sec = sec,
-                thi = thi
+                fir = fir.Select(x => new
+                {
+                    date = x.Date.ToString("yyyy-MM-dd"),
+                    phonepart = x.PhonePart,
+                    province = x.Province,
+                    city = x.City,
+                    connectedcount = x.CalledCount == 0 ? "" : (x.ConnectedCount / x.CalledCount * 100).ToString("f2") + "%",
+                    connectedagentcount = x.ConnectedCount == 0 ? "" : (x.ConnectedAgentCount / x.ConnectedCount * 100).ToString("f2") + "%",
+                }),
+                sec = sec.Select(x => new
+                {
+                    date = x.Date.ToString("yyyy-MM-dd"),
+                    allcount = x.AllCount,
+                    calledcount = x.CalledCount,
+                    connectedcount = x.ConnectedCount,
+                    connectedagentcount = x.ConnectedAgentCount,
+                    connectedrate = x.CalledCount == 0 ? "" : (x.ConnectedCount / x.CalledCount * 100).ToString("f2") + "%",
+                    connectedagentrate = x.ConnectedCount == 0 ? "" : (x.ConnectedAgentCount / x.ConnectedCount * 100).ToString("f2") + "%",
+                    taskid = x.TaskId,
+                    taskname = x.TaskName
+
+                }),
+                thi = thi.Select(x => new
+                {
+                    date = x.Date.ToString("yyyy-MM-dd"),
+                    allcount = x.AllCount,
+                    calledcount = x.CalledCount,
+                    connectedcount = x.ConnectedCount,
+                    connectedagentcount = x.ConnectedAgentCount,
+                    connectedrate = x.CalledCount == 0 ? "" : (x.ConnectedCount / x.CalledCount * 100).ToString("f2") + "%",
+                    connectedagentrate = x.ConnectedCount == 0 ? "" : (x.ConnectedAgentCount / x.ConnectedCount * 100).ToString("f2") + "%",
+                    taskid = x.TaskId,
+                    taskname = x.TaskName
+                })
             };
 
 
@@ -611,46 +756,112 @@ namespace CallCenterApi.Interface.Controllers.callout
         {
             //if (!Request.IsAuthenticated)
             //    return NoToken("未知错误，请重新登录");
+            var sort = "ORDER BY startdate desc";
+            if (!string.IsNullOrWhiteSpace(filter.SortField))
+            {
+                var arr = filter.SortField.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
+                EnumTalkRecordsSortField e;
+                if (!Enum.TryParse(arr[0], out e))
+                    return Error("排序字段参数错误");
+                sort = "ORDER BY " + e.ToString() + " " + arr[1];
+            }
+
+            StringBuilder where = new StringBuilder();
 
-            var sql = "";
 
-            // 未接通   F_YJState=0
-            // 接通未转入坐席 F_YJState=0 
-            // 接通未分配坐席 
-            // 接通且分配坐席  F_YJState=1 and agentid>0
+            if (!string.IsNullOrWhiteSpace(filter.UserCode))
+            {
+                where.Append(" and agentid=" + filter.UserCode);
+            }
+            if (!string.IsNullOrWhiteSpace(filter.Phone))
+            {
+                where.Append(" and callee like '%" + filter.Phone + "%'");
+            }
+            if (filter.CallType != 0)
+            {
+                where.Append(" and calltype=" + filter.CallType);
+            }
+
+            if (!string.IsNullOrWhiteSpace(filter.TalkTime))
+            {
+                var arr = filter.TalkTime.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
+                if (arr.Length == 2)
+                {
+                    if (arr[0] == "1")
+                    {
+                        where.Append(" and talktime>" + arr[1]);
+                    }
+                    else if (arr[0] == "2")
+                    {
+                        where.Append(" and talktime=" + arr[1]);
+                    }
+                    else if (arr[0] == "3")
+                    {
+                        where.Append(" and talktime<" + arr[1]);
+                    }
+                    else { }
+                }
+            }
+
+            if (filter.StartTime == null || filter.EndTime == null)
+            {
+                filter.StartTime = DateTime.Now.AddDays(-3);
+                filter.EndTime = DateTime.Now;
+            }
+            where.Append(" and datediff(s,'" + filter.StartTime + "',getdate())>=0 and datediff(s,getdate(),'" + filter.EndTime + "')>=0 ");
+
+
+
+            // 全部=0
+            // 未接通=1       
+            // 接通排队=2
+            // 接通未转入坐席=3
+            // 接通且分配坐席=4  
             int recordCount = 0;
             Model.PageData<Model.CallResult> pageModel = new Model.PageData<Model.CallResult>();
             StringBuilder fields = new StringBuilder();
-            fields.Append(" cr.id,cr.itemid,cr.callee,cr.agentid,ua.f_username as username ,cr.recordpath  ");
-            fields.Append(", (case when datediff(y,'1970-01-01 00:00:00.000',cr.StartDate)>0 then cr.StartDate else null end) as startdate ");
-            fields.Append(", (case when datediff(y,'1970-01-01 00:00:00.000',cr.GetInAgentDate)>0 then cr.GetInAgentDate else null end) as getinagentdate ");
-            fields.Append(", (case when datediff(y,'1970-01-01 00:00:00.000',cr.EndDate)>0 then cr.EndDate else null end) as enddate ");
-            fields.Append(", (case when t.F_YJState=0 then '未接通'  when (t.F_YJState=1 and cr.AgentId>0) then '接通且转坐席' end ) as state ");
-            fields.Append(", (case when datediff(s,cr.GetInAgentDate,cr.endDate)<0 then 0 else datediff(s,cr.GetInAgentDate,cr.endDate) end) as talktime");
             var dt = BLL.PagerBLL.GetListPager(
-                    " CallResult cr left join T_Sys_UserAccount ua on cr.agentId=ua.f_usercode left join T_Call_TaskTelNum t ON t.F_Id=cr.Id ",
-                    "cr.Id",
-                    fields.ToString(),
-                    sql,
-                    "ORDER BY cr.Id desc",
-                    filter.PageSize,
-                    filter.PageIndex,
-                    true,
-                    out recordCount);
-            var list = callResultBLL.DataTableToList(dt).Select(x => new
+                       "V_AutoCallResult",
+                       "V_AutoCallResult.id",
+                       "V_AutoCallResult.id,itemid, callee, agentid, username,startdate,enddate,getinagentdate,calltype,talktime,RecordPath",
+                       where.ToString(),
+                       sort,
+                       filter.PageSize,
+                       filter.PageIndex,
+                       true,
+                       out recordCount);
+            var config = new BLL.T_Sys_SystemConfig().GetModelList(" F_ParamCode='PlayPath' ").FirstOrDefault();
+            var callResultList = callResultBLL.DataTableToList(dt);
+            var list = new List<AutoCallRecordDto>();
+            callResultList.ForEach(x =>
             {
-                id = x.Id,
-                taskid = x.TaskId,
-                callnumber = x.CallNumber,
-                usercode = x.Usercode == "0" ? "" : x.Usercode,
-                startdate = x.StartDate?.ToString("yyyy-MM-dd HH:mm:ss") ?? "",
-                getinagentdate = x.GetInAgentDate?.ToString("yyyy-MM-dd HH:mm:ss") ?? "",
-                enddate = x.EndDate?.ToString("yyyy-MM-dd HH:mm:ss") ?? "",
-                recordpath = x.RecordPath,
-                username = x.Username,
-                state = x.State,
-                talktime = x.TalkTime > 0 ? x.TalkTime.ToString() : ""
+                var recordPath = "";
+                if (!string.IsNullOrWhiteSpace(x.RecordPath) && config != null && !string.IsNullOrEmpty(config.F_ParamValue))
+                {
+                    var ym = config.F_ParamValue;
+                    if (ym.Substring(ym.Length - 1) == "/")
+                    {
+                        ym = ym.Substring(0, ym.Length - 1);
+                    }
+                    recordPath = ym + x.RecordPath.Substring(x.RecordPath.IndexOf(':') + 1).Replace('\\', '/');
+                }
+
+                list.Add(new AutoCallRecordDto
+                {
+                    id = x.Id,
+                    taskid = x.TaskId,
+                    callnumber = x.CallNumber,
+                    usercode = x.Usercode == "0" ? "" : x.Usercode,
+                    startdate = x.StartDate?.ToString("yyyy-MM-dd HH:mm:ss") ?? "",
+                    getinagentdate = x.GetInAgentDate?.ToString("yyyy-MM-dd HH:mm:ss") ?? "",
+                    enddate = x.EndDate?.ToString("yyyy-MM-dd HH:mm:ss") ?? "",
+                    recordpath = recordPath,
+                    username = x.Username,
+                    state = x.State,
+                    talktime = x.TalkTime > 0 ? x.TalkTime.ToString() : ""
+                });
             });
+
             var obj = new
             {
                 rows = list,
@@ -661,6 +872,8 @@ namespace CallCenterApi.Interface.Controllers.callout
         #endregion
 
         #region 过滤号码
+
+
         #region 过滤号码-数据源
         /// <summary>
         /// 过滤号码
@@ -684,7 +897,6 @@ namespace CallCenterApi.Interface.Controllers.callout
             return dt;
         }
         #endregion
-
         #region 过滤号码-前三个月
         private DataTable PhoneNumFilterMonth(DataTable dt, string phone = "F_Phone")
         {
@@ -706,6 +918,5 @@ namespace CallCenterApi.Interface.Controllers.callout
         #endregion
         #endregion
 
-
     }
 }

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Models/Dto/AutoCallResordDto.cs

@@ -0,0 +1,23 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+
+namespace CallCenterApi.Interface.Models.Dto
+{
+    public class AutoCallRecordDto
+    {
+        public int id { get; set; }
+        public int taskid { get; set; }
+        public string callnumber { get; set; }
+        public string usercode { get; set; }
+        public string startdate { get; set; }
+        public string getinagentdate { get; set; }
+        public string enddate { get; set; }
+        public string recordpath { get; set; }
+        public string username { get; set; }
+        public string state { get; set; }
+        public string talktime { get; set; }
+
+    }
+}

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

@@ -14,6 +14,8 @@ namespace CallCenterApi.Interface.Models.Dto
         public string addtime { get; set; }
         public long talkid { get; set; }
         public string pre { get; set; }
+        public int recordpathid { get; set; }
+        public string concurrencytypestr { get; set; }
         public int concurrencytype { get; set; }
         public float concurrency { get; set; }
         public string planstartdate { get; set; }

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Models/Filter/FilterTalkRecord.cs

@@ -45,4 +45,15 @@ namespace CallCenterApi.Interface.Models.Filter
         public string TalkTime { get; set; }
 
     }
+
+    public enum EnumTalkRecordsSortField
+    {
+        id = 1,
+        callee = 2,
+        agentid = 3,
+        startdate = 4,
+        getinagentdate = 5,
+        enddate = 6,
+        talktime = 7
+    }
 }

CallCenterApi/CallCenterApi.Model/T_CTI_Task.cs

@@ -309,7 +309,7 @@ namespace CallCenterApi.Model
         /// 坐席组Id
         /// </summary>
         public int AgentGroupId { get; set; }
-
+        public int RecordFileId { get; set; }
         #endregion Model
 
     }

CallCenterApi/CallCenterApi.Model/T_CTI_TaskDaily.cs

@@ -10,10 +10,11 @@ namespace CallCenterApi.Model
     {
         public DateTime Date { get; set; }
         public int TaskId { get; set; }
+        public string TaskName { get; set; }
         public int AllCount { get; set; }
         public int CalledCount { get; set; }
         public int ConnectedCount { get; set; }
         public int ConnectedAgentCount { get; set; }
-        public DateTime UpdateTime { get; set; }
+
     }
 }