mengjie лет назад: 6
Родитель
Сommit
30b12d3112

+ 26 - 3
codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/knowledge/KnowledgeClassController.cs

137
                     else
137
                     else
138
                         dModel.F_ParentId = 0;
138
                         dModel.F_ParentId = 0;
139
 
139
 
140
-                    if (sort != "")
140
+
141
+                if (sort != "")
142
+                {
143
+                    if (IsNumeric(sort))
141
                     {
144
                     {
142
                         dModel.F_Sort = int.Parse(sort.Trim());
145
                         dModel.F_Sort = int.Parse(sort.Trim());
143
                     }
146
                     }
144
                     else
147
                     else
145
-                        dModel.F_Sort = 0;
148
+                    { return Error("排列序号必须为数字!"); }
149
+                }
150
+                else
151
+                { dModel.F_Sort = 0; }
146
                     dModel.F_CategoryName = cname.Trim();
152
                     dModel.F_CategoryName = cname.Trim();
147
 
153
 
148
                     dModel.F_CreateOn = DateTime.Now;
154
                     dModel.F_CreateOn = DateTime.Now;
161
             }
167
             }
162
             return res;
168
             return res;
163
         }
169
         }
170
+
171
+        /// <summary>
172
+        /// 判断是否为数字
173
+        /// </summary>
174
+        /// <param name="str"></param>
175
+        /// <returns></returns>
176
+        static bool IsNumeric(string str)
177
+        {
178
+            System.Text.RegularExpressions.Regex reg1 = new System.Text.RegularExpressions.Regex(@"^[0-9]\d*$");
179
+            return reg1.IsMatch(str);
180
+        }
181
+
164
         //[Authority]
182
         //[Authority]
165
         //编辑知识库分类
183
         //编辑知识库分类
166
         public ActionResult EditClass(string cid, string cname, string pid, string sort)
184
         public ActionResult EditClass(string cid, string cname, string pid, string sort)
183
                                     dModel.F_Expand1 = pModel.F_CategoryName;
201
                                     dModel.F_Expand1 = pModel.F_CategoryName;
184
                             }
202
                             }
185
 
203
 
186
-                            if (sort.Trim() != "")
204
+                        if (sort.Trim() != "")
205
+                        {
206
+                            if (IsNumeric(sort))
187
                             {
207
                             {
188
                                 dModel.F_Sort = int.Parse(sort.Trim());
208
                                 dModel.F_Sort = int.Parse(sort.Trim());
189
                             }
209
                             }
210
+                            else
211
+                            { return Error("排列序号必须为数字!"); }
212
+                        }
190
                             if (cname.Trim() != "")
213
                             if (cname.Trim() != "")
