1.禁止外呼号码列表

2.获取角色列表接口调整

CallCenterApi/CallCenterApi.BLL/CallCenterApi.BLL.csproj

@@ -51,6 +51,7 @@
     <Compile Include="T_Ask_Question.cs" />
     <Compile Include="T_Ask_QuestionCategory.cs" />
     <Compile Include="T_Ask_QuestionItems.cs" />
+    <Compile Include="T_Call_BanCallOut.cs" />
     <Compile Include="T_Call_Blacklist.cs" />
     <Compile Include="T_Call_CallRecords.cs" />
     <Compile Include="T_Call_CallRecordsLD.cs" />

CallCenterApi/CallCenterApi.BLL/T_Call_BanCallOut.cs

@@ -0,0 +1,51 @@
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using CallCenterApi.Model;
+
+namespace CallCenterApi.BLL
+{
+    public class T_Call_BanCallOut
+    {
+        private readonly DAL.T_Call_BanCallOut dal = new DAL.T_Call_BanCallOut();
+        /// <summary>
+        /// 获得数据列表
+        /// </summary>
+        public List<CallCenterApi.Model.T_Call_BanCallOut> DataTableToList(DataTable dt)
+        {
+            List<CallCenterApi.Model.T_Call_BanCallOut> modelList = new List<CallCenterApi.Model.T_Call_BanCallOut>();
+            int rowsCount = dt.Rows.Count;
+            if (rowsCount > 0)
+            {
+                CallCenterApi.Model.T_Call_BanCallOut model;
+                for (int n = 0; n < rowsCount; n++)
+                {
+                    model = new CallCenterApi.Model.T_Call_BanCallOut();
+                    model.Id = Convert.ToInt32(dt.Rows[n]["F_Id"]);
+                    model.F_Phone = dt.Rows[n]["F_Phone"] == null ? "" : dt.Rows[n]["F_Phone"].ToString();
+                    model.F_SetTime = dt.Rows[n]["F_SetTime"] == null ? null : (DateTime?)Convert.ToDateTime(dt.Rows[n]["F_Phone"].ToString());
+                    modelList.Add(model);
+                }
+            }
+            return modelList;
+        }
+
+        public Model.T_Call_BanCallOut GetModel(string phone)
+        {
+            return dal.GetModel(phone);
+        }
+
+        public int Add(Model.T_Call_BanCallOut model)
+        {
+            return dal.Add(model);
+        }
+
+        public int deleteBatch(string ids)
+        {
+            return dal.DeleteBatch(ids);
+        }
+    }
+}

CallCenterApi/CallCenterApi.DAL/CallCenterApi.DAL.csproj

@@ -51,6 +51,7 @@
     <Compile Include="T_Ask_Question.cs" />
     <Compile Include="T_Ask_QuestionCategory.cs" />
     <Compile Include="T_Ask_QuestionItems.cs" />
+    <Compile Include="T_Call_BanCallOut.cs" />
     <Compile Include="T_Call_Blacklist.cs" />
     <Compile Include="T_Call_CallRecords.cs" />
     <Compile Include="T_Call_CallRecordsLD.cs" />

CallCenterApi/CallCenterApi.DAL/T_Call_BanCallOut.cs

@@ -0,0 +1,37 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using CallCenterApi.Model;
+using CallCenterApi.DB;
+using System.Data.SqlClient;
+
+namespace CallCenterApi.DAL
+{
+    public class T_Call_BanCallOut
+    {
+        public int Add(Model.T_Call_BanCallOut model)
+        {
+            var sql = "insert into T_Call_BanCallOut (F_Phone) values (@F_Phone)";
+            return DbHelperSQL.ExecuteSql(sql, new SqlParameter("@F_Phone", model.F_Phone));
+        }
+
+        public int DeleteBatch(string ids)
+        {
+            var sql = $"delete form T_Call_BanCallOut where F_Id in ({ids}) ";
+            return DbHelperSQL.ExecuteSql(sql);
+        }
+
+        public Model.T_Call_BanCallOut GetModel(string phone)
+        {
+            Model.T_Call_BanCallOut model = new Model.T_Call_BanCallOut();
+            var sql = "select F_Id,F_Phone,F_SetTime from T_Call_BanCallOut WHERE F_Phone=@F_Phone";
+            var dt = DbHelperSQL.Query(sql, new SqlParameter("@F_Phone", phone)).Tables[0];
+            model.Id = Convert.ToInt32(dt.Rows[0]["F_Id"]);
+            model.F_Phone = dt.Rows[0]["F_Phone"] == null ? "" : dt.Rows[0]["F_Phone"].ToString();
+            model.F_SetTime = dt.Rows[0]["F_SetTime"] == null ? null : (DateTime?)Convert.ToDateTime(dt.Rows[0]["F_Phone"].ToString());
+            return model;
+        }
+    }
+}

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

