呼叫转移，设置时间段接口

自定义字段接口调整

CallCenterApi/CallCenterApi.BLL/CallCenterApi.BLL.csproj

@@ -90,6 +90,7 @@
     <Compile Include="T_SMS_SendSMSTask.cs" />
     <Compile Include="T_SMS_SentSMS.cs" />
     <Compile Include="T_SMS_Template.cs" />
+    <Compile Include="T_Sys_BanCallOut.cs" />
     <Compile Include="T_Sys_BanCallOutTime.cs" />
     <Compile Include="T_Sys_Department.cs" />
     <Compile Include="T_Sys_DictionaryBase.cs" />

CallCenterApi/CallCenterApi.BLL/T_Call_BanCallOut.cs

@@ -44,7 +44,7 @@ namespace CallCenterApi.BLL
             return dal.Add(model);
         }
 
-        public int deleteBatch(string ids)
+        public int DeleteBatch(string ids)
         {
             return dal.DeleteBatch(ids);
         }

CallCenterApi/CallCenterApi.BLL/T_Sys_BanCallOut.cs

@@ -0,0 +1,29 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace CallCenterApi.BLL
+{
+    public class T_Sys_BanCallOut
+    {
+        private readonly DAL.T_Sys_BanCallOut dal = new DAL.T_Sys_BanCallOut();
+
+        public bool Add(Model.T_Sys_BanCallOut model)
+        {
+            return dal.Add(model);
+        }
+
+        public bool Update(Model.T_Sys_BanCallOut model)
+        {
+            return dal.Update(model);
+        }
+
+        public Model.T_Sys_BanCallOut GetModel(int deptId)
+        {
+            return dal.GetModel(deptId);
+
+        }
+    }
+}

CallCenterApi/CallCenterApi.DAL/CallCenterApi.DAL.csproj

@@ -90,6 +90,7 @@
     <Compile Include="T_SMS_SendSMSTask.cs" />
     <Compile Include="T_SMS_SentSMS.cs" />
     <Compile Include="T_SMS_Template.cs" />
+    <Compile Include="T_Sys_BanCallOut.cs" />
     <Compile Include="T_Sys_BanCallOutTime.cs" />
     <Compile Include="T_Sys_Department.cs" />
     <Compile Include="T_Sys_DictionaryBase.cs" />

CallCenterApi/CallCenterApi.DAL/T_Cus_CustomerField.cs

