工单流程工号改为职员编码

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/weixin/WxLoginController.cs

@@ -1202,15 +1202,15 @@ namespace CallCenterApi.Interface.Controllers.weixin
                     if (AuditState == 0)
                     {
                         opt = "同意上报";
-                        var userid = AddLog(model.F_ID, model.F_State.Value, deptmodelsname + nowUser.F_UserName + "(" + nowUser.F_UserCode + ")" + "工单审批：同意上报" + AuditCont, (int)EnumItemType.audit, (int)EnumItemOpt.reaudit, user.F_UserCode, user.F_DeptId, nowUser, overtime, sms);
-                        var uaid = AddLog(model.F_ID, model.F_State.Value, deptname + user.F_UserName + "(" + user.F_UserCode + ")" + "待审批", (int)EnumItemType.audit, (int)EnumItemOpt.audit, user.F_UserCode, user.F_DeptId, nowUser, overtime, sms);
+                        var userid = AddLog(model.F_ID, model.F_State.Value, deptmodelsname + nowUser.F_UserName + "(" + nowUser.F_WorkNumber + ")" + "工单审批：同意上报" + AuditCont, (int)EnumItemType.audit, (int)EnumItemOpt.reaudit, user.F_UserCode, user.F_DeptId, nowUser, overtime, sms);
+                        var uaid = AddLog(model.F_ID, model.F_State.Value, deptname + user.F_UserName + "(" + user.F_WorkNumber + ")" + "待审批", (int)EnumItemType.audit, (int)EnumItemOpt.audit, user.F_UserCode, user.F_DeptId, nowUser, overtime, sms);
                         if (userid <= 0 || uaid <= 0)
                             res = false;
                     }
                     else if (AuditState == 1)
                     {
                         opt = "驳回修订";
-                        var userid = AddLog(model.F_ID, model.F_State.Value, deptmodelsname + nowUser.F_UserName + "(" + nowUser.F_UserCode + ")" + "工单审批：驳回修订" + AuditCont, (int)EnumItemType.audit, (int)EnumItemOpt.reback, toussers, 0, nowUser, overtime, sms);
+                        var userid = AddLog(model.F_ID, model.F_State.Value, deptmodelsname + nowUser.F_UserName + "(" + nowUser.F_WorkNumber + ")" + "工单审批：驳回修订" + AuditCont, (int)EnumItemType.audit, (int)EnumItemOpt.reback, toussers, 0, nowUser, overtime, sms);
                         if (userid <= 0)
                             res = false;
                     }
@@ -1218,7 +1218,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
                     {
                         opt = "强制结案";
                         wostate = 11;
-                        var userid = AddLog(model.F_ID, model.F_State.Value, deptmodelsname + nowUser.F_UserName + "(" + nowUser.F_UserCode + ")" + "工单审批：强制结案" + AuditCont, (int)EnumItemType.audit, (int)EnumItemOpt.visit, "", 0, nowUser, overtime, sms);
+                        var userid = AddLog(model.F_ID, model.F_State.Value, deptmodelsname + nowUser.F_UserName + "(" + nowUser.F_WorkNumber + ")" + "工单审批：强制结案" + AuditCont, (int)EnumItemType.audit, (int)EnumItemOpt.visit, "", 0, nowUser, overtime, sms);
                         if (userid <= 0)
                             res = false;
                     }
