自定义字段

客户管理自定义字段
来电弹屏自定义字段

CallCenterApi/CallCenterApi.BLL/T_Cus_CustomerField.cs

@@ -26,7 +26,7 @@ namespace CallCenterApi.BLL
                         F_Name = row["F_Name"].ToString(),
                         F_DBTypeName = row["F_DBTypeName"].ToString(),
                         F_DBFieldName = row["F_DBFieldName"].ToString(),
-                        F_Sort = row["F_Sort"] == DBNull.Value ? 0 : Convert.ToInt32(row["F_Sort"]),
+                        F_Sort = row["F_Sort"] == DBNull.Value ? (int?)null : Convert.ToInt32(row["F_Sort"]),
                         F_CharLength = row["F_CharLength"] == DBNull.Value ? 0 : Convert.ToInt32(row["F_CharLength"]),
                         F_IsNecessary = row["F_IsNecessary"] == DBNull.Value ? 0 : Convert.ToInt32(row["F_IsNecessary"]),
                         F_IsExportOrInput = row["F_IsExportOrInput"] == DBNull.Value ? 0 : Convert.ToInt32(row["F_IsExportOrInput"]),

CallCenterApi/CallCenterApi.DAL/T_Cus_CustomerField.cs

@@ -79,13 +79,14 @@ 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) values (@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,F_Sort) values (@F_FieldType,@F_FieldId,@F_Name,@F_DBTypeName,@F_DBFieldName,@F_Sort)";
             return DbHelperSQL.ExecuteSql(sql, new SqlParameter[] {
                 new SqlParameter("@F_FieldType",model.F_FieldType),
                 new SqlParameter("@F_FieldId",model.F_FieldId),
                 new SqlParameter("@F_Name",model.F_Name),
                 new SqlParameter("@F_DBTypeName",model.F_DBTypeName),
                 new SqlParameter("@F_DBFieldName",model.F_DBFieldName),
+                new SqlParameter("@F_Sort",model.F_Sort),
            });
 
         }

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

@@ -170,7 +170,9 @@ namespace CallCenterApi.Interface.Controllers.customer
             if (userModel == null)
                 return Error("获取失败，该客户信息不存在");
             //系统列+自定义列 实体
-            var columnList = customerFieldBLL.GetList().Where(x => x.F_IsShowOnList > 0).OrderBy(x => x.F_FieldType).ThenBy(x => x.F_Sort).ToList();
+            var columnList = customerFieldBLL.GetList()
+                .Where(x => (x.F_FieldType == 0 && x.F_IsNecessary > 0) || (x.F_FieldType == 1 && x.F_IsShowOnScrean > 0))
+                .OrderBy(x => x.F_FieldType).ThenBy(x => x.F_Sort).ToList();
             //系统列+自定义列 字符串
             var headList = columnList.Select(x => x.F_Name).ToList();
             //系统列+自定义列 字段名
@@ -181,7 +183,7 @@ namespace CallCenterApi.Interface.Controllers.customer
             var expand = DbHelperSQL.Query("select  top 1 * from T_Cus_CustomerExpand where F_CustomerId=@F_CustomerId", new SqlParameter("@F_CustomerId", userModel.F_Id)).Tables[0].Rows[0];
             List<string> strList1 = new List<string>()
             {
-                 userModel.F_Name, userModel.F_PhoneNum1, userModel.F_PhoneNum2, userModel.F_Address, userModel.F_AddAgentName, userModel.F_AddTime.ToString("yyyy-MM-dd HH:mm:ss"), userModel.F_Remark
+                 userModel.F_Name, userModel.F_PhoneNum1, userModel.F_PhoneNum2, userModel.F_Address, userModel.F_Remark
             };
             List<string> strList2 = new List<string>();
             foreach (var item in customerColumnArr)
@@ -366,7 +368,9 @@ namespace CallCenterApi.Interface.Controllers.customer
         public ActionResult GetCustomerField()
         {
             //系统列+自定义列 实体
-            var columnList = customerFieldBLL.GetList().Where(x => x.F_IsShowOnList > 0).OrderBy(x => x.F_FieldType).ThenBy(x => x.F_Sort).ToList();
+            var columnList = customerFieldBLL.GetList()
+                .Where(x => (x.F_FieldType == 0 && x.F_IsNecessary > 0) || (x.F_FieldType == 1 && x.F_IsShowOnScrean > 0))
+                .OrderBy(x => x.F_FieldType).ThenBy(x => x.F_Sort).ToList();
             //系统列+自定义列 字符串
             var headList = columnList.Select(x => x.F_Name).ToList();
             //系统列+自定义列 字段名

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/customer/CustomerFieldController.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;
@@ -59,12 +60,13 @@ namespace CallCenterApi.Interface.Controllers.customer
                 attrModel = entityAttrBLL.GetModel(input.AttributeId);
                 if (attrModel == null)
                     return Error("该条记录不存在");
+                var sort = DbHelperSQL.GetSingle("SELECT MAX(F_Sort) from T_Cus_CustomerField") ?? 0;
                 model.F_FieldId = attrModel.F_AttributeId;
                 model.F_FieldType = attrModel.F_EntityId;
                 model.F_Name = attrModel.F_Name;
                 model.F_DBFieldName = attrModel.F_DBFieldlName;
                 model.F_DBTypeName = attrModel.F_DBTypeName;
-
+                model.F_Sort = Convert.ToInt32(sort) + 1;
                 if (customerFieldBLL.Add(model) > 0)
                     return Success("添加成功");
                 return Error("添加失败");

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/tel/CallInScreenController.cs

@@ -141,7 +141,9 @@ namespace CallCenterApi.Interface.Controllers.tel
                 return Error("来电号码为空");
 
             //系统列+自定义列 实体
-            var columnList = customerFieldBLL.GetList().Where(x => x.F_IsShowOnList > 0).OrderBy(x => x.F_FieldType).ThenBy(x => x.F_Sort).ToList();
+            var columnList = customerFieldBLL.GetList()
+                .Where(x => (x.F_FieldType == 0 && x.F_IsNecessary > 0) || (x.F_FieldType == 1 && x.F_IsShowOnScrean > 0))
+                .OrderBy(x => x.F_FieldType).ThenBy(x => x.F_Sort).ToList();
             //系统列+自定义列 字符串
             var headList = columnList.Select(x => x.F_Name).ToList();
             //系统列+自定义列 字段名
@@ -161,7 +163,7 @@ namespace CallCenterApi.Interface.Controllers.tel
             var expand = DbHelperSQL.Query("select  top 1 * from T_Cus_CustomerExpand where F_CustomerId=@F_CustomerId", new SqlParameter("@F_CustomerId", userModel.F_Id)).Tables[0].Rows[0];
             List<string> strList1 = new List<string>()
             {
-                 userModel.F_Name, userModel.F_PhoneNum1, userModel.F_PhoneNum2, userModel.F_Address, userModel.F_CusType.ToString(), userModel.F_AddAgentId.ToString(), userModel.F_AddTime.ToString("yyyy-MM-dd HH:mm:ss"), userModel.F_Remark
+                 userModel.F_Name, userModel.F_PhoneNum1, userModel.F_PhoneNum2, userModel.F_Address, userModel.F_Remark
             };
             List<string> strList2 = new List<string>();
             foreach (var item in customerColumnArr)