Browse Source

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

yuqian 8 years ago
parent
commit
ce03dc7951

+ 1 - 1
CallCenterApi/CallCenterApi.BLL/T_Cus_CustomerField.cs

26
                         F_Name = row["F_Name"].ToString(),
26
                         F_Name = row["F_Name"].ToString(),
27
                         F_DBTypeName = row["F_DBTypeName"].ToString(),
27
                         F_DBTypeName = row["F_DBTypeName"].ToString(),
28
                         F_DBFieldName = row["F_DBFieldName"].ToString(),
28
                         F_DBFieldName = row["F_DBFieldName"].ToString(),
29
-                        F_Sort = row["F_Sort"] == DBNull.Value ? 0 : Convert.ToInt32(row["F_Sort"]),
29
+                        F_Sort = row["F_Sort"] == DBNull.Value ? (int?)null : Convert.ToInt32(row["F_Sort"]),
30
                         F_CharLength = row["F_CharLength"] == DBNull.Value ? 0 : Convert.ToInt32(row["F_CharLength"]),
30
                         F_CharLength = row["F_CharLength"] == DBNull.Value ? 0 : Convert.ToInt32(row["F_CharLength"]),
31
                         F_IsNecessary = row["F_IsNecessary"] == DBNull.Value ? 0 : Convert.ToInt32(row["F_IsNecessary"]),
31
                         F_IsNecessary = row["F_IsNecessary"] == DBNull.Value ? 0 : Convert.ToInt32(row["F_IsNecessary"]),
32
                         F_IsExportOrInput = row["F_IsExportOrInput"] == DBNull.Value ? 0 : Convert.ToInt32(row["F_IsExportOrInput"]),
32
                         F_IsExportOrInput = row["F_IsExportOrInput"] == DBNull.Value ? 0 : Convert.ToInt32(row["F_IsExportOrInput"]),

+ 2 - 1
CallCenterApi/CallCenterApi.DAL/T_Cus_CustomerField.cs

79
         }
79
         }
80
         public int Add(Model.T_Cus_CustomerField model)
80
         public int Add(Model.T_Cus_CustomerField model)
81
         {
81
         {
82
-            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)";
82
+            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)";
83
             return DbHelperSQL.ExecuteSql(sql, new SqlParameter[] {
83
             return DbHelperSQL.ExecuteSql(sql, new SqlParameter[] {
84
                 new SqlParameter("@F_FieldType",model.F_FieldType),
84
                 new SqlParameter("@F_FieldType",model.F_FieldType),
85
                 new SqlParameter("@F_FieldId",model.F_FieldId),
85
                 new SqlParameter("@F_FieldId",model.F_FieldId),
86
                 new SqlParameter("@F_Name",model.F_Name),
86
                 new SqlParameter("@F_Name",model.F_Name),
87
                 new SqlParameter("@F_DBTypeName",model.F_DBTypeName),
87
                 new SqlParameter("@F_DBTypeName",model.F_DBTypeName),
88
                 new SqlParameter("@F_DBFieldName",model.F_DBFieldName),
88
                 new SqlParameter("@F_DBFieldName",model.F_DBFieldName),
89
+                new SqlParameter("@F_Sort",model.F_Sort),
89
            });
90
            });
90
 
91
 
91
         }
92
         }

+ 7 - 3
CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/customer/CustomerController.cs

170
             if (userModel == null)
170
             if (userModel == null)
171
                 return Error("获取失败,该客户信息不存在");
171
                 return Error("获取失败,该客户信息不存在");
172
             //系统列+自定义列 实体
172
             //系统列+自定义列 实体
173
-            var columnList = customerFieldBLL.GetList().Where(x => x.F_IsShowOnList > 0).OrderBy(x => x.F_FieldType).ThenBy(x => x.F_Sort).ToList();
173
+            var columnList = customerFieldBLL.GetList()
174
+                .Where(x => (x.F_FieldType == 0 && x.F_IsNecessary > 0) || (x.F_FieldType == 1 && x.F_IsShowOnScrean > 0))
175
+                .OrderBy(x => x.F_FieldType).ThenBy(x => x.F_Sort).ToList();
174
             //系统列+自定义列 字符串
176
             //系统列+自定义列 字符串
175
             var headList = columnList.Select(x => x.F_Name).ToList();
177
             var headList = columnList.Select(x => x.F_Name).ToList();
176
             //系统列+自定义列 字段名
178
             //系统列+自定义列 字段名
181
             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];
183
             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];
182
             List<string> strList1 = new List<string>()
184
             List<string> strList1 = new List<string>()
183
             {
185
             {
184
-                 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
186
+                 userModel.F_Name, userModel.F_PhoneNum1, userModel.F_PhoneNum2, userModel.F_Address, userModel.F_Remark
185
             };
187
             };
186
             List<string> strList2 = new List<string>();