@@ -1234,7 +1234,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
                         if (AuditState == 0)
                         {
                             opt = "同意上报";
-                            var userid = AddLog(model.F_ID, model.F_State.Value, deptmodelsname + nowUser.F_UserName + "(" + nowUser.F_UserCode + ")" + "工单审批：同意上报" + AuditCont, (int)EnumItemType.audit, (int)EnumItemOpt.reaudit, "", 0, nowUser, overtime, sms);
+                            var userid = AddLog(model.F_ID, model.F_State.Value, deptmodelsname + nowUser.F_UserName + "(" + nowUser.F_WorkNumber + ")" + "工单审批：同意上报" + AuditCont, (int)EnumItemType.audit, (int)EnumItemOpt.reaudit, "", 0, nowUser, overtime, sms);
                             res = GetDaQucirCulation(nowUser, DateTime.Now.ToString(), model.F_ID,true );
                             if (userid <= 0 || !res)
                                 res = false;
@@ -1243,7 +1243,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
                         else if (AuditState == 1)
                         {
                             opt = "驳回修订";
-                            var userid = AddLog(model.F_ID, model.F_State.Value, deptmodelsname + nowUser.F_UserName + "(" + nowUser.F_UserCode + ")" + "工单审批：驳回修订" + AuditCont, (int)EnumItemType.audit, (int)EnumItemOpt.reback, toussers, 0, nowUser, overtime, sms);
+                            var userid = AddLog(model.F_ID, model.F_State.Value, deptmodelsname + nowUser.F_UserName + "(" + nowUser.F_WorkNumber + ")" + "工单审批：驳回修订" + AuditCont, (int)EnumItemType.audit, (int)EnumItemOpt.reback, toussers, 0, nowUser, overtime, sms);
                             if (userid <= 0)
                                 res = false;
                             wostate = 16;
@@ -1251,7 +1251,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
                         else
                         {
                             opt = "强制结案";
-                            var userid = AddLog(model.F_ID, model.F_State.Value, deptmodelsname + nowUser.F_UserName + "(" + nowUser.F_UserCode + ")" + "工单审批：强制结案" + AuditCont, (int)EnumItemType.audit, (int)EnumItemOpt.visit, "", 0, nowUser, overtime, sms);
+                            var userid = AddLog(model.F_ID, model.F_State.Value, deptmodelsname + nowUser.F_UserName + "(" + nowUser.F_WorkNumber + ")" + "工单审批：强制结案" + AuditCont, (int)EnumItemType.audit, (int)EnumItemOpt.visit, "", 0, nowUser, overtime, sms);
                             if (userid <= 0 )
                                 res = false;
                             wostate = 11;
@@ -1487,8 +1487,8 @@ namespace CallCenterApi.Interface.Controllers.weixin
                     {
                         DateTime time = DateTime.Parse(it.F_CreateTime.ToString()).AddHours(24);
                         Model.T_Wo_WorkOrder model = woBLL.GetModel(it.F_WoID);
-                        AddLog(model.F_ID, model.F_State.Value, deptmodelsname + ua.F_UserName + "(" + ua .F_UserCode + ")" + "未审批流转大区经理", (int)EnumItemType.audit, (int)EnumItemOpt.audit, user.F_UserCode , user.F_DeptId , ua, 0, 0);
-                        AddLog(model.F_ID, model.F_State.Value, deptname + user.F_UserName + "(" + user.F_UserCode + ")" + "待审批", (int)EnumItemType.audit, (int)EnumItemOpt.audit, user.F_UserCode, user.F_DeptId, user, 0, 0);
+                        AddLog(model.F_ID, model.F_State.Value, deptmodelsname + ua.F_UserName + "(" + ua .F_WorkNumber + ")" + "未审批流转大区经理", (int)EnumItemType.audit, (int)EnumItemOpt.audit, user.F_UserCode , user.F_DeptId , ua, 0, 0);
+                        AddLog(model.F_ID, model.F_State.Value, deptname + user.F_UserName + "(" + user.F_WorkNumber + ")" + "待审批", (int)EnumItemType.audit, (int)EnumItemOpt.audit, user.F_UserCode, user.F_DeptId, user, 0, 0);
                     }
                     else if (hours >= 48)
                     {
@@ -1530,8 +1530,8 @@ namespace CallCenterApi.Interface.Controllers.weixin
                                 {
                                     deptmodelsname = deptmodels.F_DeptName + "-";
                                 }
-                                AddLog(model.F_ID, model.F_State.Value, deptmodelsname + user.F_UserName + "(" + user.F_UserCode + ")" + "未审批流转大区经理", (int)EnumItemType.audit, (int)EnumItemOpt.audit, ua.F_UserCode, ua.F_DeptId, user, 0, 0);
-                                AddLog(model.F_ID, model.F_State.Value, deptname + ua.F_UserName + "(" + ua.F_UserCode + ")" + "待审批", (int)EnumItemType.audit, (int)EnumItemOpt.audit, ua.F_UserCode, ua.F_DeptId, ua, 0, 0);
+                                AddLog(model.F_ID, model.F_State.Value, deptmodelsname + user.F_UserName + "(" + user.F_WorkNumber + ")" + "未审批流转大区经理", (int)EnumItemType.audit, (int)EnumItemOpt.audit, ua.F_UserCode, ua.F_DeptId, user, 0, 0);
+                                AddLog(model.F_ID, model.F_State.Value, deptname + ua.F_UserName + "(" + ua.F_WorkNumber + ")" + "待审批", (int)EnumItemType.audit, (int)EnumItemOpt.audit, ua.F_UserCode, ua.F_DeptId, ua, 0, 0);
                                 if (hours < 48)
                                 {
                                     str = GetID(str, it.F_WoID);
@@ -1730,7 +1730,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
                     }
                     else if (model1[i].F_State == 10)
                     {
-                        model.F_StateName = "已完结";
+                        model.F_StateName = "已处理";
                     }
                     else if (model1[i].F_State == 11)
                     {
@@ -2637,8 +2637,8 @@ namespace CallCenterApi.Interface.Controllers.weixin
                                 {
                                     deptname1 = deptmodel1.F_DeptName + "-";
                                 }
-                                AddLog(modlelist.F_ID,0, deptname1 + ua.F_UserName + "(" + ua.F_UserCode + ")" + "创建工单", (int)EnumWorkOrderState.neworder, (int)EnumItemOpt.create, user.F_UserCode, user.F_DeptId, ua , 0, 0);
-                                AddLog(modlelist.F_ID, modlelist.F_State.Value, deptname + user.F_UserName + "(" + user.F_UserCode + ")" + "待审批", (int)EnumItemType.audit, (int)EnumItemOpt.audit, user.F_UserCode, user.F_DeptId, ua, 0, 0);
+                                AddLog(modlelist.F_ID,0, deptname1 + ua.F_UserName + "(" + ua.F_WorkNumber + ")" + "创建工单", (int)EnumWorkOrderState.neworder, (int)EnumItemOpt.create, user.F_UserCode, user.F_DeptId, ua , 0, 0);
+                                AddLog(modlelist.F_ID, modlelist.F_State.Value, deptname + user.F_UserName + "(" + user.F_WorkNumber + ")" + "待审批", (int)EnumItemType.audit, (int)EnumItemOpt.audit, user.F_UserCode, user.F_DeptId, ua, 0, 0);
                             }
                             else
                             {
@@ -2648,7 +2648,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
                                 {
                                     deptname1 = deptmodel1.F_DeptName + "-";
                                 }
-                                AddLog(modlelist.F_ID, 0, deptname1 + ua.F_UserName + "(" + ua.F_UserCode + ")" + "创建工单", (int)EnumWorkOrderState.neworder, (int)EnumItemOpt.create,"",0, ua, 0, 0);
+                                AddLog(modlelist.F_ID, 0, deptname1 + ua.F_UserName + "(" + ua.F_WorkNumber + ")" + "创建工单", (int)EnumWorkOrderState.neworder, (int)EnumItemOpt.create,"",0, ua, 0, 0);
                                 var res = AssignWO(ua, modlelist, input, "流转市场管理科", 37, 0, overtime, sms);
                                 if (res)
                                 return Success("添加成功");
@@ -2974,7 +2974,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
             var optcont = "";
             if (!string.IsNullOrEmpty(cont))
                 optcont = "，说明：" + cont;
-            var content = deptname + nowUser.F_UserName + "(" + nowUser.F_UserCode + ")" + opt + "工单给 " + tousername + optcont;
+            var content = deptname + nowUser.F_UserName + "(" + nowUser.F_WorkNumber + ")" + opt + "工单给 " + tousername + optcont;
            var itemid = AddLog(model.F_ID, wostate, content, (int)EnumItemType.deal, optbut, touser, clbm, nowUser, overtime, sms, creat);
             if (itemid > 0)
             {
@@ -3313,7 +3313,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
                         {
                             deptname = deptmodel.F_DeptName + "-";
                         }
-                        AddLog(model.F_ID, model.F_State.Value, deptname + ua.F_UserName + "(" + ua.F_UserCode + ")" + "高层已审批", (int)EnumItemType.audit, (int)EnumItemOpt.reaudit, "", 0, ua, 0, 0,"",1);
+                        AddLog(model.F_ID, model.F_State.Value, deptname + ua.F_UserName + "(" + ua.F_WorkNumber + ")" + "高层已审批", (int)EnumItemType.audit, (int)EnumItemOpt.reaudit, "", 0, ua, 0, 0,"",1);
                         bool n = woBLL.Update(model);
                             if (n)
                             return Success("审批成功");
@@ -3356,7 +3356,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
                 deptname = deptmodel.F_DeptName + "-";
             }
             #endregion
-            var content = deptname + nowUser.F_UserName + "(" + nowUser.F_UserCode + ")" + opt;
+            var content = deptname + nowUser.F_UserName + "(" + nowUser.F_WorkNumber + ")" + opt;
             var itemid = AddLog((int)model.F_ID, wostate, content, (int)EnumItemType.deal, optbut, nowUser.F_UserCode, nowUser.F_DeptId, nowUser, overtime, sms);
             if (itemid > 0)
             {
@@ -3610,7 +3610,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
                 deptname = deptmodel.F_DeptName + "-";
             }
             #endregion
-            var content = deptname + nowUser.F_UserName + "(" + nowUser.F_UserCode + ")" + "延期工单，延期说明：" + cont;
+            var content = deptname + nowUser.F_UserName + "(" + nowUser.F_WorkNumber + ")" + "延期工单，延期说明：" + cont;
             //获取上一级处理人员
             var touser = "";
             var itemlast = itembll.GetModelList(" F_ItemType=" + (int)EnumItemType.deal + " and  F_WoID='" + model.F_ID + "' and F_NextUser='" + nowUser.F_UserCode + "' order by F_CreateTime desc").FirstOrDefault();
@@ -3659,7 +3659,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
                 deptname = deptmodel.F_DeptName + "-";
             }
             #endregion
-            var content = deptname + nowUser.F_UserName + "(" + nowUser.F_UserCode + ")" + opt + "工单，退回说明：" + cont;
+            var content = deptname + nowUser.F_UserName + "(" + nowUser.F_WorkNumber + ")" + opt + "工单，退回说明：" + cont;
             //获取上一级处理人员
             var touser = ""; var deptid = 0;
             var itemlast = itembll.GetModelList(" F_ItemType=" + (int)EnumItemType.deal + " and F_NextDept =" + nowUser.F_DeptId + " and F_WoState =" + F_OptType + " and  F_WoID='" + model.F_ID + "' order by F_CreateTime desc").FirstOrDefault();
@@ -3754,7 +3754,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
             var optcont = "";
             if (!string.IsNullOrEmpty(cont))
                 optcont = "，处理内容：" + cont;
-            var content = deptname + nowUser.F_UserName + "(" + nowUser.F_UserCode + ")" + opt + "工单" + optcont;
+            var content = deptname + nowUser.F_UserName + "(" + nowUser.F_WorkNumber + ")" + opt + "工单" + optcont;
             var itemid = AddLog(model.F_ID, wostate, content, (int)EnumItemType.deal, optbut, "", 0, nowUser, model .F_limit , sms);
             if (itemid > 0)
             {
@@ -3941,7 +3941,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
                     }
                     #endregion
 
-                    AddLog(input.F_ID, model.F_State.Value, deptname + ua.F_UserName + "(" + ua.F_UserCode + ")" + "修改工单", (int)EnumItemType.update, (int)EnumItemOpt.update, "", 0, ua, 0, 0);
+                    AddLog(input.F_ID, model.F_State.Value, deptname + ua.F_UserName + "(" + ua.F_WorkNumber + ")" + "修改工单", (int)EnumItemType.update, (int)EnumItemOpt.update, "", 0, ua, 0, 0);
                     if (GetUser(input.F_WxOpenId) != null)
                     {
                         var user = GetUser(input.F_WxOpenId);
@@ -3953,7 +3953,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
                         }
                         var deptmodel1 = departmentBLL.GetModel(ua.F_DeptId);
                       
-                        AddLog(input.F_ID, model .F_State.Value, deptname1 + user.F_UserName + "(" + user.F_UserCode + ")" + "待审批", (int)EnumItemType.audit, (int)EnumItemOpt.audit, user.F_UserCode, user.F_DeptId, ua, 0, 0);
+                        AddLog(input.F_ID, model .F_State.Value, deptname1 + user.F_UserName + "(" + user.F_WorkNumber + ")" + "待审批", (int)EnumItemType.audit, (int)EnumItemOpt.audit, user.F_UserCode, user.F_DeptId, ua, 0, 0);
                     }
                     else
                     {

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

@@ -945,15 +945,15 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     if (AuditState == 0)
                     {
                         opt = "同意上报";
-                        var userid = AddLog(model.F_ID, model.F_State.Value, deptmodelsname + nowUser.F_UserName + "(" + nowUser.F_UserCode + ")" + "工单审批：同意上报" + AuditCont, (int)EnumItemType.audit, (int)EnumItemOpt.reaudit, user.F_UserCode, user.F_DeptId, nowUser, overtime, sms);
-                        var uaid = AddLog(model.F_ID, model.F_State.Value, deptname + user.F_UserName + "(" + user.F_UserCode + ")" + "待审批", (int)EnumItemType.audit, (int)EnumItemOpt.audit, user.F_UserCode, user.F_DeptId, nowUser, overtime, sms);
+                        var userid = AddLog(model.F_ID, model.F_State.Value, deptmodelsname + nowUser.F_UserName + "(" + nowUser.F_WorkNumber + ")" + "工单审批：同意上报" + AuditCont, (int)EnumItemType.audit, (int)EnumItemOpt.reaudit, user.F_UserCode, user.F_DeptId, nowUser, overtime, sms);
+                        var uaid = AddLog(model.F_ID, model.F_State.Value, deptname + user.F_UserName + "(" + user.F_WorkNumber + ")" + "待审批", (int)EnumItemType.audit, (int)EnumItemOpt.audit, user.F_UserCode, user.F_DeptId, nowUser, overtime, sms);
                         if (userid <= 0 || uaid <= 0)
                             res = false;
                     }
                     else if (AuditState == 1)
                     {
                         opt = "驳回修订";
-                        var userid = AddLog(model.F_ID, model.F_State.Value, deptmodelsname + nowUser.F_UserName + "(" + nowUser.F_UserCode + ")" + "工单审批：驳回修订" + AuditCont, (int)EnumItemType.audit, (int)EnumItemOpt.reback, toussers, 0, nowUser, overtime, sms);
+                        var userid = AddLog(model.F_ID, model.F_State.Value, deptmodelsname + nowUser.F_UserName + "(" + nowUser.F_WorkNumber + ")" + "工单审批：驳回修订" + AuditCont, (int)EnumItemType.audit, (int)EnumItemOpt.reback, toussers, 0, nowUser, overtime, sms);
                         if (userid <= 0)
                             res = false;
                     }
@@ -961,7 +961,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     {
                         opt = "强制结案";
                         wostate = 11;
-                        var userid = AddLog(model.F_ID, model.F_State.Value, deptmodelsname + nowUser.F_UserName + "(" + nowUser.F_UserCode + ")" + "工单审批：强制结案" + AuditCont, (int)EnumItemType.audit, (int)EnumItemOpt.visit, "", 0, nowUser, overtime, sms);
+                        var userid = AddLog(model.F_ID, model.F_State.Value, deptmodelsname + nowUser.F_UserName + "(" + nowUser.F_WorkNumber + ")" + "工单审批：强制结案" + AuditCont, (int)EnumItemType.audit, (int)EnumItemOpt.visit, "", 0, nowUser, overtime, sms);
                         if (userid <= 0)
                             res = false;
                     }
@@ -978,7 +978,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                         if (AuditState == 0)
                         {
                             opt = "同意上报";
-                            var userid = AddLog(model.F_ID, model.F_State.Value, deptmodelsname + nowUser.F_UserName + "(" + nowUser.F_UserCode + ")" + "工单审批：同意上报" + AuditCont, (int)EnumItemType.audit, (int)EnumItemOpt.reaudit, "", 0, nowUser, overtime, sms);
+                            var userid = AddLog(model.F_ID, model.F_State.Value, deptmodelsname + nowUser.F_UserName + "(" + nowUser.F_WorkNumber + ")" + "工单审批：同意上报" + AuditCont, (int)EnumItemType.audit, (int)EnumItemOpt.reaudit, "", 0, nowUser, overtime, sms);
                             res = GetDaQucirCulation(nowUser, DateTime.Now.ToString(), model.F_ID, true);
                             if (userid <= 0 || !res)
                                 res = false;
@@ -987,7 +987,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                         else if (AuditState == 1)
                         {
                             opt = "驳回修订";
-                            var userid = AddLog(model.F_ID, model.F_State.Value, deptmodelsname + nowUser.F_UserName + "(" + nowUser.F_UserCode + ")" + "工单审批：驳回修订" + AuditCont, (int)EnumItemType.audit, (int)EnumItemOpt.reback, toussers, 0, nowUser, overtime, sms);
+                            var userid = AddLog(model.F_ID, model.F_State.Value, deptmodelsname + nowUser.F_UserName + "(" + nowUser.F_WorkNumber + ")" + "工单审批：驳回修订" + AuditCont, (int)EnumItemType.audit, (int)EnumItemOpt.reback, toussers, 0, nowUser, overtime, sms);
                             if (userid <= 0)
                                 res = false;
                             wostate = 16;
@@ -995,7 +995,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                         else
                         {
                             opt = "强制结案";
-                            var userid = AddLog(model.F_ID, model.F_State.Value, deptmodelsname + nowUser.F_UserName + "(" + nowUser.F_UserCode + ")" + "工单审批：强制结案" + AuditCont, (int)EnumItemType.audit, (int)EnumItemOpt.visit, "", 0, nowUser, overtime, sms);
+                            var userid = AddLog(model.F_ID, model.F_State.Value, deptmodelsname + nowUser.F_UserName + "(" + nowUser.F_WorkNumber + ")" + "工单审批：强制结案" + AuditCont, (int)EnumItemType.audit, (int)EnumItemOpt.visit, "", 0, nowUser, overtime, sms);
                             if (userid <= 0)
                                 res = false;
                             wostate = 11;
@@ -1161,8 +1161,8 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     {
                         DateTime time = DateTime.Parse(it.F_CreateTime.ToString()).AddHours(24);
                         Model.T_Wo_WorkOrder model = workOrder .GetModel(it.F_WoID);
-                        AddLog(model.F_ID, model.F_State.Value, deptmodelsname + ua.F_UserName + "(" + ua.F_UserCode + ")" + "未审批流转大区经理", (int)EnumItemType.audit, (int)EnumItemOpt.audit, user.F_UserCode, user.F_DeptId, ua, 0, 0);
-                        AddLog(model.F_ID, model.F_State.Value, deptname + user.F_UserName + "(" + user.F_UserCode + ")" + "待审批", (int)EnumItemType.audit, (int)EnumItemOpt.audit, user.F_UserCode, user.F_DeptId, user, 0, 0);
+                        AddLog(model.F_ID, model.F_State.Value, deptmodelsname + ua.F_UserName + "(" + ua.F_WorkNumber + ")" + "未审批流转大区经理", (int)EnumItemType.audit, (int)EnumItemOpt.audit, user.F_UserCode, user.F_DeptId, ua, 0, 0);
+                        AddLog(model.F_ID, model.F_State.Value, deptname + user.F_UserName + "(" + user.F_WorkNumber + ")" + "待审批", (int)EnumItemType.audit, (int)EnumItemOpt.audit, user.F_UserCode, user.F_DeptId, user, 0, 0);
                     }
                     else if (hours >= 48)
                     {
@@ -1204,8 +1204,8 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                 {
                                     deptmodelsname = deptmodels.F_DeptName + "-";
                                 }
-                                AddLog(model.F_ID, model.F_State.Value, deptmodelsname + user.F_UserName + "(" + user.F_UserCode + ")" + "未审批流转大区经理", (int)EnumItemType.audit, (int)EnumItemOpt.audit, ua.F_UserCode, ua.F_DeptId, user, 0, 0);
-                                AddLog(model.F_ID, model.F_State.Value, deptname + ua.F_UserName + "(" + ua.F_UserCode + ")" + "待审批", (int)EnumItemType.audit, (int)EnumItemOpt.audit, ua.F_UserCode, ua.F_DeptId, ua, 0, 0);
+                                AddLog(model.F_ID, model.F_State.Value, deptmodelsname + user.F_UserName + "(" + user.F_WorkNumber + ")" + "未审批流转大区经理", (int)EnumItemType.audit, (int)EnumItemOpt.audit, ua.F_UserCode, ua.F_DeptId, user, 0, 0);
+                                AddLog(model.F_ID, model.F_State.Value, deptname + ua.F_UserName + "(" + ua.F_WorkNumber + ")" + "待审批", (int)EnumItemType.audit, (int)EnumItemOpt.audit, ua.F_UserCode, ua.F_DeptId, ua, 0, 0);
                                 if (hours < 48)
                                 {
                                     str = GetID(str, it.F_WoID);
@@ -1336,7 +1336,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 deptname = deptmodel.F_DeptName + "-";
             }
             #endregion
-            var content = deptname + nowUser.F_UserName + "(" + nowUser.F_UserCode + ")" + "微信审批：" + opt + cont;
+            var content = deptname + nowUser.F_UserName + "(" + nowUser.F_WorkNumber + ")" + "微信审批：" + opt + cont;
             //获取上一级处理人员
             var touser = "";
             var itemid = AddLog((int)model.F_ID, wostate, content, (int)EnumItemType.deal, optbut, touser, 0, nowUser, limit, sms);
@@ -1389,7 +1389,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 deptname = deptmodel.F_DeptName + "-";
             }
             #endregion
-            var content = deptname + nowUser.F_UserName + "(" + nowUser.F_UserCode + ")" + "延期审批："+ opt + cont;
+            var content = deptname + nowUser.F_UserName + "(" + nowUser.F_WorkNumber + ")" + "延期审批："+ opt + cont;
             //获取上一级处理人员
             var touser = "";
             var itemlast = itembll.GetModelList(" F_ItemType=" + (int)EnumItemType.deal + " and  F_WoID='" + model.F_ID + "' and F_NextUser='" + nowUser.F_UserCode + "' order by F_CreateTime desc").FirstOrDefault();
@@ -3207,12 +3207,12 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                     deptname1 = deptmodel1.F_DeptName + "-";
                                 }
 
-                                AddLog(modlelist.F_ID, 0, deptname + ua.F_UserName + "(" + ua.F_UserCode + ")" + "创建工单", (int)EnumWorkOrderState.neworder, (int)EnumItemOpt.create, user.F_UserCode, user.F_DeptId, ua, 0, 0);
-                                AddLog(modlelist.F_ID, modlelist.F_State.Value, deptname1 + user.F_UserName + "(" + user.F_UserCode + ")" + "待审批", (int)EnumItemType.audit, (int)EnumItemOpt.audit, user.F_UserCode, user.F_DeptId, ua, 0, 0);
+                                AddLog(modlelist.F_ID, 0, deptname + ua.F_UserName + "(" + ua.F_WorkNumber + ")" + "创建工单", (int)EnumWorkOrderState.neworder, (int)EnumItemOpt.create, user.F_UserCode, user.F_DeptId, ua, 0, 0);
+                                AddLog(modlelist.F_ID, modlelist.F_State.Value, deptname1 + user.F_UserName + "(" + user.F_WorkNumber + ")" + "待审批", (int)EnumItemType.audit, (int)EnumItemOpt.audit, user.F_UserCode, user.F_DeptId, ua, 0, 0);
                             }
                             else
                             {
-                                AddLog(modlelist.F_ID, 0, deptname + ua.F_UserName + "(" + ua.F_UserCode + ")" + "创建工单", (int)EnumWorkOrderState.neworder, (int)EnumItemOpt.create, "", 0, ua, 0, 0);
+                                AddLog(modlelist.F_ID, 0, deptname + ua.F_UserName + "(" + ua.F_WorkNumber + ")" + "创建工单", (int)EnumWorkOrderState.neworder, (int)EnumItemOpt.create, "", 0, ua, 0, 0);
                                 var res = AssignWO(ua, modlelist, input, "流转市场管理科", 37, 0, 0, 0);
                                 if (res)
                                     return Success("添加成功");
@@ -3222,7 +3222,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                         }
                         else
                         {
-                            AddLog(modlelist.F_ID, modlelist.F_State.Value, deptname + ua.F_UserName + "(" + ua.F_UserCode + ")" + "创建工单", (int)EnumWorkOrderState.neworder, (int)EnumItemOpt.create, "", 0, ua, 0, 0);
+                            AddLog(modlelist.F_ID, modlelist.F_State.Value, deptname + ua.F_UserName + "(" + ua.F_WorkNumber + ")" + "创建工单", (int)EnumWorkOrderState.neworder, (int)EnumItemOpt.create, "", 0, ua, 0, 0);
                         }
                     return Success("添加成功！");
 
@@ -3417,7 +3417,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                         deptname = deptmodel.F_DeptName + "-";
                     }
                     #endregion
-                    AddLog(input.F_ID, model.F_State.Value, deptname + ua.F_UserName + "(" + ua.F_UserCode + ")" + "修改工单", (int)EnumItemType.update, (int)EnumItemOpt.update, "", 0, ua,0,0);
+                    AddLog(input.F_ID, model.F_State.Value, deptname + ua.F_UserName + "(" + ua.F_WorkNumber + ")" + "修改工单", (int)EnumItemType.update, (int)EnumItemOpt.update, "", 0, ua,0,0);
                     Model.T_Sys_RoleInfo ro = rolebll.GetModel(ua.F_RoleId);
                     if (ro !=null )
                     {
@@ -3434,7 +3434,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                 }
                                 var deptmodel1 = departmentBLL.GetModel(ua.F_DeptId);
 
-                                AddLog(input.F_ID, model.F_State.Value, deptname1 + user.F_UserName + "(" + user.F_UserCode + ")" + "待审批", (int)EnumItemType.audit, (int)EnumItemOpt.audit, user.F_UserCode, user.F_DeptId, ua, 0, 0);
+                                AddLog(input.F_ID, model.F_State.Value, deptname1 + user.F_UserName + "(" + user.F_WorkNumber + ")" + "待审批", (int)EnumItemType.audit, (int)EnumItemOpt.audit, user.F_UserCode, user.F_DeptId, ua, 0, 0);
                             }
                             else
                             {
@@ -3657,7 +3657,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     }
                     else if (model1[i].F_State == 10)
                     {
-                        model.F_StateName = "已完结";
+                        model.F_StateName = "已处理";
                     }
                     else if (model1[i].F_State == 11)
                     {
@@ -4445,7 +4445,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                             deptname = deptmodel.F_DeptName + "-";
                         }
 
-                        AddLog(modlelist.F_ID, modlelist.F_State.Value, deptname + ua.F_UserName + "(" + ua.F_UserCode + ")" + "添加工单", (int)EnumWorkOrderState.neworder, (int)EnumItemOpt.create, "", 0, ua, 0, 0);
+                        AddLog(modlelist.F_ID, modlelist.F_State.Value, deptname + ua.F_UserName + "(" + ua.F_WorkNumber + ")" + "添加工单", (int)EnumWorkOrderState.neworder, (int)EnumItemOpt.create, "", 0, ua, 0, 0);
                         var res = AssignWO(ua, modlelist, inputs, cont, clbm, clid, overtime, sms);
                             if (res)
                                 return Success("转派成功");
@@ -4565,7 +4565,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                         {
                             deptname = deptmodel.F_DeptName + "-";
                         }
-                        AddLog(modlelist.F_ID, modlelist.F_State.Value, deptname + ua.F_UserName + "(" + ua.F_UserCode + ")" + "添加工单", (int)EnumWorkOrderState.neworder, (int)EnumItemOpt.end, "", 0, ua, 0, 0);
+                        AddLog(modlelist.F_ID, modlelist.F_State.Value, deptname + ua.F_UserName + "(" + ua.F_WorkNumber + ")" + "添加工单", (int)EnumWorkOrderState.neworder, (int)EnumItemOpt.end, "", 0, ua, 0, 0);
                         var res = Overorder(ua, modlelist, 1);
                         if (res)
                             return Success("完结成功");
@@ -4898,7 +4898,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                         {
                             deptname = deptmodel.F_DeptName + "-";
                         }
-                        AddLog(model.F_ID, model.F_State.Value, deptname + ua.F_UserName + "(" + ua.F_UserCode + ")" + "高层已审批", (int)EnumItemType.audit, (int)EnumItemOpt.reaudit, "", 0, ua, 0, 0, "",1);
+                        AddLog(model.F_ID, model.F_State.Value, deptname + ua.F_UserName + "(" + ua.F_WorkNumber + ")" + "高层已审批", (int)EnumItemType.audit, (int)EnumItemOpt.reaudit, "", 0, ua, 0, 0, "",1);
                         bool n = workOrder.Update(model);
                         if (n)
                             return Success("审批成功");
@@ -5114,7 +5114,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     deptname = deptmodel.F_DeptName + "-";
                 }
                 #endregion
-                var content = deptname + nowUser.F_UserName + "(" + nowUser.F_UserCode + ")催办工单，催办说明：" + cont;
+                var content = deptname + nowUser.F_UserName + "(" + nowUser.F_WorkNumber + ")催办工单，催办说明：" + cont;
                 long itemid = AddLog(model.F_ID , model.F_State .Value, content, (int)EnumItemType.urge, (int)EnumItemOpt.urge, touser, todept, nowUser,model .F_limit  , int.Parse( itemlast.F_IsSMS.ToString () ));
                 if (itemid > 0)
                 {
@@ -5163,7 +5163,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 deptname = deptmodel.F_DeptName + "-";
             }
             #endregion
-            var content = deptname + nowUser.F_UserName + "(" + nowUser.F_UserCode + ")" + "延期工单，延期说明：" + cont;
+            var content = deptname + nowUser.F_UserName + "(" + nowUser.F_WorkNumber + ")" + "延期工单，延期说明：" + cont;
             //获取上一级处理人员
             var touser = "";
             var itemlast = itembll.GetModelList(" F_ItemType=" + (int)EnumItemType.deal + " and  F_WoID='" + model.F_ID + "' and F_NextUser='" + nowUser.F_UserCode + "' order by F_CreateTime desc").FirstOrDefault();
@@ -5214,7 +5214,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 deptname = deptmodel.F_DeptName + "-";
             }
             #endregion
-            var content = deptname + nowUser.F_UserName + "(" + nowUser.F_UserCode + ")" + opt + "工单，退回说明：" + cont;
+            var content = deptname + nowUser.F_UserName + "(" + nowUser.F_WorkNumber + ")" + opt + "工单，退回说明：" + cont;
             //获取上一级处理人员
             var touser = ""; var deptid=0;
             var itemlast = itembll.GetModelList(" F_ItemType=" + (int)EnumItemType.deal + " and F_NextDept =" + nowUser.F_DeptId + " and F_WoState =" + F_OptType + " and  F_WoID='" + model.F_ID  + "' order by F_CreateTime desc").FirstOrDefault();
@@ -5309,7 +5309,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 deptname = deptmodel.F_DeptName + "-";
             }
             #endregion
