提交代码

.gitignore

@@ -633,3 +633,19 @@ CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/ExcelData/20171117
 CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/ExcelData/20171117141653_导入模板 (3).xlsx
 CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/ExcelData/20171117141752_导入模板 (3).xlsx
 CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/ExcelData/20171117141900_导入模板 (3).xlsx
+/.vs
+/CallCenterApi/CallCenterApi.BLL/obj
+/CallCenterApi/CallCenterApi.Cache/obj
+/CallCenterApi/CallCenterApi.Common/obj
+/CallCenterApi/CallCenterApi.DAL/obj
+/CallCenterApi/CallCenterApi.DB/obj
+/CallCenterCommon/CallCenter.Utility/obj/Release
+/CallCenterCommon/CallCenter.Utility/obj/Debug
+/CallCenterCommon/CallCenter.QuartzService/obj/Release
+/CallCenterCommon/CallCenter.QuartzService/obj/Debug
+/CallCenterApi/CallCenterAPI.WechatSDK/obj/Release
+/CallCenterApi/CallCenterAPI.WechatSDK/obj/Debug
+/CallCenterApi/CallCenterApi.Model/obj
+/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/ExcelData
+/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/obj
+/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/bin

CallCenterApi/CallCenterApi.BLL/T_Cus_CustomerField.cs

@@ -33,7 +33,7 @@ namespace CallCenterApi.BLL
                         F_IsShowOnList = row["F_IsShowOnList"] == DBNull.Value ? 0 : Convert.ToInt32(row["F_IsShowOnList"]),
                         F_IsShowOnScrean = row["F_IsShowOnScrean"] == DBNull.Value ? 0 : Convert.ToInt32(row["F_IsShowOnScrean"]),
                         F_Search = row["F_Search"] == DBNull.Value ? 0 : Convert.ToInt32(row["F_Search"]),
-
+                        F_IsEdit = row["F_IsEdit"] == DBNull.Value ? 0 : Convert.ToInt32(row["F_IsEdit"])
 
                     });
 

CallCenterApi/CallCenterApi.DAL/T_Cus_CustomerField.cs

@@ -14,7 +14,7 @@ namespace CallCenterApi.DAL
     {
         public Model.T_Cus_CustomerField GetModel(int id)
         {
-            string sql = "select top 1 F_Id,F_FieldType,F_FieldId,F_Name,F_DBTypeName,F_DBFieldName,F_Sort,F_CharLength,F_IsNecessary,F_IsExportOrInput,F_IsShowOnList,F_IsShowOnScrean,F_Search from T_Cus_CustomerField where F_Id=@F_Id ";
+            string sql = "select top 1 F_Id,F_FieldType,F_FieldId,F_Name,F_DBTypeName,F_DBFieldName,F_Sort,F_CharLength,F_IsNecessary,F_IsExportOrInput,F_IsShowOnList,F_IsShowOnScrean,F_Search,F_IsEdit from T_Cus_CustomerField where F_Id=@F_Id ";
             var dt = DbHelperSQL.Query(sql, new SqlParameter("@F_Id", id)).Tables[0];
             Model.T_Cus_CustomerField model = null;
             if (dt.Rows.Count > 0)
@@ -35,6 +35,7 @@ namespace CallCenterApi.DAL
                     F_IsShowOnList = row["F_IsShowOnList"] == DBNull.Value ? 0 : Convert.ToInt32(row["F_IsShowOnList"]),
                     F_IsShowOnScrean = row["F_IsShowOnScrean"] == DBNull.Value ? 0 : Convert.ToInt32(row["F_IsShowOnScrean"]),
                     F_Search = row["F_Search"] == DBNull.Value ? 0 : Convert.ToInt32(row["F_Search"]),
+                    F_IsEdit = row["F_IsEdit"] == DBNull.Value ? 0 : Convert.ToInt32(row["F_IsEdit"])
                 };
             }
             return model;
