数据库连接字符串修改

外呼任务分配部门
质检指标接口调整
部门下拉列表接口调整

CallCenterApi/CallCenterApi.BLL/T_CTI_Task.cs

@@ -278,6 +278,10 @@ namespace CallCenterApi.BLL
                     {
                         model.AgentGroupId = Convert.ToInt32(dt.Rows[n]["AgentGroupId"].ToString());
                     }
+                    if (dt.Rows[n]["DeptId"] != null && dt.Rows[n]["DeptId"].ToString() != "")
+                    {
+                        model.DeptId = Convert.ToInt32(dt.Rows[n]["DeptId"].ToString());
+                    }
                     modelList.Add(model);
                 }
             }

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/DepartmentController.cs

@@ -177,7 +177,7 @@ namespace CallCenterApi.Interface.Controllers
         /// 获取部门列表
         /// </summary>
         /// <returns></returns>
-        public ActionResult GetDeptListForReport(int pId = 0)
+        public ActionResult GetDeptListForReport(int pId = 0, string text = "全部")
         {
             if (Request.IsAuthenticated)
             {
@@ -192,7 +192,7 @@ namespace CallCenterApi.Interface.Controllers
                         modelList.Insert(0, new Model.TreeModel
                         {
                             id = "-1",
-                            text = "全部"
+                            text = text
                         });
                         return Success("加载成功", modelList);
                     }
@@ -202,6 +202,7 @@ namespace CallCenterApi.Interface.Controllers
             return NoToken("未知错误，请重新登录");
         }
 
+
         /// <summary>
         /// tree  树形部门
         /// </summary>

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

@@ -32,6 +32,7 @@ namespace CallCenterApi.Interface.Controllers.callout
         private readonly BLL.T_Call_PageField pageFieldBLL = new BLL.T_Call_PageField();
         private readonly BLL.T_Ask_PagerInfo pagerInfoBLL = new BLL.T_Ask_PagerInfo();
         private readonly BLL.T_Call_Answers ansBLL = new BLL.T_Call_Answers();
+        private readonly BLL.T_Sys_Department departmentBLL = new BLL.T_Sys_Department();
         #region 外呼任务
         /// <summary>
         /// 获取列表
@@ -82,7 +83,8 @@ namespace CallCenterApi.Interface.Controllers.callout
             var agentGroupList = seatGroupBLL.DataTableToList(seatGroupBLL.GetList("").Tables[0]);
             //查询坐席
             var agentList = userAccount.DataTableToList(userAccount.GetList(" F_DeleteFlag=0 ").Tables[0]);