@@ -79,7 +79,7 @@ namespace CallCenterApi.DAL
         }
         public int Add(Model.T_Cus_CustomerField model)
         {
-            string sql = "insert into T_Cus_CustomerField (F_FieldType,F_FieldId,F_Name,F_DBTypeName,F_DBFieldName) value (@F_FieldType,@F_FieldId,@F_Name,@F_DBTypeName,@F_DBFieldName)";
+            string sql = "insert into T_Cus_CustomerField (F_FieldType,F_FieldId,F_Name,F_DBTypeName,F_DBFieldName) values (@F_FieldType,@F_FieldId,@F_Name,@F_DBTypeName,@F_DBFieldName)";
             return DbHelperSQL.ExecuteSql(sql, new SqlParameter[] {
                 new SqlParameter("@F_FieldType",model.F_FieldType),
                 new SqlParameter("@F_FieldId",model.F_FieldId),

CallCenterApi/CallCenterApi.DAL/T_Sys_BanCallOut.cs

@@ -0,0 +1,54 @@
+using CallCenterApi.DB;
+using System;
+using System.Collections.Generic;
+using System.Data.SqlClient;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace CallCenterApi.DAL
+{
+    public class T_Sys_BanCallOut
+    {
+        public bool Add(Model.T_Sys_BanCallOut model)
+        {
+            var sql = "insert into T_Sys_BanCallOut (F_DeptId,StartTime1,StartTime2,EndTime1,EndTime2) values (@F_DeptId,@StartTime1,@StartTime2,@EndTime1,@EndTime2)";
+            return DbHelperSQL.ExecuteSql(sql, new SqlParameter[] {
+               new SqlParameter("@F_DeptId", model.F_DeptId),
+               new SqlParameter("@StartTime1", model.StartTime1),
+               new SqlParameter("@EndTime1", model.EndTime1),
+               new SqlParameter("@StartTime2", model.StartTime2),
+               new SqlParameter("@EndTime2", model.EndTime2)
+            }) > 0;
+        }
+        public bool Update(Model.T_Sys_BanCallOut model)
+        {
+            var sql = "update T_Sys_BanCallOut set StartTime1=@StartTime1,EndTime1=@EndTime1,StartTime2=@StartTime2,EndTime=@EndTime2 where F_Id=@F_Id ";
+            return DbHelperSQL.ExecuteSql(sql, new SqlParameter[] {
+               new SqlParameter("@F_Id", model.F_Id),
+               new SqlParameter("@StartTime1", model.StartTime1),
+               new SqlParameter("@EndTime1", model.EndTime1),
+               new SqlParameter("@StartTime2", model.StartTime2),
+               new SqlParameter("@EndTime2", model.EndTime2)
+            }) > 0;
+        }
+        public Model.T_Sys_BanCallOut GetModel(int deptId)
+        {
+            Model.T_Sys_BanCallOut model = new Model.T_Sys_BanCallOut();
+            var sql = "select F_Id,F_DeptId,StartTime1,StartTime2,EndTime1,EndTime2	from T_Sys_BanCallOut where F_DeptId ";
+            var dt = DbHelperSQL.Query(sql, new SqlParameter("@F_DeptId", deptId)).Tables[0];
+            if (dt.Rows.Count > 0)
+            {
+                model.F_Id = dt.Rows[0]["F_Id"] == DBNull.Value ? 0 : Convert.ToInt32(dt.Rows[0]["F_Id"]);
+                model.F_DeptId = dt.Rows[0]["F_DeptId"] == DBNull.Value ? 0 : Convert.ToInt32(dt.Rows[0]["F_DeptId"].ToString());
+                model.StartTime1 = dt.Rows[0]["StartTime1"] == DBNull.Value ? null : (DateTime?)DateTime.Parse(dt.Rows[0]["StartTime1"].ToString());
+                model.StartTime2 = dt.Rows[0]["StartTime2"] == DBNull.Value ? null : (DateTime?)DateTime.Parse(dt.Rows[0]["StartTime2"].ToString());
+                model.EndTime1 = dt.Rows[0]["EndTime1"] == DBNull.Value ? null : (DateTime?)DateTime.Parse(dt.Rows[0]["EndTime1"].ToString());
+                model.EndTime2 = dt.Rows[0]["EndTime2"] == DBNull.Value ? null : (DateTime?)DateTime.Parse(dt.Rows[0]["EndTime2"].ToString());
+                return model;
+            }
+            return null;
+
+        }
+    }
+}

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

@@ -331,6 +331,7 @@
     <Compile Include="Models\Input\RegionCategoryInput.cs" />
     <Compile Include="Models\Input\RoleInput.cs" />
     <Compile Include="Models\Input\SeatGroupInput.cs" />
+    <Compile Include="Models\Input\SysBanCallOutInput.cs" />
     <Compile Include="Models\Input\SysConfigInput.cs" />
     <Compile Include="Models\Input\UserAccountInput.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />

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

@@ -70,7 +70,7 @@ namespace CallCenterApi.Interface.Controllers.callout
             if (ids == null || ids.Length <= 0)
                 return Error("请选择需要删除的项");
             var idsStr = string.Join(",", ids);
-            banCallOutBLL.deleteBatch(idsStr);
+            banCallOutBLL.DeleteBatch(idsStr);
             return Success("删除成功");
         }
         #endregion
@@ -128,7 +128,7 @@ namespace CallCenterApi.Interface.Controllers.callout
             if (ids == null || ids.Length <= 0)
                 return Error("请选择需要删除的项");
             var idsStr = string.Join(",", ids);
-            banCallOutBLL.deleteBatch(idsStr);
+            banCallOutBLL.DeleteBatch(idsStr);
             return Success("删除成功");
         }
         #endregion

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/callout/CallOutLimitController.cs

@@ -1,4 +1,6 @@
-using System;
+using CallCenterApi.Interface.Controllers.Base;
+using CallCenterApi.Interface.Models.Input;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Web;
@@ -6,12 +8,50 @@ using System.Web.Mvc;
 
 namespace CallCenterApi.Interface.Controllers.callout
 {
-    public class CallOutLimitController : Controller
+    public class CallOutLimitController : BaseController
     {
-        // GET: CallOutLimit
-        public ActionResult Index()
+        private readonly BLL.T_Sys_BanCallOut banCallOutBLL = new BLL.T_Sys_BanCallOut();
+        public ActionResult GetModel()
         {
-            return View();
+            var deptId = CurrentUser.UserData.F_DeptId;
+            var model = banCallOutBLL.GetModel(deptId);
+            return Success("获取成功", new
+            {
+                id = model?.F_Id ?? 0,
+                deptid = model?.F_DeptId ?? 0,
+                starttime1 = model?.StartTime1.Value.ToString("yyyy-MM-dd HH:mm:ss ") ?? "",
+                starttime2 = model?.StartTime2.Value.ToString("yyyy-MM-dd HH:mm:ss ") ?? "",
+                endtime1 = model?.EndTime1.Value.ToString("yyyy-MM-dd HH:mm:ss ") ?? "",
+                endtime2 = model?.EndTime2.Value.ToString("yyyy-MM-dd HH:mm:ss ") ?? "",
+            });
+        }
+
+        public ActionResult CreateOrUpdate(SysBanCallOutInput input)
+        {
+            Model.T_Sys_BanCallOut model = banCallOutBLL.GetModel(CurrentUser.UserData.F_DeptId);
+            if (input.F_Id <= 0)
+            {
+                if (model != null)
+                    return Error("已经存在该条数据");
+                model.F_DeptId = CurrentUser.UserData.F_DeptId;
+                model.StartTime1 = input.StartTime1;
+                model.EndTime1 = input.EndTime1;
+                model.StartTime2 = input.StartTime2;
+                model.EndTime2 = input.EndTime2;
+                if (banCallOutBLL.Add(model))
+                    return Success("添加成功");
+                return Error("添加失败");
+            }
+
+            if (model == null)
+                return Error("该条数据不存在");
+            model.StartTime1 = input.StartTime1;
+            model.EndTime1 = input.EndTime1;
+            model.StartTime2 = input.StartTime2;
+            model.EndTime2 = input.EndTime2;
+            if (banCallOutBLL.Update(model))
+                return Success("修改成功");
+            return Error("修改失败");
         }
     }
 }

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/customer/CustomerFieldController.cs

@@ -57,7 +57,9 @@ namespace CallCenterApi.Interface.Controllers.customer
             if (input.Id <= 0 && input.AttributeId > 0)
             {
                 attrModel = entityAttrBLL.GetModel(input.AttributeId);
-                model.F_FieldId = 1;
+                if (attrModel == null)
+                    return Error("该条记录不存在");
+                model.F_FieldId = attrModel.F_AttributeId;
                 model.F_FieldType = attrModel.F_EntityId;
                 model.F_Name = attrModel.F_Name;
                 model.F_DBFieldName = attrModel.F_DBFieldlName;
@@ -73,13 +75,12 @@ namespace CallCenterApi.Interface.Controllers.customer
                 if (model == null)
                     return Error("该条记录不存在");
                 model.F_Name = string.IsNullOrWhiteSpace(input.Name) ? model.F_Name : input.Name;
-                model.F_Sort = input.Sort > 0 ? input.Sort : model.F_Sort;
-                model.F_CharLength = input.CharLength > 0 ? input.CharLength : model.F_CharLength;
-                model.F_IsNecessary = input.IsNecessary > 0 ? input.IsNecessary : model.F_IsNecessary;
-                model.F_IsExportOrInput = input.IsExportOrInput > 0 ? input.IsExportOrInput : model.F_IsExportOrInput;
-                model.F_IsShowOnList = input.IsShowOnList > 0 ? input.IsShowOnList : model.F_IsShowOnList;
-                model.F_IsShowOnScrean = input.IsShowOnScrean > 0 ? input.IsShowOnScrean : model.F_IsShowOnScrean;
-                model.F_Search = input.Search > 0 ? input.Search : model.F_Search;
+                model.F_Sort = input.Sort != model.F_Sort ? input.Sort : model.F_Sort;
+                model.F_IsNecessary = input.IsNecessary != model.F_IsNecessary ? input.IsNecessary : model.F_IsNecessary;
+                model.F_IsExportOrInput = input.IsExportOrInput != model.F_IsExportOrInput ? input.IsExportOrInput : model.F_IsExportOrInput;
+                model.F_IsShowOnList = input.IsShowOnList != model.F_IsShowOnList ? input.IsShowOnList : model.F_IsShowOnList;
+                model.F_IsShowOnScrean = input.IsShowOnScrean != model.F_IsShowOnScrean ? input.IsShowOnScrean : model.F_IsShowOnScrean;
+                model.F_Search = input.Search != model.F_Search ? input.Search : model.F_Search;
 
 
                 if (customerFieldBLL.Update(model))

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Models/Input/SysBanCallOutInput.cs

@@ -0,0 +1,17 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+
+namespace CallCenterApi.Interface.Models.Input
+{
+    public class SysBanCallOutInput
+    {
+        public int F_Id { get; set; } = 0;
+        public int F_DeptId { get; set; } = 0;
+        public DateTime? StartTime1 { get; set; }
+        public DateTime? EndTime1 { get; set; }
+        public DateTime? StartTime2 { get; set; }
+        public DateTime? EndTime2 { get; set; }
+    }
+}

CallCenterApi/CallCenterApi.Model/CallCenterApi.Model.csproj

@@ -96,6 +96,7 @@
     <Compile Include="T_SMS_SendSMSTask.cs" />
     <Compile Include="T_SMS_SentSMS.cs" />
     <Compile Include="T_SMS_Template.cs" />
+    <Compile Include="T_Sys_BanCallOut.cs" />
     <Compile Include="T_Sys_BanCallOutTime.cs" />
     <Compile Include="T_Sys_Department.cs" />
     <Compile Include="T_Sys_DictionaryBase.cs" />

CallCenterApi/CallCenterApi.Model/T_Sys_BanCallOut.cs

@@ -0,0 +1,19 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace CallCenterApi.Model
+{
+    public class T_Sys_BanCallOut
+    {
+        public int F_Id { get; set; }
+        public int F_DeptId { get; set; }
+        public DateTime? StartTime1 { get; set; }
+        public DateTime? EndTime1 { get; set; }
+        public DateTime? StartTime2 { get; set; }
+        public DateTime? EndTime2 { get; set; }
+
+    }
+}