@@ -42,7 +43,7 @@ namespace CallCenterApi.DAL
 
         public bool Update(Model.T_Cus_CustomerField model)
         {
-            string sql = "update T_Cus_CustomerField set F_FieldType=@F_FieldType,F_FieldId=@F_FieldId,F_Name=@F_Name,F_DBTypeName=@F_DBTypeName,F_DBFieldName=@F_DBFieldName,F_Sort=@F_Sort,F_CharLength=@F_CharLength,F_IsNecessary=@F_IsNecessary,F_IsExportOrInput=@F_IsExportOrInput,F_IsShowOnList=@F_IsShowOnList,F_IsShowOnScrean=@F_IsShowOnScrean,F_Search=@F_Search where F_Id=@F_Id";
+            string sql = "update T_Cus_CustomerField set F_FieldType=@F_FieldType,F_FieldId=@F_FieldId,F_Name=@F_Name,F_DBTypeName=@F_DBTypeName,F_DBFieldName=@F_DBFieldName,F_Sort=@F_Sort,F_CharLength=@F_CharLength,F_IsNecessary=@F_IsNecessary,F_IsExportOrInput=@F_IsExportOrInput,F_IsShowOnList=@F_IsShowOnList,F_IsShowOnScrean=@F_IsShowOnScrean,F_Search=@F_Search,F_IsEdit=@F_IsEdit where F_Id=@F_Id";
             return DbHelperSQL.ExecuteSql(sql, new SqlParameter[] {
                 new SqlParameter("@F_Id",model.F_Id),
                 new SqlParameter("@F_FieldType",model.F_FieldType),
@@ -56,13 +57,14 @@ namespace CallCenterApi.DAL
                 new SqlParameter("@F_IsExportOrInput",model.F_IsExportOrInput),
                 new SqlParameter("@F_IsShowOnList",model.F_IsShowOnList),
                 new SqlParameter("@F_IsShowOnScrean",model.F_IsShowOnScrean),
-                new SqlParameter("@F_Search",model.F_Search)
+                new SqlParameter("@F_Search",model.F_Search),
+                new SqlParameter("@F_IsEdit",model.F_IsEdit),
             }) > 0;
         }
 
         public DataTable GetList()
         {
-            string sql = "select F_Id,F_FieldType,F_FieldId,F_Name,F_DBTypeName,F_DBFieldName,F_Sort,F_CharLength,F_IsNecessary,F_IsExportOrInput,F_IsShowOnList,F_IsShowOnScrean,F_Search from T_Cus_CustomerField";
+            string sql = "select F_Id,F_FieldType,F_FieldId,F_Name,F_DBTypeName,F_DBFieldName,F_Sort,F_CharLength,F_IsNecessary,F_IsExportOrInput,F_IsShowOnList,F_IsShowOnScrean,F_Search,F_IsEdit from T_Cus_CustomerField";
             return DbHelperSQL.Query(sql).Tables[0];
         }
 
@@ -79,7 +81,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,F_Sort) values (@F_FieldType,@F_FieldId,@F_Name,@F_DBTypeName,@F_DBFieldName,@F_Sort)";
+            string sql = "insert into T_Cus_CustomerField (F_FieldType,F_FieldId,F_Name,F_DBTypeName,F_DBFieldName,F_Sort,F_IsEdit) values (@F_FieldType,@F_FieldId,@F_Name,@F_DBTypeName,@F_DBFieldName,@F_Sort,@F_IsEdit)";
             return DbHelperSQL.ExecuteSql(sql, new SqlParameter[] {
                 new SqlParameter("@F_FieldType",model.F_FieldType),
                 new SqlParameter("@F_FieldId",model.F_FieldId),
@@ -87,6 +89,7 @@ namespace CallCenterApi.DAL
                 new SqlParameter("@F_DBTypeName",model.F_DBTypeName),
                 new SqlParameter("@F_DBFieldName",model.F_DBFieldName),
                 new SqlParameter("@F_Sort",model.F_Sort),
+                new SqlParameter("@F_IsEdit",model.F_IsEdit),
            });
 
         }

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

@@ -10,6 +10,7 @@
     <WebStackScaffolding_IsAsyncSelected>False</WebStackScaffolding_IsAsyncSelected>
     <NameOfLastUsedPublishProfile>MY</NameOfLastUsedPublishProfile>
     <ProjectView>ShowAllFiles</ProjectView>
+    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
   </PropertyGroup>
   <ProjectExtensions>
     <VisualStudio>

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