-
+            //查询部门
+            var deptList = departmentBLL.DataTableToList(departmentBLL.GetList(" F_State=1 ").Tables[0]);
             foreach (var model in modelList)
             {
                 //计算数据
@@ -103,11 +105,14 @@ namespace CallCenterApi.Interface.Controllers.callout
                 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();
+
+                var dept = deptList.SingleOrDefault(y => y.F_DeptId == model.DeptId);
                 list.Add(new CallPlanDto
                 {
                     id = model.TaskID,
                     name = model.TaskName,
                     tasktype = model.TaskType == 1 ? "点击外呼" : "自动外呼",
+                    deptname = dept?.F_DeptName ?? "",
                     state = Enum.GetName(typeof(EnumTaskState), (model.State ?? -1)),
                     addtime = Convert.ToDateTime(model.AddTime).ToString("yyyy-MM-dd HH:mm:ss"),
                     talkid = model.y_TkModelId ?? 0,
@@ -241,7 +246,7 @@ namespace CallCenterApi.Interface.Controllers.callout
                 model.ConcurrencyType = input.ConcurrencyType;
                 model.Concurrency = input.ConcurrencyType == 0 ? (int)input.Concurrency : input.Concurrency;
                 model.RecordFileId = input.RecordPathId;
-                model.DeptId = CurrentUser.UserData.F_DeptId;
+                model.DeptId = input.DeptId <= 0 ? CurrentUser.UserData.F_DeptId : input.DeptId;
                 model.y_HMCount = 0;
                 model.y_HCCount = 0;
                 model.y_YJCount = 0;

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/quality/IndexBaseController.cs

@@ -18,61 +18,61 @@ namespace CallCenterApi.Interface.Controllers.quality
             string sql = "";
             DataTable dt = new DataTable();
 
-                string categoryid = RequestString.GetQueryString("categoryid");
-                string key = WebHelper.UrlDecode(RequestString.GetQueryString("key"));
+            string categoryid = RequestString.GetQueryString("categoryid");
+            string key = WebHelper.UrlDecode(RequestString.GetQueryString("key"));
 
-                string strpageindex = RequestString.GetQueryString("page");
-                int pageindex = 1;
-                string strpagesize = RequestString.GetQueryString("pagesize");
-                int pagesize = 10;
-                if (categoryid.Trim() != "")
-                {
-                    sql += " and (F_CategoryId=" + categoryid + " or F_CategoryId in (select F_CategoryId from T_QC_IndexCategory where F_ParentId=" + categoryid + " )) ";
-                }
+            string strpageindex = RequestString.GetQueryString("page");
+            int pageindex = 1;
+            string strpagesize = RequestString.GetQueryString("pagesize");
+            int pagesize = 10;
+            if (categoryid.Trim() != "")
+            {
+                sql += " and (F_CategoryId=" + categoryid + " or F_CategoryId in (select F_CategoryId from T_QC_IndexCategory where F_ParentId=" + categoryid + " )) ";
+            }
 
-                if (key.Trim() != "")
-                {
-                    sql += " and (F_Title like '%" + key.Trim() + "%' or F_Content like '%" + key.Trim() + "%') ";
-                }
-                if (strpageindex.Trim() != "")
-                {
-                    pageindex = Convert.ToInt32(strpageindex);
-                }
+            if (key.Trim() != "")
+            {
+                sql += " and (F_Title like '%" + key.Trim() + "%' or F_Content like '%" + key.Trim() + "%') ";
+            }
+            if (strpageindex.Trim() != "")
+            {
+                pageindex = Convert.ToInt32(strpageindex);
+            }
 
-                if (strpagesize.Trim() != "")
-                {
-                    pagesize = Convert.ToInt32(strpagesize);
-                }
-                int recordCount = 0;
-                dt = BLL.PagerBLL.GetListPager(
-                    "vw_QC_IndexBase",
-                    "F_IndexId",
-                    "*",
-                    " and F_DeleteFlag=0 " + sql,
-                    "ORDER BY F_Sort",
-                    pagesize,
-                    pageindex,
-                    true,
-                    out recordCount);
+            if (strpagesize.Trim() != "")
+            {
+                pagesize = Convert.ToInt32(strpagesize);
+            }
+            int recordCount = 0;
+            dt = BLL.PagerBLL.GetListPager(
+                "vw_QC_IndexBase",
+                "F_IndexId",
+                "*",
+                " and F_DeleteFlag=0 " + sql,
+                "ORDER BY F_Sort",
+                pagesize,
+                pageindex,
+                true,
+                out recordCount);
 
-                var obj = new
-                {
-                    rows = dt,
-                    total = recordCount
-                };
+            var obj = new
+            {
+                rows = dt,
+                total = recordCount
+            };
 
-                res = Content(obj.ToJson());
+            res = Content(obj.ToJson());
 
-                //System.Collections.Generic.List<Model.T_QC_IndexBase> modelList = new BLL.T_QC_IndexBase().DataTableToList(dt);
+            //System.Collections.Generic.List<Model.T_QC_IndexBase> modelList = new BLL.T_QC_IndexBase().DataTableToList(dt);
 
-                //if (modelList.Count > 0)
-                //{
-                //    res = Success("指标列表加载成功", modelList);
-                //}
-                //else
-                //{
-                //    res = Error("指标列表加载失败");
-                //}
+            //if (modelList.Count > 0)
+            //{
+            //    res = Success("指标列表加载成功", modelList);
+            //}
+            //else
+            //{
+            //    res = Error("指标列表加载失败");
+            //}
 
             return res;
         }
@@ -81,71 +81,71 @@ namespace CallCenterApi.Interface.Controllers.quality
         public ActionResult GetIndexBase(string id)
         {
             ActionResult res = NoToken("未知错误，请重新登录");
-    
-                if (id.Trim() != "")
+
+            if (id.Trim() != "")
+            {
+                BLL.T_QC_IndexBase dBLL = new BLL.T_QC_IndexBase();
+                Model.T_QC_IndexBase dModel = dBLL.GetModel(int.Parse(id.Trim()));
+                if (dModel != null)
                 {
-                    BLL.T_QC_IndexBase dBLL = new BLL.T_QC_IndexBase();
-                    Model.T_QC_IndexBase dModel = dBLL.GetModel(int.Parse(id.Trim()));
-                    if (dModel != null)
-                    {
-                        res = Success("获取指标成功", dModel);
-                    }
-                    else
-                    {
-                        res = Error("获取指标失败");
-                    }
+                    res = Success("获取指标成功", dModel);
                 }
                 else
                 {
-                    res = Error("获取参数失败");
+                    res = Error("获取指标失败");
                 }
+            }
+            else
+            {
+                res = Error("获取参数失败");
+            }
 
             return res;
         }
 
         //添加指标
-        public ActionResult AddIndexBase(string cid, string score, string sort, string title,string remark)
+        public ActionResult AddIndexBase(string cid, string score, string sort, string title, string remark)
         {
             ActionResult res = NoToken("未知错误，请重新登录");
             if (Request.IsAuthenticated)
             {
-               
-                    Model.T_QC_IndexBase dModel = new Model.T_QC_IndexBase();
 
-                    if (!string.IsNullOrWhiteSpace(cid.Trim()))
-                    {
-                        dModel.F_CategoryId = int.Parse(cid.Trim());
-                    }
-                    if (!string.IsNullOrWhiteSpace(sort.Trim()))
-                    {
-                        dModel.F_Sort = Convert.ToInt32(sort.Trim());
-                    }
-                    if (!string.IsNullOrWhiteSpace(sort.Trim()))
-                    {
-                        dModel.F_Score = Convert.ToInt32(sort.Trim());
-                    }
-                    if (!string.IsNullOrWhiteSpace(title.Trim()))
-                    {
-                        dModel.F_Title = WebHelper.UrlDecode(title.Trim());
-                    }
-                    if (!string.IsNullOrWhiteSpace(remark.Trim()))
-                    {
-                        dModel.F_Remark = WebHelper.UrlDecode(remark.Trim());
-                    }
+                Model.T_QC_IndexBase dModel = new Model.T_QC_IndexBase();
+
+                if (!string.IsNullOrWhiteSpace(cid.Trim()))
+                {
+                    dModel.F_CategoryId = int.Parse(cid.Trim());
+                }
+                if (!string.IsNullOrWhiteSpace(sort.Trim()))
+                {
+                    dModel.F_Sort = Convert.ToInt32(sort.Trim());
+                }
+                if (!string.IsNullOrWhiteSpace(sort.Trim()))
+                {
+                    dModel.F_Score = Convert.ToInt32(score.Trim());
+                }
+                if (!string.IsNullOrWhiteSpace(title.Trim()))
+                {
+                    dModel.F_Title = WebHelper.UrlDecode(title.Trim());
+                }
+                if (!string.IsNullOrWhiteSpace(remark.Trim()))
+                {
+                    dModel.F_Remark = WebHelper.UrlDecode(remark.Trim());
+                }
 
-                    dModel.F_CreateOn = DateTime.Now;
-                    dModel.F_CreateBy = CurrentUser.UserData.F_UserId;
-                    dModel.F_DeleteFlag = 0;
+                dModel.F_CreateOn = DateTime.Now;
+                dModel.F_CreateBy = CurrentUser.UserData.F_UserId;
+                dModel.F_DeleteFlag = 0;
 
-                    bool b = new BLL.T_QC_IndexBase().Add(dModel) > 0;
-                    if (b)
-                    {
-                        res = Success("添加成功");
-                    }
-                    else
-                    {
-                        res = Success("添加失败");
-                    }
+                bool b = new BLL.T_QC_IndexBase().Add(dModel) > 0;
+                if (b)
+                {
+                    res = Success("添加成功");
+                }
+                else
+                {
+                    res = Success("添加失败");
+                }
 
             }
             return res;
@@ -157,79 +157,79 @@ namespace CallCenterApi.Interface.Controllers.quality
             ActionResult res = NoToken("未知错误，请重新登录");
             if (Request.IsAuthenticated)
             {
-                
-                    if (cid.Trim() != "")
+
+                if (cid.Trim() != "")
+                {
+                    BLL.T_QC_IndexBase dBLL = new BLL.T_QC_IndexBase();
+                    Model.T_QC_IndexBase dModel = dBLL.GetModel(int.Parse(id.Trim()));
+                    if (dModel != null)
                     {
-                        BLL.T_QC_IndexBase dBLL = new BLL.T_QC_IndexBase();
-                        Model.T_QC_IndexBase dModel = dBLL.GetModel(int.Parse(id.Trim()));
-                        if (dModel != null)
+                        if (!string.IsNullOrWhiteSpace(cid.Trim()))
+                        {
+                            dModel.F_CategoryId = int.Parse(cid.Trim());
+                        }
+                        if (!string.IsNullOrWhiteSpace(sort.Trim()))
+                        {
+                            dModel.F_Sort = Convert.ToInt32(sort.Trim());
+                        }
+                        if (!string.IsNullOrWhiteSpace(sort.Trim()))
                         {
-                            if (!string.IsNullOrWhiteSpace(cid.Trim()))
-                            {
-                                dModel.F_CategoryId = int.Parse(cid.Trim());
-                            }
-                            if (!string.IsNullOrWhiteSpace(sort.Trim()))
-                            {
-                                dModel.F_Sort = Convert.ToInt32(sort.Trim());
-                            }
-                            if (!string.IsNullOrWhiteSpace(sort.Trim()))
-                            {
-                                dModel.F_Score = Convert.ToInt32(sort.Trim());
-                            }
-                            if (!string.IsNullOrWhiteSpace(title.Trim()))
-                            {
-                                dModel.F_Title = WebHelper.UrlDecode(title.Trim());
-                            }
-                            if (!string.IsNullOrWhiteSpace(remark.Trim()))
-                            {
-                                dModel.F_Remark = WebHelper.UrlDecode(remark.Trim());
-                            }
-                            bool b = dBLL.Update(dModel);
-                            if (b)
-                            {
-                                res = Success("编辑成功");
-                            }
-                            else
-                            {
-                                res = Success("编辑失败");
-                            }
+                            dModel.F_Score = Convert.ToInt32(score.Trim());
+                        }
+                        if (!string.IsNullOrWhiteSpace(title.Trim()))
+                        {
+                            dModel.F_Title = WebHelper.UrlDecode(title.Trim());
+                        }
+                        if (!string.IsNullOrWhiteSpace(remark.Trim()))
+                        {
+                            dModel.F_Remark = WebHelper.UrlDecode(remark.Trim());
+                        }
+                        bool b = dBLL.Update(dModel);
+                        if (b)
+                        {
+                            res = Success("编辑成功");
                         }
                         else
-                            res = Error("获取信息失败");
+                        {
+                            res = Success("编辑失败");
+                        }
                     }
                     else
-                    {
-                        res = Error("请选择要编辑的指标");
-                    }
-     
+                        res = Error("获取信息失败");
+                }
+                else
+                {
+                    res = Error("请选择要编辑的指标");
+                }
+
             }
             return res;
         }
 
         //删除指标记录
-        public ActionResult DelIndexBase(string id,string cid)
+        public ActionResult DelIndexBase(string id, string cid)
         {
             ActionResult res = NoToken("未知错误，请重新登录");
             DataTable dt = new DataTable();
-       
-                if (!string.IsNullOrEmpty(id.Trim()))
-                {
-                    if (new BLL.T_QC_IndexBase().Delete(Convert.ToInt32(id)))
-                    {
-                        SetScoreByCategory(cid);
-                        res = Success("删除成功");
-                    }
-                    else
-                    {
-                        res = Error("删除失败");
-                    }
 
+            if (!string.IsNullOrEmpty(id.Trim()))
+            {
+                if (new BLL.T_QC_IndexBase().Delete(Convert.ToInt32(id)))
+                {
+                    SetScoreByCategory(cid);
+                    res = Success("删除成功");
                 }
                 else
                 {
-                    res = Error("请选择要删除的记录");
+                    res = Error("删除失败");
                 }
 
+            }
+            else
+            {
+                res = Error("请选择要删除的记录");
+            }
+
             return res;
         }
 

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/quality/IndexCategoryController.cs

@@ -18,75 +18,81 @@ namespace CallCenterApi.Interface.Controllers.quality
             string sql = "";
             DataTable dt = new DataTable();
             string strpageindex = RequestString.GetQueryString("page");
-                int pageindex = 1;
-                string strpagesize = RequestString.GetQueryString("pagesize");
-                int pagesize = 10;
-                
-                if (strpageindex.Trim() != "")
-                {
-                    pageindex = Convert.ToInt32(strpageindex);
-                }
+            int pageindex = 1;
+            string strpagesize = RequestString.GetQueryString("pagesize");
+            int pagesize = 10;
 
-                if (strpagesize.Trim() != "")
-                {
-                    pagesize = Convert.ToInt32(strpagesize);
-                }
-                int recordCount = 0;
-                dt = BLL.PagerBLL.GetListPager(
-                    "T_QC_IndexCategory",
-                    "F_CategoryId",
-                    "*",
-                    sql,
-                    "ORDER BY F_CategoryId ",
-                    pagesize,
-                    pageindex,
-                    true,
-                    out recordCount);
-
-                var obj = new
-                {
-                    rows = dt,
-                    total = recordCount
-                };
+            if (strpageindex.Trim() != "")
+            {
+                pageindex = Convert.ToInt32(strpageindex);
+            }
+
+            if (strpagesize.Trim() != "")
+            {
+                pagesize = Convert.ToInt32(strpagesize);
+            }
+            int recordCount = 0;
+            dt = BLL.PagerBLL.GetListPager(
+                "T_QC_IndexCategory",
+                "F_CategoryId",
+                "*",
+                sql,
+                "ORDER BY F_CategoryId ",
+                pagesize,
+                pageindex,
+                true,
+                out recordCount);
+
+            var obj = new
+            {
+                rows = dt,
+                total = recordCount
+            };
 
-                res = Content(obj.ToJson());
+            res = Content(obj.ToJson());
 
-                //System.Collections.Generic.List<Model.T_QC_IndexCategory> modelList = new BLL.T_QC_IndexCategory().DataTableToList(dt);
+            //System.Collections.Generic.List<Model.T_QC_IndexCategory> modelList = new BLL.T_QC_IndexCategory().DataTableToList(dt);
 
-                //if (modelList.Count > 0)
-                //{
-                //    res = Success("指标分类列表加载成功", modelList);
-                //}
-                //else
-                //{
-                //    res = Error("指标分类列表加载失败");
-                //}
+            //if (modelList.Count > 0)
+            //{
+            //    res = Success("指标分类列表加载成功", modelList);
+            //}
+            //else
+            //{
+            //    res = Error("指标分类列表加载失败");
+            //}
 
             return res;
         }
 
+        public ActionResult GetAllList()
+        {
+            var list = new BLL.T_QC_IndexCategory().GetModelList("");
+            return Success("获取下拉指标分类成功", list);
+        }
+
         //获取指标分类
         public ActionResult GetIndexCategory(string cid)
         {
             ActionResult res = NoToken("未知错误，请重新登录");
 
-                if (cid.Trim() != "")
+            if (cid.Trim() != "")
+            {
+                BLL.T_QC_IndexCategory dBLL = new BLL.T_QC_IndexCategory();
+                Model.T_QC_IndexCategory dModel = dBLL.GetModel(int.Parse(cid.Trim()));
+                if (dModel != null)
                 {
-                    BLL.T_QC_IndexCategory dBLL = new BLL.T_QC_IndexCategory();
-                    Model.T_QC_IndexCategory dModel = dBLL.GetModel(int.Parse(cid.Trim()));
-                    if (dModel != null)
-                    {
-                        res = Success("获取指标分类成功", dModel);
-                    }
-                    else
-                    {
-                        res = Error("获取指标分类失败");
-                    }
+                    res = Success("获取指标分类成功", dModel);
                 }
                 else
                 {
-                    res = Error("获取参数失败");
+                    res = Error("获取指标分类失败");
                 }
+            }
+            else
+            {
+                res = Error("获取参数失败");
+            }
 
             return res;
         }
@@ -98,80 +104,80 @@ namespace CallCenterApi.Interface.Controllers.quality
             if (Request.IsAuthenticated)
             {
 
-                    Model.T_QC_IndexCategory dModel = new Model.T_QC_IndexCategory();
+                Model.T_QC_IndexCategory dModel = new Model.T_QC_IndexCategory();
 
-                    if (!string.IsNullOrWhiteSpace(categoryName.Trim()))
-                    {
-                        dModel.F_CategoryName = WebHelper.UrlDecode(categoryName.Trim());
-                    }
-                    if (!string.IsNullOrWhiteSpace(sort.Trim()))
-                    {
-                        dModel.F_Sort = Convert.ToInt32(sort.Trim());
-                    }
-                    if (!string.IsNullOrWhiteSpace(pid.Trim()))
-                    {
-                        dModel.F_ParentId = Convert.ToInt32(pid.Trim());
-                    }
-                    dModel.F_CreateOn = DateTime.Now;
-                    dModel.F_CreateBy = CurrentUser.UserData.F_UserId;
-                    dModel.F_DeleteFlag = 0;
+                if (!string.IsNullOrWhiteSpace(categoryName.Trim()))
+                {
+                    dModel.F_CategoryName = WebHelper.UrlDecode(categoryName.Trim());
+                }
+                if (!string.IsNullOrWhiteSpace(sort.Trim()))
+                {
+                    dModel.F_Sort = Convert.ToInt32(sort.Trim());
+                }
+                if (!string.IsNullOrWhiteSpace(pid.Trim()))
+                {
+                    dModel.F_ParentId = Convert.ToInt32(pid.Trim());
+                }
+                dModel.F_CreateOn = DateTime.Now;
+                dModel.F_CreateBy = CurrentUser.UserData.F_UserId;
+                dModel.F_DeleteFlag = 0;
 
-                    bool b = new BLL.T_QC_IndexCategory().Add(dModel) > 0;
-                    if (b)
-                    {
-                        res = Success("添加成功");
-                    }
-                    else
-                    {
-                        res = Success("添加失败");
-                    }
+                bool b = new BLL.T_QC_IndexCategory().Add(dModel) > 0;
+                if (b)
+                {
+                    res = Success("添加成功");
+                }
+                else
+                {
+                    res = Success("添加失败");
+                }
 
             }
             return res;
         }
 
         //编辑指标分类
-        public ActionResult EditIndexCategory(string cid,string categoryName, string sort, string pid)
+        public ActionResult EditIndexCategory(string cid, string categoryName, string sort, string pid)
         {
             ActionResult res = NoToken("未知错误，请重新登录");
             if (Request.IsAuthenticated)
             {
 
-                    if (cid.Trim() != "")
+                if (cid.Trim() != "")
+                {
+                    BLL.T_QC_IndexCategory dBLL = new BLL.T_QC_IndexCategory();
+                    Model.T_QC_IndexCategory dModel = dBLL.GetModel(int.Parse(cid.Trim()));
+                    if (dModel != null)
                     {
-                        BLL.T_QC_IndexCategory dBLL = new BLL.T_QC_IndexCategory();
-                        Model.T_QC_IndexCategory dModel = dBLL.GetModel(int.Parse(cid.Trim()));
-                        if (dModel != null)
+                        if (!string.IsNullOrWhiteSpace(categoryName.Trim()))
                         {
-                            if (!string.IsNullOrWhiteSpace(categoryName.Trim()))
-                            {
-                                dModel.F_CategoryName = WebHelper.UrlDecode(categoryName.Trim());
-                            }
-                            if (!string.IsNullOrWhiteSpace(sort.Trim()))
-                            {
-                                dModel.F_Sort = Convert.ToInt32(sort.Trim());
-                            }
-                            if (!string.IsNullOrWhiteSpace(pid.Trim()))
-                            {
-                                dModel.F_ParentId = Convert.ToInt32(pid.Trim());
-                            }
-                            bool b = dBLL.Update(dModel);
-                            if (b)
-                            {
-                                res = Success("编辑成功");
-                            }
-                            else
-                            {
-                                res = Success("编辑失败");
-                            }
+                            dModel.F_CategoryName = WebHelper.UrlDecode(categoryName.Trim());
+                        }
+                        if (!string.IsNullOrWhiteSpace(sort.Trim()))
+                        {
+                            dModel.F_Sort = Convert.ToInt32(sort.Trim());
+                        }
+                        if (!string.IsNullOrWhiteSpace(pid.Trim()))
+                        {
+                            dModel.F_ParentId = Convert.ToInt32(pid.Trim());
+                        }
+                        bool b = dBLL.Update(dModel);
+                        if (b)
+                        {
+                            res = Success("编辑成功");
                         }
                         else
-                            res = Error("获取信息失败");
+                        {
+                            res = Success("编辑失败");
+                        }
                     }
                     else
-                    {
-                        res = Error("请选择要编辑的分类");
-                    }
+                        res = Error("获取信息失败");
+                }
+                else
+                {
+                    res = Error("请选择要编辑的分类");
+                }
 
             }
             return res;
@@ -183,30 +189,30 @@ namespace CallCenterApi.Interface.Controllers.quality
             ActionResult res = NoToken("未知错误，请重新登录");
             DataTable dt = new DataTable();
 
-                if (!string.IsNullOrEmpty(id.Trim()))
+            if (!string.IsNullOrEmpty(id.Trim()))
+            {
+                dt = new BLL.T_QC_IndexBase().GetList(" F_CategoryId=" + id + " ").Tables[0];
+                if (dt.Rows.Count > 0)
                 {
-                    dt = new BLL.T_QC_IndexBase().GetList(" F_CategoryId=" + id + " ").Tables[0];
-                    if (dt.Rows.Count > 0)
+                    res = Error("请先删除此分类下的指标");
+                }
+                else
+                {
+                    if (new BLL.T_QC_IndexCategory().Delete(Convert.ToInt32(id)))
                     {
-                        res = Error("请先删除此分类下的指标");
+                        res = Success("删除成功");
                     }
                     else
                     {
-                        if (new BLL.T_QC_IndexCategory().Delete(Convert.ToInt32(id)))
-                        {
-                            res = Success("删除成功");
-                        }
-                        else
-                        {
-                            res = Error("删除失败");
-                        }
-
+                        res = Error("删除失败");
                     }
+
                 }
-                else
-                {
-                    res = Error("请选择要删除的记录");
-                }
+            }
+            else
+            {
+                res = Error("请选择要删除的记录");
+            }
 
             return res;
         }

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

@@ -10,6 +10,7 @@ namespace CallCenterApi.Interface.Models.Dto
         public long id { get; set; }
         public string name { get; set; }
         public string tasktype { get; set; }
+        public string deptname { get; set; }
         public string state { get; set; }
         public string addtime { get; set; }
         public long talkid { get; set; }

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Models/Filter/FilterCallPhone.cs

@@ -15,6 +15,6 @@ namespace CallCenterApi.Interface.Models.Filter
         public int YJState { get; set; } = -1;
         public int UserId { get; set; } = 0;
         public int TaskType { get; set; } = 1;
-
+        public int RequestType { get; set; } = 1;
     }
 }

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

