外呼任务提交

CallCenterApi/CallCenterApi.BLL/T_Call_PageField.cs

@@ -38,6 +38,13 @@ namespace CallCenterApi.BLL
         {
             return dal.Update(model);
         }
+        /// <summary>
+        /// 更新多条数据
+        /// </summary>
+        public bool UpdateByTaskId(long taskId)
+        {
+            return dal.UpdateByTaskId(taskId);
+        }
 
         /// <summary>
         /// 删除一条数据

CallCenterApi/CallCenterApi.BLL/T_Call_TaskTelNum.cs

@@ -388,6 +388,7 @@ namespace CallCenterApi.BLL
                 for (int n = 0; n < rowsCount; n++)
                 {
                     model = new CallCenterApi.Model.T_Call_TaskTelNum();
+                    model.F_Id = Convert.ToInt32(dt.Rows[n]["F_Id"]);
                     model.TaskName = dt.Rows[n]["TaskName"] == DBNull.Value ? "" : dt.Rows[n]["TaskName"].ToString();
                     model.F_Phone = dt.Rows[n]["F_Phone"] == DBNull.Value ? "" : dt.Rows[n]["F_Phone"].ToString();
                     model.F_HCState = dt.Rows[n]["F_HCState"] == DBNull.Value ? 0 : Convert.ToInt32(dt.Rows[n]["F_HCState"].ToString());

CallCenterApi/CallCenterApi.DAL/T_Call_PageField.cs

@@ -104,6 +104,25 @@ namespace CallCenterApi.DAL
             }
         }
 
+
+        /// <summary>
+        /// 更新多条数据
+        /// </summary>
+        public bool UpdateByTaskId(long taskId)
+        {
+            StringBuilder strSql = new StringBuilder();
+            strSql.Append("UPDATE  T_Call_PageField set F_TaskId=@F_TaskId WHERE  F_TaskId=-1");
+            int rows = DbHelperSQL.ExecuteSql(strSql.ToString(), new SqlParameter("@F_TaskId", taskId));
+            if (rows > 0)
+            {
+                return true;
+            }
+            else
+            {
+                return false;
+            }
+        }
+
         /// <summary>
         /// 删除一条数据
         /// </summary>

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/App_Start/AuthorizeAttribute.cs

@@ -62,7 +62,7 @@ namespace CallCenterApi.Interface
             //    WriteLog(filterContext);
             //}
             //else {
-                base.OnAuthorization(filterContext);
+            base.OnAuthorization(filterContext);
             //}
         }
         private void WriteLog(AuthorizationContext filterContext)

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/Base/BaseController.cs