@@ -209,6 +209,7 @@
     <Compile Include="App_Start\RouteConfig.cs" />
     <Compile Include="Controllers\Base\BaseController.cs" />
     <Compile Include="Controllers\CallOutOptController.cs" />
+    <Compile Include="Controllers\callout\BanCallOutController.cs" />
     <Compile Include="Controllers\callout\CallPlanController.cs" />
     <Compile Include="Controllers\callout\ExcelTmpController.cs" />
     <Compile Include="Controllers\customer\CustomerController.cs" />
@@ -286,11 +287,13 @@
     <Compile Include="Models\Dto\ModuleInfoDto.cs" />
     <Compile Include="Models\Dto\OrderDto.cs" />
     <Compile Include="Models\Dto\ProductDto.cs" />
+    <Compile Include="Models\Filter\FilterBanCallOut.cs" />
     <Compile Include="Models\Filter\FilterCallPhone.cs" />
     <Compile Include="Models\Filter\FilterCallPlan.cs" />
     <Compile Include="Models\Filter\FilterExcelTmp.cs" />
     <Compile Include="Models\Filter\FilterPagerInfo.cs" />
     <Compile Include="Models\Filter\FilterQuestion.cs" />
+    <Compile Include="Models\Filter\FilterRole.cs" />
     <Compile Include="Models\Filter\FilterTalkRecord.cs" />
     <Compile Include="Models\Filter\FilterCategory.cs" />
     <Compile Include="Models\Filter\FilterDictionary.cs" />
@@ -301,6 +304,7 @@
     <Compile Include="Models\Filter\FilterSysConfig.cs" />
     <Compile Include="Models\Filter\FilterUserAccount.cs" />
     <Compile Include="Models\Filter\FilterProduct.cs" />
+    <Compile Include="Models\Input\BanCallOutInput.cs" />
     <Compile Include="Models\Input\CallNumberInput.cs" />
     <Compile Include="Models\Input\CallPlanInput.cs" />
     <Compile Include="Models\Input\CategoryInput.cs" />
@@ -348,6 +352,7 @@
   </ItemGroup>
   <ItemGroup>
     <Folder Include="App_Data\" />
+    <Folder Include="Views\BanCallOut\" />
     <Folder Include="Views\Base\" />
     <Folder Include="Views\Business\" />
     <Folder Include="Views\Callblack\" />

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/CallOutOptController.cs