@@ -1,4 +1,5 @@
 using CallCenter.Utility;
+using CallCenterApi.DB;
 using CallCenterApi.Interface.Controllers.Base;
 using System;
 using System.Collections.Generic;
@@ -11,6 +12,7 @@ namespace CallCenterApi.Interface.Controllers
     public class CallOutOptController : BaseController
     {
         private readonly BLL.T_Call_BanCallOut banCallOutBLL = new BLL.T_Call_BanCallOut();
+        private readonly BLL.T_Sys_Department deptBLL = new BLL.T_Sys_Department();
         //外呼判断本地外地以及加前缀返回
         public ActionResult GetCallOutprefix(string phone)
         {
@@ -19,6 +21,19 @@ namespace CallCenterApi.Interface.Controllers
             {
                 string phone1 = RequestString.ToDBC(RequestString.RemoveNotNumber(WebHelper.NoHtml(phone)));
 
+                #region //判断社会渠道人员是否可以进行外呼
+                var dt = new BLL.T_Sys_SystemConfig().GetList(" F_ParamCode='CanSheHuiCallOut' AND F_State=0 ").Tables[0];
+                if (dt != null && dt.Rows.Count > 0 && dt.Rows[0]["F_ParamValue"] != DBNull.Value && dt.Rows[0]["F_ParamValue"].ToString() == "0")
+                {
+                    var deptList = deptBLL.DataTableToListForLevel(DbHelperSQL.Query("select F_DeptId,F_DeptName,F_ParentId,F_DeptCode,F_Layer,0 lvl from T_Sys_Department").Tables[0]);
+                    var deptIdList = deptList.Where(x => x.DeptName.Contains("社会")).Select(x => x.DeptId).ToList();
+                    if (deptIdList.Contains(CurrentUser.UserData.F_DeptId))
+                        return Error("社会渠道人员禁止进行外呼");
+                }
+
+                #endregion
+
+
                 #region  //判断外呼号码是否存在于【禁止外呼表】,如果存在，不可进行外呼
                 if (banCallOutBLL.GetModel(phone1) != null)
                     return Error("该号码已被列为禁止外呼号码");

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

@@ -23,6 +23,7 @@ namespace CallCenterApi.Interface.Controllers.callout
         /// <returns></returns>
         public ActionResult GetList(FilterExcelTmp filter)
         {
+
             string sql = " and F_DBTableName='T_Call_PageField' ";
             if (filter.TempId > 0)
             {

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/customer/CustomerController.cs

@@ -66,6 +66,16 @@ namespace CallCenterApi.Interface.Controllers.customer
             //需要搜索的自定义列
             var searchFieldList = columnList.Where(x => x.F_Search > 0).ToList();
 
+            #region 搜索条件
+            if (!string.IsNullOrWhiteSpace(filter.F_PhoneNum1))
+            {
+
+            }
+
+            #endregion
+
+
+
             //List<string> sqlList = new List<string>();
             //if (!string.IsNullOrWhiteSpace(filter.Fields) && !string.IsNullOrWhiteSpace(filter.FieldValues))
             //{
@@ -210,13 +220,21 @@ namespace CallCenterApi.Interface.Controllers.customer
             Model.T_Cus_CustomerBase model = new Model.T_Cus_CustomerBase();
             Model.T_Cus_CustomerExpand expand = new Model.T_Cus_CustomerExpand();
             BLL.T_Cus_CustomerBase bll = new BLL.T_Cus_CustomerBase();
+
+            var columnList = customerFieldBLL.GetList()
+              .Where(x => x.F_IsEdit > 0 && x.F_IsNecessary > 0).ToList();
+
+
+
+
+
             if (string.IsNullOrWhiteSpace(input.Id))
             {
                 model.F_Name = input.F_Name;
                 model.F_Address = input.F_Address;
-                model.F_CusType = input.F_CusType;
-                model.F_YHFKId = input.F_YHFKId;
-                model.F_YHFKName = input.F_YHFKName;
+                //model.F_CusType = input.F_CusType;
+                //model.F_YHFKId = input.F_YHFKId;
+                //model.F_YHFKName = input.F_YHFKName;
                 model.F_Remark = input.F_Remark;
                 model.F_PhoneNum1 = input.F_PhoneNum1;
                 model.F_PhoneNum2 = input.F_PhoneNum2;
@@ -282,9 +300,9 @@ namespace CallCenterApi.Interface.Controllers.customer
                 return Error("修改失败，该客户信息不存在");
             model.F_Name = input.F_Name;
             model.F_Address = input.F_Address;
-            model.F_CusType = input.F_CusType;
-            model.F_YHFKId = input.F_YHFKId;
-            model.F_YHFKName = input.F_YHFKName;
+            //model.F_CusType = input.F_CusType;
+            //model.F_YHFKId = input.F_YHFKId;
+            //model.F_YHFKName = input.F_YHFKName;
             model.F_Remark = input.F_Remark;
             model.F_PhoneNum1 = input.F_PhoneNum1;
             model.F_PhoneNum2 = input.F_PhoneNum2;
@@ -369,7 +387,7 @@ namespace CallCenterApi.Interface.Controllers.customer
         {
             //系统列+自定义列 实体
             var columnList = customerFieldBLL.GetList()
-                .Where(x => (x.F_FieldType == 0 && x.F_IsNecessary > 0) || (x.F_FieldType == 1 && x.F_IsShowOnScrean > 0))
+                .Where(x => x.F_IsEdit > 0)
                 .OrderBy(x => x.F_FieldType).ThenBy(x => x.F_Sort).ToList();
             //系统列+自定义列 字符串
             var headList = columnList.Select(x => x.F_Name).ToList();
@@ -381,5 +399,7 @@ namespace CallCenterApi.Interface.Controllers.customer
                 headlist = headList,
             });
         }
+
+
     }
 }

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Models/Input/CustomerInput.cs

@@ -12,10 +12,7 @@ namespace CallCenterApi.Interface.Models.Input
         public string F_PhoneNum1 { get; set; } = "";
         public string F_PhoneNum2 { get; set; } = "";
         public string F_Address { get; set; } = "";
-        public int? F_CusType { get; set; } = 0;
         public string F_Remark { get; set; } = "";
-        public int? F_YHFKId { get; set; } = 0;
-        public string F_YHFKName { get; set; } = "";
 
         public string F_StrExpand1 { get; set; } = "";
         public string F_StrExpand2 { get; set; } = "";

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Properties/PublishProfiles/MY.pubxml.user

@@ -34,31 +34,31 @@
       <publishTime>10/20/2017 11:39:24</publishTime>
     </File>
     <File Include="bin/CallCenter.Utility.dll">
-      <publishTime>11/03/2017 14:38:54</publishTime>
+      <publishTime>02/27/2018 08:44:53</publishTime>
     </File>
     <File Include="bin/CallCenterApi.BLL.dll">
-      <publishTime>11/03/2017 14:38:55</publishTime>
+      <publishTime>02/27/2018 08:44:58</publishTime>
     </File>
     <File Include="bin/CallCenterApi.Cache.dll">
-      <publishTime>11/03/2017 14:38:54</publishTime>
+      <publishTime>02/27/2018 08:44:53</publishTime>
     </File>
     <File Include="bin/CallCenterApi.Common.dll">
-      <publishTime>11/03/2017 14:38:55</publishTime>
+      <publishTime>02/27/2018 08:44:55</publishTime>
     </File>
     <File Include="bin/CallCenterApi.DAL.dll">
-      <publishTime>11/03/2017 14:38:55</publishTime>
+      <publishTime>02/27/2018 08:44:55</publishTime>
     </File>
     <File Include="bin/CallCenterApi.DB.dll">
-      <publishTime>11/03/2017 14:38:54</publishTime>
+      <publishTime>02/27/2018 08:44:53</publishTime>
     </File>
     <File Include="bin/CallCenterApi.Interface.dll">
-      <publishTime>11/03/2017 17:57:47</publishTime>
+      <publishTime>02/27/2018 08:45:09</publishTime>
     </File>
     <File Include="bin/CallCenterApi.Model.dll">
-      <publishTime>11/03/2017 14:38:54</publishTime>
+      <publishTime>02/27/2018 08:44:53</publishTime>
     </File>
     <File Include="bin/CallCenterAPI.WechatSDK.dll">
-      <publishTime>11/03/2017 14:38:55</publishTime>
+      <publishTime>02/27/2018 08:44:55</publishTime>
     </File>
     <File Include="bin/ICSharpCode.SharpZipLib.dll">
       <publishTime>01/03/2011 14:16:38</publishTime>
@@ -217,7 +217,7 @@
       <publishTime>10/12/2017 11:04:06</publishTime>
     </File>
     <File Include="Web.config">
-      <publishTime>11/03/2017 17:57:50</publishTime>
+      <publishTime>02/27/2018 08:45:17</publishTime>
     </File>
   </ItemGroup>
 </Project>

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

@@ -17,7 +17,8 @@
     <add key="smssign" value="中鑫之宝"/>
   </appSettings>
   <connectionStrings>
-    <add name="ConnectionString" connectionString="Data Source=192.168.4.18;User ID=sa;pwd=800100;Initial Catalog=CallCenter_ZYKJ_Backup20180125;"/>
+    <!--<add name="ConnectionString" connectionString="Data Source=192.168.4.18;User ID=sa;pwd=800100;Initial Catalog=CallCenter_ZYKJ_Backup20180125;"/>-->
+    <add name="ConnectionString" connectionString="Data Source=39.153.161.180;User ID=sa;pwd=hykj800100;Initial Catalog=ZYKJ_Backup_20180226;" />
   </connectionStrings>
   <system.web>
     <compilation debug="true" targetFramework="4.5"/>

CallCenterApi/CallCenterApi.Model/T_Cus_CustomerField.cs

@@ -21,6 +21,8 @@ namespace CallCenterApi.Model
         public int? F_IsShowOnList { get; set; } = 0;
         public int? F_IsShowOnScrean { get; set; } = 0;
         public int? F_Search { get; set; } = 0;
+        public int? F_IsEdit { get; set; }
+
 
     }
 }