-            var content = deptname + nowUser.F_UserName + "(" + nowUser.F_UserCode + ")" + opt + "工单:回访结果：" + cont+" , " + "工单:呼叫结果：" + call;
+            var content = deptname + nowUser.F_UserName + "(" + nowUser.F_WorkNumber + ")" + opt + "工单:回访结果：" + cont+" , " + "工单:呼叫结果：" + call;
            
             var touser = "";
             var itemlast = itembll.GetModelList(" F_ItemType=" + (int)EnumItemType.deal + " and  F_WoID='" + model.F_ID + "' and F_NextUser='" + nowUser.F_UserCode + "' order by F_CreateTime desc").FirstOrDefault();
@@ -5379,7 +5379,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 deptname = deptmodel.F_DeptName + "-";
             }
             #endregion
-            var content = deptname + nowUser.F_UserName + "(" + nowUser.F_UserCode + ")" + opt + "完结工单";
+            var content = deptname + nowUser.F_UserName + "(" + nowUser.F_WorkNumber + ")" + opt + "完结工单";
 
             var touser = "";
             var itemlast = itembll.GetModelList(" F_ItemType=" + (int)EnumItemType.deal + " and  F_WoID='" + model.F_ID + "' and F_NextUser='" + nowUser.F_UserCode + "' order by F_CreateTime desc").FirstOrDefault();