@@ -10,6 +10,7 @@ namespace CallCenterApi.Interface.Controllers
 {
     public class CallOutOptController : BaseController
     {
+        private readonly BLL.T_Call_BanCallOut banCallOutBLL = new BLL.T_Call_BanCallOut();
         //外呼判断本地外地以及加前缀返回
         public ActionResult GetCallOutprefix(string phone)
         {
@@ -17,6 +18,12 @@ namespace CallCenterApi.Interface.Controllers
             if (Request.IsAuthenticated)
             {
                 string phone1 = RequestString.ToDBC(RequestString.RemoveNotNumber(WebHelper.NoHtml(phone)));
+
+                #region  //判断外呼号码是否存在于【禁止外呼表】,如果存在，不可进行外呼
+                if (banCallOutBLL.GetModel(phone1) != null)
+                    return Error("该号码已被列为禁止外呼号码");
+                #endregion
+
                 string zipcode = ""; string bfix = ""; string wfix = ""; string fix = "";
                 string userseatgroupid = CurrentUser.UserData.F_SeartGroupID.ToString();
                 if (userseatgroupid != "" && userseatgroupid != "0")

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/RoleInfoController.cs

@@ -2,6 +2,7 @@
 using CallCenter.Utility.Linq;
 using CallCenterApi.DB;
 using CallCenterApi.Interface.Controllers.Base;
+using CallCenterApi.Interface.Models.Filter;
 using CallCenterApi.Interface.Models.Input;
 using System;
 using System.Collections.Generic;
@@ -17,33 +18,33 @@ namespace CallCenterApi.Interface.Controllers
     {
         private BLL.T_Sys_RoleInfo roleInfoBLL = new BLL.T_Sys_RoleInfo();
         // 获取角色列表
-        public ActionResult GetRoleList(int pageIndex = 1, int pageSize = 10, string code = "", string name = "")
+        public ActionResult GetRoleList(FilterRole filter)
         {
             ActionResult res = NoToken("未知错误，请重新登录");
             //if (Request.IsAuthenticated)
             //{
-                DataTable dt = new DataTable();
-                int recordCount = 0;
-                dt = BLL.PagerBLL.GetListPager(
-                    "T_Sys_RoleInfo",
-                    "F_RoleId",
-                    "*",
-                    " and  F_RoleName like '%" + name + "%' and F_RoleCode like '%" + code + "%'  ",
-                    "",
-                    pageSize,
-                    pageIndex,
-                    true,
-                    out recordCount);
+            DataTable dt = new DataTable();
+            int recordCount = 0;
+            dt = BLL.PagerBLL.GetListPager(
+                "T_Sys_RoleInfo",
+                "F_RoleId",
+                "*",
+                " and  F_RoleName like '%" + filter.Name + "%' and F_RoleCode like '%" + filter.Code + "%'  ",
+                "",
+                filter.PageSize,
+                filter.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());
             //}
             return res;
         }

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/callout/BanCallOutController.cs

@@ -0,0 +1,71 @@
+using CallCenter.Utility;
+using CallCenterApi.Interface.Controllers.Base;
+using CallCenterApi.Interface.Models.Filter;
+using CallCenterApi.Interface.Models.Input;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Web;
+using System.Web.Mvc;
+
+namespace CallCenterApi.Interface.Controllers.callout
+{
+    public class BanCallOutController : BaseController
+    {
+        private readonly BLL.T_Call_BanCallOut banCallOutBLL = new BLL.T_Call_BanCallOut();
+        public ActionResult GetList(FilterBanCallOut filter)
+        {
+            StringBuilder sb = new StringBuilder();
+            if (!string.IsNullOrWhiteSpace(filter.Phone))
+            {
+                sb.Append($"  and  F_Phone='{filter.Phone}'");
+            }
+            //if (filter.Start != null && filter.End != null)
+            //{
+            //    sb.Append($"  and  F_Phone='{filter.Phone}'");
+            //}
+            var recordCount = 0;
+            var dt = BLL.PagerBLL.GetListPager(
+                             "T_Call_BanCallOut",
+                             "F_Id",
+                             "*",
+                             sb.ToString(),
+                             "ORDER BY SetTime desc",
+                             filter.PageSize,
+                             filter.PageIndex,
+                             true,
+                             out recordCount);
+            List<Model.T_Call_BanCallOut> modelList = new BLL.T_Call_BanCallOut().DataTableToList(dt);
+            var obj = new
+            {
+                rows = modelList,
+                total = recordCount
+            };
+            return Content(obj.ToJson());
+        }
+
+        public ActionResult Add(BanCallOutInput input)
+        {
+            if (!string.IsNullOrWhiteSpace(input.Phone))
+                return Error("号码不可为空");
+            if (banCallOutBLL.Add(new Model.T_Call_BanCallOut()
+            {
+                F_Phone = input.Phone
+            }) > 0)
+                return Success("添加成功");
+            return Error("添加失败");
+        }
+
+        public ActionResult Delete(int[] ids)
+        {
+            if (ids == null || ids.Length <= 0)
+                return Error("请选择需要删除的项");
+            var idsStr = string.Join(",", ids);
+            banCallOutBLL.deleteBatch(idsStr);
+            return Success("删除成功");
+        }
+
+
+    }
+}

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

@@ -47,27 +47,26 @@ namespace CallCenterApi.Interface.Controllers.callout
                 sql += "  and (TaskName like '%" + filter.Name.Trim() + "%' ) ";
             }
 
-            var roleid = CurrentUser.UserData.F_RoleId;
-            var deptid = CurrentUser.UserData.F_DeptId;
-            var deptcode = CurrentUser.UserData.F_DeptCode;
-            var usercode = CurrentUser.UserData.F_UserCode;
-            if (roleid != 0)
-            {
-                if (roleid != 17)
-                {
-                    if (deptcode.IndexOf("|531|") > 0)
-                    {
-                        sql += " and UserCode in (select F_UserCode from T_Sys_UserAccount where F_DeptID in (select F_DeptId from T_Sys_Department where F_DeptCode like '" + deptcode + "%')) ";
-                    }
-                    else
-                    {
-                        sql += " and UserCode in (select F_UserCode from T_Sys_UserAccount where F_DeptId=" + deptid + ")";
-                    }
-                }
-            }
+            //var roleid = CurrentUser.UserData.F_RoleId;
+            //var deptid = CurrentUser.UserData.F_DeptId;
+            //var deptcode = CurrentUser.UserData.F_DeptCode;
+            //var usercode = CurrentUser.UserData.F_UserCode;
+            //if (roleid != 0)
+            //{
+            //    if (roleid != 17)
+            //    {
+            //        if (deptcode.IndexOf("|531|") > 0)
+            //        {
+            //            sql += " and UserCode in (select F_UserCode from T_Sys_UserAccount where F_DeptID in (select F_DeptId from T_Sys_Department where F_DeptCode like '" + deptcode + "%')) ";
+            //        }
+            //        else
+            //        {
+            //            sql += " and UserCode in (select F_UserCode from T_Sys_UserAccount where F_DeptId=" + deptid + ")";
+            //        }
+            //    }
+            //}
 
 
-            Model.PageData<Model.T_CTI_Task> pageModel = new Model.PageData<Model.T_CTI_Task>();
             var recordCount = 0;
             var dt = BLL.PagerBLL.GetListPager(
                              "T_CTI_Task",

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Models/Filter/FilterBanCallOut.cs

@@ -0,0 +1,16 @@
+using CallCenterApi.Interface.Models.Common;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+
+namespace CallCenterApi.Interface.Models.Filter
+{
+    public class FilterBanCallOut : ListBase
+    {
+        public string Phone { get; set; }
+        public DateTime? Start { get; set; }
+        public DateTime? End { get; set; }
+
+    }
+}

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Models/Filter/FilterRole.cs

@@ -0,0 +1,15 @@
+using CallCenterApi.Interface.Models.Common;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+
+namespace CallCenterApi.Interface.Models.Filter
+{
+    public class FilterRole : ListBase
+    {
+        public string Name { get; set; }
+        public string Code { get; set; }
+
+    }
+}

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Models/Input/BanCallOutInput.cs

@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+
+namespace CallCenterApi.Interface.Models.Input
+{
+    public class BanCallOutInput
+    {
+        public string Phone { get; set; }
+
+    }
+}

CallCenterApi/CallCenterApi.Model/CallCenterApi.Model.csproj

@@ -56,6 +56,7 @@
     <Compile Include="T_Ask_Question.cs" />
     <Compile Include="T_Ask_QuestionCategory.cs" />
     <Compile Include="T_Ask_QuestionItems.cs" />
+    <Compile Include="T_Call_BanCallOut.cs" />
     <Compile Include="T_Call_Blacklist.cs" />
     <Compile Include="T_Call_CallRecords.cs" />
     <Compile Include="T_Call_CallRecordsLD.cs" />

CallCenterApi/CallCenterApi.Model/T_Call_BanCallOut.cs

@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace CallCenterApi.Model
+{
+    public class T_Call_BanCallOut
+    {
+        public int Id { get; set; }
+        public string F_Phone { get; set; }
+        public DateTime? F_SetTime { get; set; }
+    }
+}