ZYKJCallCenter.sln

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.25420.1
+# Visual Studio 15
+VisualStudioVersion = 15.0.27428.2005
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "CallCenterApi", "CallCenterApi", "{2E2CE78D-00E7-45A0-AED8-2FB60B3E8F06}"
 EndProject
@@ -25,8 +25,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CallCenterApi.Model", "Call
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CallCenterAPI.WechatSDK", "CallCenterApi\CallCenterAPI.WechatSDK\CallCenterAPI.WechatSDK.csproj", "{C8841B5E-5072-4B5E-B656-6E06C95A6B47}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CallCenter.QuartzService", "CallCenterCommon\CallCenter.QuartzService\CallCenter.QuartzService.csproj", "{8DE4B8BC-1E88-4530-B129-E79C5119D6FD}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -69,10 +67,6 @@ Global
 		{C8841B5E-5072-4B5E-B656-6E06C95A6B47}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{C8841B5E-5072-4B5E-B656-6E06C95A6B47}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C8841B5E-5072-4B5E-B656-6E06C95A6B47}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8DE4B8BC-1E88-4530-B129-E79C5119D6FD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8DE4B8BC-1E88-4530-B129-E79C5119D6FD}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8DE4B8BC-1E88-4530-B129-E79C5119D6FD}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8DE4B8BC-1E88-4530-B129-E79C5119D6FD}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -87,6 +81,8 @@ Global
 		{DA95EF28-21F5-4627-A448-9BA88AC3E570} = {2E2CE78D-00E7-45A0-AED8-2FB60B3E8F06}
 		{03AC6599-FFC1-43DB-8794-F42B9BF74EF5} = {2E2CE78D-00E7-45A0-AED8-2FB60B3E8F06}
 		{C8841B5E-5072-4B5E-B656-6E06C95A6B47} = {2E2CE78D-00E7-45A0-AED8-2FB60B3E8F06}
-		{8DE4B8BC-1E88-4530-B129-E79C5119D6FD} = {0AA6CF16-D74D-4FD4-A921-F9A4D8E74E59}
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {8494A730-498F-42E2-BB9F-E5C88130D4D1}
 	EndGlobalSection
 EndGlobal