修改禅道bug

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/knowledge/KnowledgeClassController.cs

@@ -137,12 +137,18 @@ namespace CallCenterApi.Interface.Controllers.knowledge
                     else
                         dModel.F_ParentId = 0;
 
-                    if (sort != "")
+
+                if (sort != "")
+                {
+                    if (IsNumeric(sort))
                     {
                         dModel.F_Sort = int.Parse(sort.Trim());
                     }
                     else
-                        dModel.F_Sort = 0;
+                    { return Error("排列序号必须为数字！"); }
+                }
+                else
+                { dModel.F_Sort = 0; }
                     dModel.F_CategoryName = cname.Trim();
 
                     dModel.F_CreateOn = DateTime.Now;
@@ -161,6 +167,18 @@ namespace CallCenterApi.Interface.Controllers.knowledge
             }
             return res;
         }
+
+        /// <summary>
+        /// 判断是否为数字
+        /// </summary>
+        /// <param name="str"></param>
+        /// <returns></returns>
+        static bool IsNumeric(string str)
+        {
+            System.Text.RegularExpressions.Regex reg1 = new System.Text.RegularExpressions.Regex(@"^[0-9]\d*$");
+            return reg1.IsMatch(str);
+        }
+
         //[Authority]
         //编辑知识库分类
         public ActionResult EditClass(string cid, string cname, string pid, string sort)
@@ -183,10 +201,15 @@ namespace CallCenterApi.Interface.Controllers.knowledge
                                     dModel.F_Expand1 = pModel.F_CategoryName;
                             }
 
-                            if (sort.Trim() != "")
+                        if (sort.Trim() != "")
+                        {
+                            if (IsNumeric(sort))
                             {
                                 dModel.F_Sort = int.Parse(sort.Trim());
                             }
+                            else
+                            { return Error("排列序号必须为数字！"); }
+                        }
                             if (cname.Trim() != "")
                             {
                                 dModel.F_CategoryName = cname.Trim();

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/quality/QCManageController.cs

@@ -37,7 +37,7 @@ namespace CallCenterApi.Interface.Controllers.quality
 
             if (phone.Trim() != "")
             {
-                sql += " and CallNumber='" + phone + "'";
+                sql += " and CallNumber like '%" + phone + "%'";
             }
             if (usercode.Trim() != "")
             {
@@ -157,7 +157,7 @@ namespace CallCenterApi.Interface.Controllers.quality
 
             if (phone.Trim() != "")
             {
-                sql += " and CallNumber='" + phone + "'";
+                sql += " and CallNumber like '%" + phone + "%'";
             }
             if (usercode.Trim() != "")
             {

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/workorder/WorkOrderNewController.cs

@@ -122,7 +122,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 #endregion
                 model.Createby = ua.F_UserCode;
                 model.CreateTime = DateTime.Now;
-                model.F_State = 0;
+                //model.F_State = 0;
                 long n = workOrder.Add(model);
                 string deptname = "";
                 var deptmodel = departmentBLL.GetModel(ua.F_DeptId);
@@ -178,9 +178,22 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 var model = workOrder.GetModel(input.ID);
                 if (model == null)
                     return Error("查询不到此工单！");
+                #region 用于保存修改记录
+                BLL.T_Wo_WorkOrderNew blln = new BLL.T_Wo_WorkOrderNew();
+                Model.T_Wo_WorkOrderNew modeln = blln.GetModel(input .ID );
+                string con = "";
+                if (modeln != null)
+                {
+                    con = modeln.Problem;
+                }
+                #endregion
+
                 #region 保存
                 model = inputtoobj(model, input, 2);
                 #endregion
+                string detail = con;
+                var detailutf8 = System.Web.HttpUtility.UrlDecode(model.Problem, System.Text.Encoding.UTF8);
+                model.Problem = detailutf8;
                 bool n = workOrder.Update(model);
                 string deptname = "";
                 var deptmodel = departmentBLL.GetModel(ua.F_DeptId);
@@ -190,6 +203,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 }
                 if (n)
                 {
+                    WriteWorkOrderLog(model.WorkOrderID, detail, detailutf8, ua.F_UserCode, 0, "", 1, "修改工单");
                     AddLog((int)model.ID, (int)model.F_State, deptname + ua.F_UserName + "(" + ua.F_UserCode + ")" + "修改工单", (int)EnumItemType.update, (int)EnumItemOpt.update, "", 0, ua);
                     return Success("修改成功！");
                 }
@@ -200,6 +214,38 @@ namespace CallCenterApi.Interface.Controllers.workorder
             else
                 return Error("无操作权限！");
         }
+
+        #region 添加修改日志
+        /// <summary>
+        /// 工单修改操作日志
+        /// </summary>
+        /// <param name="WorkOrderID">工单编号</param>
+        /// <param name="BeforeContent">之前内容</param>
+        /// <param name="UpdateContent">修改内容</param>
+        /// <param name="UserCode">修改人code</param>
+        /// <param name="DelUserCode">删除人code</param>
+        /// <param name="TypeId">类型（0添加，1修改）</param>
+        /// <param name="AreaId">区域id</param>
+        /// <param name="ProId">区域id</param>
+        /// <param name="StageId">项目Id</param>
+        /// <param name="remark">期（一期，二期 ...）</param>
+        public void WriteWorkOrderLog(string WorkOrderID, string BeforeContent, string UpdateContent, string UserCode, int IsDelete, string DelUserCode, int TypeId, string Remark)
+        {
+            BLL.T_Wo_WorkOrder_Logs blllogs = new BLL.T_Wo_WorkOrder_Logs();
+            var model = new Model.T_Wo_WorkOrder_Logs();
+            model.WorkOrderID = WorkOrderID;        //工单编号
+            model.BeforeContent = BeforeContent;    //之前内容
+            model.UpdateContent = UpdateContent;    //修改内容
+            model.UserCode = UserCode;              //修改人code
+            model.AddTime = DateTime.Now;           //添加时间
+            model.IsDelete = IsDelete;              //是否删除（0正常1删除）
+            model.DelUserCode = DelUserCode;        //删除人code
+            model.TypeId = TypeId;                  //类型（0添加，1修改）
+            model.Remark = Remark;                  //备注
+            blllogs.Add(model);
+        }
+        #endregion
+
         /// <summary>
         /// 删除工单
         /// </summary>
@@ -543,6 +589,15 @@ namespace CallCenterApi.Interface.Controllers.workorder
             model.Problem = input.Problem;//问题描述
             model.IsDelete = 0;//问题描述
             model.IsOver = input.IsOver;
+            model.F_State = 0;
+            if (input.IsOver == 1)
+            {
+                model.DealContents = input.DealContents;
+                model.DealBy = usercode;
+                model.DealTime = DateTime.Now;
+                model.F_State = (int)EnumWorkOrderState.finish;//2;
+            }
+            
             return model;
         }
         public long AddLog(long woid, int wostate, string content, int itemtype, int opttype, string nextuser, int nextdept, Model.T_Sys_UserAccount nowUser)