@@ -5458,7 +5458,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
             var optcont = "";
             if (!string.IsNullOrEmpty(cont))
                 optcont = "，处理内容：" + cont;
-            var content = deptname + nowUser.F_UserName + "(" + nowUser.F_UserCode + ")" + opt + "工单" + optcont;
+            var content = deptname + nowUser.F_UserName + "(" + nowUser.F_WorkNumber + ")" + opt + "工单" + optcont;
             var itemid = AddLog(model.F_ID , wostate, content, (int)EnumItemType.deal, optbut, "", 0, nowUser, model.F_limit , sms );
             if (itemid > 0)
             {
@@ -5552,7 +5552,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 deptname = deptmodel.F_DeptName + "-";
             }
             #endregion
-            var content = deptname + nowUser.F_UserName + "(" + nowUser.F_UserCode + ")" + opt;
+            var content = deptname + nowUser.F_UserName + "(" + nowUser.F_WorkNumber + ")" + opt;
             var itemid = AddLog((int)model.F_ID , wostate, content, (int)EnumItemType.deal, optbut, nowUser.F_UserCode , nowUser.F_DeptId , nowUser, overtime,sms );
             if (itemid > 0)
             {
@@ -5775,7 +5775,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
             var optcont = "";
             if (!string.IsNullOrEmpty(cont))
                 optcont = "，说明：" + cont;
-            var content = deptname + nowUser.F_UserName + "(" + nowUser.F_UserCode + ")" + opt + "工单给 " + tousername + optcont;
+            var content = deptname + nowUser.F_UserName + "(" + nowUser.F_WorkNumber + ")" + opt + "工单给 " + tousername + optcont;
             var itemid = AddLog(model.F_ID , wostate, content, (int)EnumItemType.deal, optbut, touser, clbm, nowUser , overtime,sms, creat);
             if (itemid > 0)
             {