188
             List<string> strList2 = new List<string>();
187
             foreach (var item in customerColumnArr)
189
             foreach (var item in customerColumnArr)
366
         public ActionResult GetCustomerField()
368
         public ActionResult GetCustomerField()
367
         {
369
         {
368
             //系统列+自定义列 实体
370
             //系统列+自定义列 实体
369
-            var columnList = customerFieldBLL.GetList().Where(x => x.F_IsShowOnList > 0).OrderBy(x => x.F_FieldType).ThenBy(x => x.F_Sort).ToList();
371
+            var columnList = customerFieldBLL.GetList()
372
+                .Where(x => (x.F_FieldType == 0 && x.F_IsNecessary > 0) || (x.F_FieldType == 1 && x.F_IsShowOnScrean > 0))
373
+                .OrderBy(x => x.F_FieldType).ThenBy(x => x.F_Sort).ToList();
370
             //系统列+自定义列 字符串
374
             //系统列+自定义列 字符串
371
             var headList = columnList.Select(x => x.F_Name).ToList();
375
             var headList = columnList.Select(x => x.F_Name).ToList();
372
             //系统列+自定义列 字段名
376
             //系统列+自定义列 字段名

+ 3 - 1
CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/customer/CustomerFieldController.cs

1
 using CallCenter.Utility;
1
 using CallCenter.Utility;
2
+using CallCenterApi.DB;
2
 using CallCenterApi.Interface.Controllers.Base;
3
 using CallCenterApi.Interface.Controllers.Base;
3
 using CallCenterApi.Interface.Models.Filter;
4
 using CallCenterApi.Interface.Models.Filter;
4
 using CallCenterApi.Interface.Models.Input;
5
 using CallCenterApi.Interface.Models.Input;
59
                 attrModel = entityAttrBLL.GetModel(input.AttributeId);
60
                 attrModel = entityAttrBLL.GetModel(input.AttributeId);
60
                 if (attrModel == null)
61
                 if (attrModel == null)
61
                     return Error("该条记录不存在");
62
                     return Error("该条记录不存在");
63
+                var sort = DbHelperSQL.GetSingle("SELECT MAX(F_Sort) from T_Cus_CustomerField") ?? 0;
62
                 model.F_FieldId = attrModel.F_AttributeId;
64
                 model.F_FieldId = attrModel.F_AttributeId;
63
                 model.F_FieldType = attrModel.F_EntityId;
65
                 model.F_FieldType = attrModel.F_EntityId;
64
                 model.F_Name = attrModel.F_Name;
66
                 model.F_Name = attrModel.F_Name;
65
                 model.F_DBFieldName = attrModel.F_DBFieldlName;
67
                 model.F_DBFieldName = attrModel.F_DBFieldlName;
66
                 model.F_DBTypeName = attrModel.F_DBTypeName;
68
                 model.F_DBTypeName = attrModel.F_DBTypeName;
67
-
69
+                model.F_Sort = Convert.ToInt32(sort) + 1;
68
                 if (customerFieldBLL.Add(model) > 0)
70
                 if (customerFieldBLL.Add(model) > 0)
69
                     return Success("添加成功");
71
                     return Success("添加成功");
70
                 return Error("添加失败");
72
                 return Error("添加失败");

+ 4 - 2
CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/tel/CallInScreenController.cs

141
                 return Error("来电号码为空");
141
                 return Error("来电号码为空");
142
 
142
 
143
             //系统列+自定义列 实体
143
             //系统列+自定义列 实体
144
-            var columnList = customerFieldBLL.GetList().Where(x => x.F_IsShowOnList > 0).OrderBy(x => x.F_FieldType).ThenBy(x => x.F_Sort).ToList();
144
+            var columnList = customerFieldBLL.GetList()
145
+                .Where(x => (x.F_FieldType == 0 && x.F_IsNecessary > 0) || (x.F_FieldType == 1 && x.F_IsShowOnScrean > 0))
146
+                .OrderBy(x => x.F_FieldType).ThenBy(x => x.F_Sort).ToList();
145
             //系统列+自定义列 字符串
147
             //系统列+自定义列 字符串
146
             var headList = columnList.Select(x => x.F_Name).ToList();
148
             var headList = columnList.Select(x => x.F_Name).ToList();
147
             //系统列+自定义列 字段名
149
             //系统列+自定义列 字段名
161
             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];
163
             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];
162
             List<string> strList1 = new List<string>()
164
             List<string> strList1 = new List<string>()
163
             {
165
             {
164
-                 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
166
+                 userModel.F_Name, userModel.F_PhoneNum1, userModel.F_PhoneNum2, userModel.F_Address, userModel.F_Remark
165
             };
167
             };
166
             List<string> strList2 = new List<string>();
168
             List<string> strList2 = new List<string>();
167
             foreach (var item in customerColumnArr)
169
             foreach (var item in customerColumnArr)