@@ -10,7 +10,7 @@ namespace CallCenterApi.Interface.Controllers.Base
 {
     public class BaseController : Controller
     {
-        public new FormsPrincipal<Cache.Models.CurrentUserInfo> CurrentUser
+        public FormsPrincipal<Cache.Models.CurrentUserInfo> CurrentUser
         {
             get
             {
@@ -45,7 +45,7 @@ namespace CallCenterApi.Interface.Controllers.Base
         /// <returns></returns>
         protected virtual ActionResult Success(string message, object data)
         {
-            var jsonMsg = new AjaxResult { state = ResultTypes.success.ToString(), message = message,data=data }.ToJson();
+            var jsonMsg = new AjaxResult { state = ResultTypes.success.ToString(), message = message, data = data }.ToJson();
             FileLog.Info(jsonMsg);
             return Content(jsonMsg);
         }

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

@@ -29,7 +29,7 @@ namespace CallCenterApi.Interface.Controllers.callout
         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();
-
+        private BLL.T_Call_PageField pageFieldBLL = new BLL.T_Call_PageField();
         #region 外呼任务
         /// <summary>
         /// 获取列表
@@ -251,9 +251,12 @@ namespace CallCenterApi.Interface.Controllers.callout
                 var taskId = taskBLL.Add(model);
                 if (taskId > 0)
                 {
-                    // return Success("添加成功", i);
                     try
                     {
+                        pageFieldBLL.UpdateByTaskId(taskId);
+
+
+
                         model.TaskID = taskId;
                         DataTable dt = taskTellNumBLL.GetTableDesign();
                         switch (input.ImportType)
@@ -300,8 +303,24 @@ namespace CallCenterApi.Interface.Controllers.callout
                                 }
                                 break;
                             case 4: //从Excel中导入
+                                string[] strArr = input.SelectIds.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
+                                var idArr = strArr.Select(x => Convert.ToInt32(x)).ToArray();
+                                var fieldList = pageFieldBLL.DataTableToList(pageFieldBLL.GetList($"F_ID in ({string.Join(",", idArr)})").Tables[0]);
                                 NPOIHelper npoi = new NPOIHelper();
-                                var dtExcel = npoi.ExcelToTable(input.PhoneStr, 1);
+                                var dtExcel = npoi.ExcelToTable(input.FilePath, 0);
+                                for (int i = 0; i < dtExcel.Rows.Count; i++)
+                                {
+                                    var row = dt.NewRow();
+                                    for (int j = 0; j < dtExcel.Columns.Count; j++)
+                                    {
+                                        if (fieldList.Count < (j + 1))
+                                            break;
+                                        row["F_TaskId"] = model.TaskID;
+                                        var field = fieldList.SingleOrDefault(x => x.F_Id == idArr[j]);
+                                        row[field.F_DBFieldlName] = dtExcel.Rows[i][j];
+                                    }
+                                    dt.Rows.Add(row);
+                                }
                                 break;
                         }
                         if (input.CheckFilter1)
@@ -531,7 +550,7 @@ namespace CallCenterApi.Interface.Controllers.callout
                 sql += $" and F_YJState={filter.YJState} ";
             }
 
-            var field = "t.TaskName,F_Phone,F_FPState,F_HCState,F_YJState,F_Username,tn.F_CreateTime";
+            var field = "F_Id,t.TaskName,F_Phone,F_FPState,F_HCState,F_YJState,F_Username,tn.F_CreateTime";
             if (filter.TaskType == 2)
             {
                 field += " F_Phone,F_HCState,F_YJState";
@@ -572,12 +591,18 @@ namespace CallCenterApi.Interface.Controllers.callout
         /// <returns></returns>
         public ActionResult GetMyPhoneList(FilterCallPhone filter)
         {
-            //if (!Request.IsAuthenticated)
-            //    return NoToken("未知错误，请重新登录");
-            var model = taskBLL.GetModel(filter.Id);
-            if (model == null)
-                return Error("外呼任务不存在");
+            if (!Request.IsAuthenticated)
+                return NoToken("未知错误，请重新登录");
+
             var sql = "";
+            if (filter.Id > 0)
+            {
+                var model = taskBLL.GetModel(filter.Id);
+                sql += " and F_TaskId=" + filter.Id;
+                if (model == null)
+                    return Error("外呼任务不存在");
+            }
+
 
             sql += $" and F_UserId={CurrentUser.UserData.F_UserId} ";
             if (!string.IsNullOrWhiteSpace(filter.Phone))
@@ -597,7 +622,7 @@ namespace CallCenterApi.Interface.Controllers.callout
                 sql += $" and F_YJState={filter.YJState} ";
             }
 
-            var field = "t.TaskName,F_Phone,F_FPState,F_HCState,F_YJState,F_Username,tn.F_CreateTime";
+            var field = "F_Id,t.TaskName,F_Phone,F_FPState,F_HCState,F_YJState,F_Username,tn.F_CreateTime";
             if (filter.TaskType == 2)
             {
                 field += " F_Phone,F_HCState,F_YJState";
@@ -608,7 +633,7 @@ namespace CallCenterApi.Interface.Controllers.callout
                              " T_Call_TaskTelNum tn left join T_CTI_Task t on t.TaskID=tn.F_TaskId ",
                              " F_Id ",
                              field,
-                             " and F_TaskId=" + filter.Id + sql,
+                              sql,
                              "ORDER BY F_Id desc",
                              filter.PageSize,
                              filter.PageIndex,
@@ -619,6 +644,7 @@ namespace CallCenterApi.Interface.Controllers.callout
             {
                 rows = modelList.Select(x => new
                 {
+                    id = x.F_Id,
                     taskname = x.TaskName,
                     phone = x.F_Phone,
                     agent = string.IsNullOrWhiteSpace(x.F_UserName) ? "" : x.F_UserName,
@@ -643,6 +669,8 @@ namespace CallCenterApi.Interface.Controllers.callout
             //    return NoToken("未知错误，请重新登录");
             if (count <= 0)
                 return Error("参数错误");
+            if (id <= 0)
+                return Error("请选择外呼任务");
             var model = taskBLL.GetModel(id);
             if (model == null)
                 return Error("外呼任务不存在");
@@ -650,11 +678,53 @@ namespace CallCenterApi.Interface.Controllers.callout
             var sum = obj == null ? 0 : Convert.ToInt32(obj);
             if (sum >= 50)
                 return Error("请先完成已分配任务");
-            if (DbHelperSQL.ExecuteSql($"UPDATE T_Call_TaskTelNum SET F_FPState=1,F_UserId={CurrentUser.UserData.F_UserId} WHERE F_Id in(SELECT TOP({count}) F_Id FROM T_Call_TaskTelNum WHERE F_TaskId={id} and F_FPState=0)") > 0)
-                return Success("分配成功");
-            return Error("分配失败");
+            var res = DbHelperSQL.ExecuteSql($"UPDATE T_Call_TaskTelNum SET F_FPState=1,F_UserId={CurrentUser.UserData.F_UserId},F_Username='{CurrentUser.UserData.F_UserName}' WHERE F_Id in(SELECT TOP({count}) F_Id FROM T_Call_TaskTelNum WHERE F_TaskId={id} and F_FPState=0)");
+            if (res > 0)
+                return Success($"获取到{res}条可用号码");
+            return Error("未获取到可用号码");
+        }
+        public ActionResult GetMyCallPlan()
+        {
+            var taskList = taskBLL.DataTableToList(taskBLL.GetList("state=1").Tables[0]);
+            return Success("获取成功", taskList.Select(x => new
+            {
+                id = x.TaskID,
+                name = x.TaskName
+            }));
         }
+        public ActionResult GetCallNumDetail(int id)
+        {
+            var taskId = DbHelperSQL.GetSingle($"SELECT F_TaskId FROM T_Call_TaskTelNum WHERE F_ID={id}");
+            if (taskId == null || Convert.ToInt32(taskId) <= 0)
+                return Error("参数错误");
+            var fieldList = pageFieldBLL.DataTableToList(pageFieldBLL.GetList($"F_TaskId={taskId}").Tables[0]);
+            StringBuilder sb = new StringBuilder();
+            Dictionary<string, string> dicTitle = new Dictionary<string, string>();
+            foreach (var item in fieldList)
+            {
+                sb.Append(item.F_DBFieldlName + ",");
+                dicTitle.Add(item.F_DBFieldlName, item.F_Name);
+            }
+            if (!string.IsNullOrWhiteSpace(sb.ToString()))
+            {
+                var callNum = DbHelperSQL.Query($"SELECT {sb.ToString().Trim(',')} FROM T_Call_TaskTelNum WHERE F_ID={id}").Tables[0];
+                Dictionary<string, string> dic = new Dictionary<string, string>();
+                for (int j = 0; j < callNum.Columns.Count; j++)
+                {
+                    dic.Add(callNum.Columns[j].ColumnName, callNum.Rows[0][j].ToString());
+                }
+
 
+
+                return Success("获取成功", dic.Select(x => new
+                {
+                    field = x.Key,
+                    text = dicTitle[x.Key],
+                    value = x.Value
+                }));
+            }
+            return Success("");
+        }
         #endregion
 
         #region 导入导出号码

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/callout/ExcelTmpController.cs

@@ -23,11 +23,7 @@ namespace CallCenterApi.Interface.Controllers.callout
         public ActionResult GetList(FilterExcelTmp filter)
         {
             string sql = " and F_DBTableName='T_Call_PageField' ";
-
-            if (filter.TaskId > 0)
-            {
-                sql += " and F_AttributeId not in (SELECT [F_FeildId] FROM [T_Call_PageField] where [F_TaskId]=" + filter.TaskId + ") ";
-            }
+            sql += " and F_AttributeId not in (SELECT [F_FeildId] FROM [T_Call_PageField] where [F_TaskId]=" + filter.TaskId + ") ";
             if (filter.Type > 0)
             {
                 sql += " and F_DBTypeName='" + filter.Type + "' ";
@@ -76,7 +72,7 @@ namespace CallCenterApi.Interface.Controllers.callout
             }
             else
             {
-                sql += " and [F_TaskId]=0 ";
+                sql += " and [F_TaskId]=-1 ";
             }
 
 
@@ -121,7 +117,7 @@ namespace CallCenterApi.Interface.Controllers.callout
             }
             else
             {
-                sql += "  [F_TaskId]=0 ";
+                sql += "  [F_TaskId]=-1 ";
             }
 
             var idList = pageFieldBLL.DataTableToListView(pageFieldBLL.GetListView(sql).Tables[0]);
@@ -133,6 +129,31 @@ namespace CallCenterApi.Interface.Controllers.callout
         }
 
         /// <summary>
+        /// 获取已选择的自定义字段
+        /// </summary>
+        /// <param name="filter"></param>
+        /// <returns></returns>
+        public ActionResult GetSelectedList(FilterExcelTmp filter)
+        {
+            var sql = "";
+            if (filter.TaskId > 0)
+            {
+                sql += "  [F_TaskId]=" + filter.TaskId + " ";
+            }
+            else
+            {
+                sql += "  [F_TaskId]=-1 ";
+            }
+
+            var idList = pageFieldBLL.DataTableToListView(pageFieldBLL.GetListView(sql).Tables[0]);
+            return Success("获取成功", idList.Select(x => new
+            {
+                id = x.F_Id,
+                name = x.F_Name
+            }));
+        }
+
+        /// <summary>
         /// 选择自定义字段
         /// </summary>
         /// <param name="ids"></param>
@@ -160,28 +181,42 @@ namespace CallCenterApi.Interface.Controllers.callout
             return Success("添加成功");
         }
 
+        ///// <summary>
+        ///// 去除自定义字段
+        ///// </summary>
+        ///// <param name="ids"></param>
+        ///// <returns></returns>
+        //public ActionResult Remove(int[] ids, int taskId)
+        //{
+        //    pageFieldBLL.DeleteByTaskId(taskId);
+        //    var sort = 0;
+        //    foreach (var id in ids)
+        //    {
+        //        var fieldmodel = formEntityAttrBLL.GetModel(id);
+        //        if (fieldmodel == null)
+        //            continue;
+        //        var itemmodel = new T_Call_PageField();
+        //        itemmodel.F_Name = fieldmodel.F_Name;
+        //        itemmodel.F_DBFieldlName = fieldmodel.F_DBFieldlName;
+        //        itemmodel.F_TaskId = taskId;
+        //        itemmodel.F_Sort = sort++;
+        //        itemmodel.F_FeildId = id;
+        //        if (pageFieldBLL.Add(itemmodel) > 0)
+        //            continue;
+        //    }
+        //    return Success("删除成功");
+        //}
+
         /// <summary>
         /// 去除自定义字段
         /// </summary>
         /// <param name="ids"></param>
         /// <returns></returns>
-        public ActionResult Remove(int[] ids, int taskId)
+        public ActionResult Remove(int[] ids)
         {
-            pageFieldBLL.DeleteByTaskId(taskId);
-            var sort = 0;
-            foreach (var id in ids)
+            if (ids != null && ids.Length > 0)
             {
-                var fieldmodel = formEntityAttrBLL.GetModel(id);
-                if (fieldmodel == null)
-                    continue;
-                var itemmodel = new T_Call_PageField();
-                itemmodel.F_Name = fieldmodel.F_Name;
-                itemmodel.F_DBFieldlName = fieldmodel.F_DBFieldlName;
-                itemmodel.F_TaskId = taskId;
-                itemmodel.F_Sort = sort++;
-                itemmodel.F_FeildId = id;
-                if (pageFieldBLL.Add(itemmodel) > 0)
-                    continue;
+                pageFieldBLL.DeleteList(string.Join(",", ids));
             }
             return Success("删除成功");
         }

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Global.asax.cs

@@ -21,7 +21,6 @@ namespace CallCenterApi.Interface
             FilterConfig.RegisterGlobalFilters(GlobalFilters.Filters);
 
         }
-
         protected void Application_AuthenticateRequest(object sender, EventArgs e)
         {
             HttpApplication app = (HttpApplication)sender;
@@ -40,7 +39,7 @@ namespace CallCenterApi.Interface
                 if (ticket != null && string.IsNullOrEmpty(ticket.UserData) == false)
                     userData = (new JavaScriptSerializer()).Deserialize<Cache.Models.CurrentUserInfo>(ticket.UserData); //还原用户数据
                 if (ticket != null && userData != null)
-                    context.User = new FormsPrincipal<Cache.Models.CurrentUserInfo> (ticket, userData);//重新给context.User赋值。
+                    context.User = new FormsPrincipal<Cache.Models.CurrentUserInfo>(ticket, userData);//重新给context.User赋值。
             }
             catch { /* 有异常也不要抛出，防止攻击者试探。 */ }
         }

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Models/Input/CallPlanInput.cs

@@ -91,5 +91,7 @@ namespace CallCenterApi.Interface.Models.Input
         /// Excel文件路径
         /// </summary>
         public string FilePath { get; set; }
+        public string SelectIds { get; set; }
+
     }
 }