Merge branch 'master' of http://192.168.1.222:3000/yuqian/ZYKJ_API

CallCenterApi/CallCenterApi.BLL/T_Call_BanCallOut.cs

@@ -28,6 +28,7 @@ namespace CallCenterApi.BLL
                     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_SetTime"].ToString());
                     model.F_Remark = dt.Rows[n]["F_Remark"] == DBNull.Value ? "" : dt.Rows[n]["F_Remark"].ToString();
+                    model.F_UserId = dt.Rows[n]["F_UserId"] == DBNull.Value ? (int?)null : Convert.ToInt32(dt.Rows[n]["F_UserId"]);
                     modelList.Add(model);
                 }
             }

CallCenterApi/CallCenterApi.DAL/T_Call_BanCallOut.cs

@@ -13,10 +13,11 @@ namespace CallCenterApi.DAL
     {
         public int Add(Model.T_Call_BanCallOut model)
         {
-            var sql = "insert into T_Call_BanCallOut (F_Phone,F_Remark) values (@F_Phone,@F_Remark)";
+            var sql = "insert into T_Call_BanCallOut (F_Phone,F_Remark,F_UserId) values (@F_Phone,@F_Remark,@F_UserId)";
             return DbHelperSQL.ExecuteSql(sql, new SqlParameter[] {
                 new SqlParameter("@F_Phone", model.F_Phone),
-                new SqlParameter("@F_Remark", model.F_Remark)
+                new SqlParameter("@F_Remark", model.F_Remark),
+                new SqlParameter("@F_UserId", model.F_UserId)
             });
         }
 
@@ -29,7 +30,7 @@ namespace CallCenterApi.DAL
         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,F_Remark from T_Call_BanCallOut WHERE F_Phone=@F_Phone";
+            var sql = "select F_Id,F_Phone,F_SetTime,F_Remark,F_UserId from T_Call_BanCallOut WHERE F_Phone=@F_Phone";
             var dt = DbHelperSQL.Query(sql, new SqlParameter("@F_Phone", phone)).Tables[0];
             if (dt.Rows.Count > 0)
             {
@@ -37,6 +38,7 @@ namespace CallCenterApi.DAL
                 model.F_Phone = dt.Rows[0]["F_Phone"] == DBNull.Value ? "" : dt.Rows[0]["F_Phone"].ToString();
                 model.F_SetTime = dt.Rows[0]["F_SetTime"] == DBNull.Value ? null : (DateTime?)Convert.ToDateTime(dt.Rows[0]["F_SetTime"].ToString());
                 model.F_Remark = dt.Rows[0]["F_Remark"] == DBNull.Value ? "" : dt.Rows[0]["F_Remark"].ToString();
+                model.F_UserId = dt.Rows[0]["F_UserId"] == DBNull.Value ? (int?)null : Convert.ToInt32(dt.Rows[0]["F_UserId"]);
                 return model;
             }
             return null;

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

@@ -1,4 +1,5 @@
 using CallCenter.Utility;
+using CallCenterApi.DB;
 using CallCenterApi.Interface.Controllers.Base;
 using CallCenterApi.Interface.Models.Filter;
 using CallCenterApi.Interface.Models.Input;
@@ -16,7 +17,7 @@ namespace CallCenterApi.Interface.Controllers.callout
         private readonly BLL.T_Call_BanCallOut banCallOutBLL = new BLL.T_Call_BanCallOut();
         private readonly BLL.T_Sys_BanCallOutTime banCallOutTimeBLL = new BLL.T_Sys_BanCallOutTime();
         private readonly BLL.T_Sys_BanCallOut sysBanCallOutBLL = new BLL.T_Sys_BanCallOut();
-
+        private readonly BLL.T_Sys_UserAccount userAccountBLL = new BLL.T_Sys_UserAccount();
         #region 禁止外呼号码管理
         public ActionResult GetList(FilterBanCallOut filter)
         {
@@ -41,18 +42,54 @@ namespace CallCenterApi.Interface.Controllers.callout
                              true,
                              out recordCount);
             List<Model.T_Call_BanCallOut> modelList = new BLL.T_Call_BanCallOut().DataTableToList(dt);
+            var userList = userAccountBLL.DataTableToList1(userAccountBLL.GetList("").Tables[0]);
             var obj = new
             {
-                rows = modelList,
+                rows = modelList.Select(x => new
+                {
+                    id = x.Id,
+                    phone = x.F_Phone,
+                    settime = x.F_SetTime,
+                    remark = x.F_Remark,
+                    username = userList.SingleOrDefault(m => m.F_UserId == x.F_UserId)?.F_UserName ?? "系统管理"
+                }),
                 total = recordCount
             };
             return Content(obj.ToJson());
         }
 
+        public ActionResult Export()
+        {
+            var rows = new BLL.T_Call_BanCallOut().DataTableToList(DbHelperSQL.Query("SELECT F_Id,F_Phone,F_SetTime,F_Remark,F_UserId FROM T_Call_BanCallOut").Tables[0]);
+            var userList = userAccountBLL.DataTableToList1(userAccountBLL.GetList("").Tables[0]);
+            List<List<string>> list = new List<List<string>>();
+            foreach (var item in rows)
+            {
+                List<string> listItem = new List<string>();
+                list.Add(new List<string>()
+                    {
+                          item.F_Phone.ToString(),
+                          item.F_SetTime.ToString(),
+                          item.F_Remark.ToString(),
+                          userList.SingleOrDefault(m => m.F_UserId == item.F_UserId)?.F_UserName ?? "系统管理"
+                    });
+            }
+
+            NPOIHelper npoi = new NPOIHelper();
+            var res = npoi.ExportToExcel($"限制号码_{DateTime.Now.ToString("yyyyMMddHHmmss")}", list, new string[] { "号码", "添加时间", "备注", "添加人" });
+            return !string.IsNullOrWhiteSpace(res) ? Error(res) : Success("导出成功");
+        }
+
         public ActionResult Add(BanCallOutInput input)
         {
             if (string.IsNullOrWhiteSpace(input.Phone))
                 return Error("号码不可为空");
+            input.Phone = input.Phone.Trim();
+            string phone = RequestString.ToDBC(RequestString.RemoveNotNumber(WebHelper.NoHtml(input.Phone)));
+            if (phone.Length != input.Phone.Length)
+                return Error("号码格式不正确");
+            if (string.IsNullOrWhiteSpace(input.Remark))
+                return Error("备注不可以为空");
             var model = banCallOutBLL.GetModel(input.Phone);
             if (model != null)
                 return Error("该号码已被限制外呼");

CallCenterApi/CallCenterApi.Model/T_Call_BanCallOut.cs

@@ -12,5 +12,7 @@ namespace CallCenterApi.Model
         public string F_Phone { get; set; }
         public DateTime? F_SetTime { get; set; }
         public string F_Remark { get; set; }
+        public int? F_UserId { get; set; }
+
     }
 }