@@ -93,6 +93,6 @@ namespace CallCenterApi.Interface.Models.Input
         public string FilePath { get; set; }
         public string SelectIds { get; set; }
         public int TempId { get; set; } = 0;
-
+        public int DeptId { get; set; }
     }
 }

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Web.config

@@ -18,7 +18,7 @@
   </appSettings>
   <connectionStrings>
     <!--<add name="ConnectionString" connectionString="Data Source=117.158.196.116,11433;User ID=sa;pwd=800100;Initial Catalog=CallCenter_ZXZBNew;"/>-->
-    <add name="ConnectionString" connectionString="Data Source=192.168.4.18;User ID=sa;pwd=800100;Initial Catalog=CallCenter_ZYKJ;"/>
+    <add name="ConnectionString" connectionString="Data Source=192.168.4.18;User ID=sa;pwd=800100;Initial Catalog=CallCenter_ZYKJ2;"/>
     <!--<add name="ConnectionString" connectionString="Data Source=192.168.1.88;User ID=sa;pwd=800100;Initial Catalog=UUBase_CallCenter;"/>-->
     <!--<add name="ConnectionString" connectionString="Data Source=192.168.1.88;User ID=sa;pwd=800100;Initial Catalog=CallCenter_ZXZB2;"/>-->
   </connectionStrings>