191
                             {
214
                             {
192
                                 dModel.F_CategoryName = cname.Trim();
215
                                 dModel.F_CategoryName = cname.Trim();

+ 2 - 2
codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/quality/QCManageController.cs

37
 
37
 
38
             if (phone.Trim() != "")
38
             if (phone.Trim() != "")
39
             {
39
             {
40
-                sql += " and CallNumber='" + phone + "'";
40
+                sql += " and CallNumber like '%" + phone + "%'";
41
             }
41
             }
42
             if (usercode.Trim() != "")
42
             if (usercode.Trim() != "")
43
             {
43
             {
157
 
157
 
158
             if (phone.Trim() != "")
158
             if (phone.Trim() != "")
159
             {
159
             {
160
-                sql += " and CallNumber='" + phone + "'";
160
+                sql += " and CallNumber like '%" + phone + "%'";
161
             }
161
             }
162
             if (usercode.Trim() != "")
162
             if (usercode.Trim() != "")
163
             {
163
             {

+ 56 - 1
codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/workorder/WorkOrderNewController.cs

122
                 #endregion
122
                 #endregion
123
                 model.Createby = ua.F_UserCode;
123
                 model.Createby = ua.F_UserCode;
124
                 model.CreateTime = DateTime.Now;
124
                 model.CreateTime = DateTime.Now;
125
-                model.F_State = 0;
125
+                //model.F_State = 0;
126
                 long n = workOrder.Add(model);
126
                 long n = workOrder.Add(model);
127
                 string deptname = "";
127
                 string deptname = "";
128
                 var deptmodel = departmentBLL.GetModel(ua.F_DeptId);
128
                 var deptmodel = departmentBLL.GetModel(ua.F_DeptId);
178
                 var model = workOrder.GetModel(input.ID);
178
                 var model = workOrder.GetModel(input.ID);
179
                 if (model == null)
179
                 if (model == null)
180
                     return Error("查询不到此工单!");
180
                     return Error("查询不到此工单!");
181
+                #region 用于保存修改记录
182
+                BLL.T_Wo_WorkOrderNew blln = new BLL.T_Wo_WorkOrderNew();
183
+                Model.T_Wo_WorkOrderNew modeln = blln.GetModel(input .ID );
184
+                string con = "";
185
+                if (modeln != null)
186
+                {
187
+                    con = modeln.Problem;
188
+                }
189
+                #endregion
190
+
181
                 #region 保存
191
                 #region 保存
182
                 model = inputtoobj(model, input, 2);
192
                 model = inputtoobj(model, input, 2);
183
                 #endregion
193
                 #endregion
194
+                string detail = con;
195
+                var detailutf8 = System.Web.HttpUtility.UrlDecode(model.Problem, System.Text.Encoding.UTF8);
196
+                model.Problem = detailutf8;
184
                 bool n = workOrder.Update(model);
197
                 bool n = workOrder.Update(model);
185
                 string deptname = "";
198
                 string deptname = "";
186
                 var deptmodel = departmentBLL.GetModel(ua.F_DeptId);
199
                 var deptmodel = departmentBLL.GetModel(ua.F_DeptId);
190
                 }
203
                 }
191
                 if (n)
204
                 if (n)
192
                 {
205
                 {
206
+                    WriteWorkOrderLog(model.WorkOrderID, detail, detailutf8, ua.F_UserCode, 0, "", 1, "修改工单");
193
                     AddLog((int)model.ID, (int)model.F_State, deptname + ua.F_UserName + "(" + ua.F_UserCode + ")" + "修改工单", (int)EnumItemType.update, (int)EnumItemOpt.update, "", 0, ua);
207
                     AddLog((int)model.ID, (int)model.F_State, deptname + ua.F_UserName + "(" + ua.F_UserCode + ")" + "修改工单", (int)EnumItemType.update, (int)EnumItemOpt.update, "", 0, ua);
194
                     return Success("修改成功!");
208
                     return Success("修改成功!");
195
                 }
209
                 }
200
             else
214
             else
201
                 return Error("无操作权限!");
215
                 return Error("无操作权限!");
202
         }
216
         }
217
+
218
+        #region 添加修改日志
219
+        /// <summary>
220
+        /// 工单修改操作日志
221
+        /// </summary>
222
+        /// <param name="WorkOrderID">工单编号</param>
223
+        /// <param name="BeforeContent">之前内容</param>
224
+        /// <param name="UpdateContent">修改内容</param>
225
+        /// <param name="UserCode">修改人code</param>
226
+        /// <param name="DelUserCode">删除人code</param>
227
+        /// <param name="TypeId">类型(0添加,1修改)</param>
228
+        /// <param name="AreaId">区域id</param>
229
+        /// <param name="ProId">区域id</param>
230
+        /// <param name="StageId">项目Id</param>
231
+        /// <param name="remark">期(一期,二期 ...)</param>
232
+        public void WriteWorkOrderLog(string WorkOrderID, string BeforeContent, string UpdateContent, string UserCode, int IsDelete, string DelUserCode, int TypeId, string Remark)
233
+        {
234
+            BLL.T_Wo_WorkOrder_Logs blllogs = new BLL.T_Wo_WorkOrder_Logs();
235
+            var model = new Model.T_Wo_WorkOrder_Logs();
236
+            model.WorkOrderID = WorkOrderID;        //工单编号
237
+            model.BeforeContent = BeforeContent;    //之前内容
238
+            model.UpdateContent = UpdateContent;    //修改内容
239
+            model.UserCode = UserCode;              //修改人code
240
+            model.AddTime = DateTime.Now;           //添加时间
241
+            model.IsDelete = IsDelete;              //是否删除(0正常1删除)
242
+            model.DelUserCode = DelUserCode;        //删除人code
243
+            model.TypeId = TypeId;                  //类型(0添加,1修改)
244
+            model.Remark = Remark;                  //备注
245
+            blllogs.Add(model);
246
+        }
247
+        #endregion
248
+
203
         /// <summary>
249
         /// <summary>
204
         /// 删除工单
250
         /// 删除工单
205
         /// </summary>
251
         /// </summary>
543
             model.Problem = input.Problem;//问题描述
589
             model.Problem = input.Problem;//问题描述
544
             model.IsDelete = 0;//问题描述
590
             model.IsDelete = 0;//问题描述
545
             model.IsOver = input.IsOver;
591
             model.IsOver = input.IsOver;
592
+            model.F_State = 0;
593
+            if (input.IsOver == 1)
594
+            {
595
+                model.DealContents = input.DealContents;
596
+                model.DealBy = usercode;
597
+                model.DealTime = DateTime.Now;
598
+                model.F_State = (int)EnumWorkOrderState.finish;//2;
599
+            }
600
+            
546
             return model;
601
             return model;
547
         }
602
         }
548
         public long AddLog(long woid, int wostate, string content, int itemtype, int opttype, string nextuser, int nextdept, Model.T_Sys_UserAccount nowUser)
603
         public long AddLog(long woid, int wostate, string content, int itemtype, int opttype, string nextuser, int nextdept, Model.T_Sys_UserAccount nowUser)