Przeglądaj źródła

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

duhongyu 6 lat temu
rodzic
commit
be0f762628

+ 23 - 23
codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/weixin/WxLoginController.cs

1202
                     if (AuditState == 0)
1202
                     if (AuditState == 0)
1203
                     {
1203
                     {
1204
                         opt = "同意上报";
1204
                         opt = "同意上报";
1205
-                        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);
1206
-                        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);
1205
+                        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);
1206
+                        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);
1207
                         if (userid <= 0 || uaid <= 0)
1207
                         if (userid <= 0 || uaid <= 0)
1208
                             res = false;
1208
                             res = false;
1209
                     }
1209
                     }
1210
                     else if (AuditState == 1)
1210
                     else if (AuditState == 1)
1211
                     {
1211
                     {
1212
                         opt = "驳回修订";
1212
                         opt = "驳回修订";
1213
-                        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);
1213
+                        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);
1214
                         if (userid <= 0)
1214
                         if (userid <= 0)
1215
                             res = false;
1215
                             res = false;
1216
                     }
1216
                     }
1218
                     {
1218
                     {
1219
                         opt = "强制结案";
1219
                         opt = "强制结案";
1220
                         wostate = 11;
1220
                         wostate = 11;
1221
-                        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);
1221
+                        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);
1222
                         if (userid <= 0)
1222
                         if (userid <= 0)
1223
                             res = false;
1223
                             res = false;
1224
                     }
1224
                     }
1234
                         if (AuditState == 0)
1234
                         if (AuditState == 0)
1235
                         {
1235
                         {
1236
                             opt = "同意上报";
1236
                             opt = "同意上报";
1237
-                            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);
1237
+                            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);
1238
                             res = GetDaQucirCulation(nowUser, DateTime.Now.ToString(), model.F_ID,true );
1238
                             res = GetDaQucirCulation(nowUser, DateTime.Now.ToString(), model.F_ID,true );
1239
                             if (userid <= 0 || !res)
1239
                             if (userid <= 0 || !res)
1240
                                 res = false;
1240
                                 res = false;
1243
                         else if (AuditState == 1)
1243
                         else if (AuditState == 1)
1244
                         {
1244
                         {
1245
                             opt = "驳回修订";
1245
                             opt = "驳回修订";
1246
-                            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);
1246
+                            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);
1247
                             if (userid <= 0)
1247
                             if (userid <= 0)
1248
                                 res = false;
1248
                                 res = false;
1249
                             wostate = 16;
1249
                             wostate = 16;
1251
                         else
1251
                         else
1252
                         {
1252
                         {
1253
                             opt = "强制结案";
1253
                             opt = "强制结案";
1254
-                            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);
1254
+                            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);
1255
                             if (userid <= 0 )
1255
                             if (userid <= 0 )
1256
                                 res = false;
1256
                                 res = false;
1257
                             wostate = 11;
1257
                             wostate = 11;
1487
                     {
1487
                     {
1488
                         DateTime time = DateTime.Parse(it.F_CreateTime.ToString()).AddHours(24);
1488
                         DateTime time = DateTime.Parse(it.F_CreateTime.ToString()).AddHours(24);
1489
                         Model.T_Wo_WorkOrder model = woBLL.GetModel(it.F_WoID);
1489
                         Model.T_Wo_WorkOrder model = woBLL.GetModel(it.F_WoID);
1490
-                        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);
1491
-                        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);
1490
+                        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);
1491
+                        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);
1492
                     }
1492
                     }
1493
                     else if (hours >= 48)
1493
                     else if (hours >= 48)
1494
                     {
1494
                     {
1530
                                 {
1530
                                 {
1531
                                     deptmodelsname = deptmodels.F_DeptName + "-";
1531
                                     deptmodelsname = deptmodels.F_DeptName + "-";
1532
                                 }
1532
                                 }
1533
-                                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);
1534
-                                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);
1533
+                                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);
1534
+                                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);
1535
                                 if (hours < 48)
1535
                                 if (hours < 48)
1536
                                 {
1536
                                 {
1537
                                     str = GetID(str, it.F_WoID);
1537
                                     str = GetID(str, it.F_WoID);
1730
                     }
1730
                     }
1731
                     else if (model1[i].F_State == 10)
1731
                     else if (model1[i].F_State == 10)
1732
                     {
1732
                     {
1733
-                        model.F_StateName = "已完结";
1733
+                        model.F_StateName = "已处理";
1734
                     }
1734
                     }
1735
                     else if (model1[i].F_State == 11)
1735
                     else if (model1[i].F_State == 11)
1736
                     {
1736
                     {
2637
                                 {
2637
                                 {
2638
                                     deptname1 = deptmodel1.F_DeptName + "-";
2638
                                     deptname1 = deptmodel1.F_DeptName + "-";
2639
                                 }
2639
                                 }
2640
-                                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);
2641
-                                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);
2640
+                                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);
2641
+                                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);
2642
                             }
2642
                             }
2643
                             else
2643
                             else
2644
                             {
2644
                             {
2648
                                 {
2648
                                 {
2649
                                     deptname1 = deptmodel1.F_DeptName + "-";
2649
                                     deptname1 = deptmodel1.F_DeptName + "-";
2650
                                 }
2650
                                 }
2651
-                                AddLog(modlelist.F_ID, 0, deptname1 + ua.F_UserName + "(" + ua.F_UserCode + ")" + "创建工单", (int)EnumWorkOrderState.neworder, (int)EnumItemOpt.create,"",0, ua, 0, 0);
2651
+                                AddLog(modlelist.F_ID, 0, deptname1 + ua.F_UserName + "(" + ua.F_WorkNumber + ")" + "创建工单", (int)EnumWorkOrderState.neworder, (int)EnumItemOpt.create,"",0, ua, 0, 0);
2652
                                 var res = AssignWO(ua, modlelist, input, "流转市场管理科", 37, 0, overtime, sms);
2652
                                 var res = AssignWO(ua, modlelist, input, "流转市场管理科", 37, 0, overtime, sms);
2653
                                 if (res)
2653
                                 if (res)
2654
                                 return Success("添加成功");
2654
                                 return Success("添加成功");
2974
             var optcont = "";
2974
             var optcont = "";
2975
             if (!string.IsNullOrEmpty(cont))
2975
             if (!string.IsNullOrEmpty(cont))
2976
                 optcont = ",说明:" + cont;
2976
                 optcont = ",说明:" + cont;
2977
-            var content = deptname + nowUser.F_UserName + "(" + nowUser.F_UserCode + ")" + opt + "工单给 " + tousername + optcont;
2977
+            var content = deptname + nowUser.F_UserName + "(" + nowUser.F_WorkNumber + ")" + opt + "工单给 " + tousername + optcont;
2978
            var itemid = AddLog(model.F_ID, wostate, content, (int)EnumItemType.deal, optbut, touser, clbm, nowUser, overtime, sms, creat);
2978
            var itemid = AddLog(model.F_ID, wostate, content, (int)EnumItemType.deal, optbut, touser, clbm, nowUser, overtime, sms, creat);
2979
             if (itemid > 0)
2979
             if (itemid > 0)
2980
             {
2980
             {
3313
                         {
3313
                         {
3314
                             deptname = deptmodel.F_DeptName + "-";
3314
                             deptname = deptmodel.F_DeptName + "-";
3315
                         }
3315
                         }
3316
-                        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);
3316
+                        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);
3317
                         bool n = woBLL.Update(model);
3317
                         bool n = woBLL.Update(model);
3318
                             if (n)
3318
                             if (n)
3319
                             return Success("审批成功");
3319
                             return Success("审批成功");
3356
                 deptname = deptmodel.F_DeptName + "-";
3356
                 deptname = deptmodel.F_DeptName + "-";
3357
             }
3357
             }
3358
             #endregion
3358
             #endregion
3359
-            var content = deptname + nowUser.F_UserName + "(" + nowUser.F_UserCode + ")" + opt;
3359
+            var content = deptname + nowUser.F_UserName + "(" + nowUser.F_WorkNumber + ")" + opt;
3360
             var itemid = AddLog((int)model.F_ID, wostate, content, (int)EnumItemType.deal, optbut, nowUser.F_UserCode, nowUser.F_DeptId, nowUser, overtime, sms);
3360
             var itemid = AddLog((int)model.F_ID, wostate, content, (int)EnumItemType.deal, optbut, nowUser.F_UserCode, nowUser.F_DeptId, nowUser, overtime, sms);
3361
             if (itemid > 0)
3361
             if (itemid > 0)
3362
             {
3362
             {
3610
                 deptname = deptmodel.F_DeptName + "-";
3610
                 deptname = deptmodel.F_DeptName + "-";
3611
             }
3611
             }
3612
             #endregion
3612
             #endregion
3613
-            var content = deptname + nowUser.F_UserName + "(" + nowUser.F_UserCode + ")" + "延期工单,延期说明:" + cont;
3613
+            var content = deptname + nowUser.F_UserName + "(" + nowUser.F_WorkNumber + ")" + "延期工单,延期说明:" + cont;
3614
             //获取上一级处理人员
3614
             //获取上一级处理人员
3615
             var touser = "";
3615
             var touser = "";
3616
             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();
3616
             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
                 deptname = deptmodel.F_DeptName + "-";
3659
                 deptname = deptmodel.F_DeptName + "-";
3660
             }
3660
             }
3661
             #endregion
3661
             #endregion
3662
-            var content = deptname + nowUser.F_UserName + "(" + nowUser.F_UserCode + ")" + opt + "工单,退回说明:" + cont;
3662
+            var content = deptname + nowUser.F_UserName + "(" + nowUser.F_WorkNumber + ")" + opt + "工单,退回说明:" + cont;
3663
             //获取上一级处理人员
3663
             //获取上一级处理人员
3664
             var touser = ""; var deptid = 0;
3664
             var touser = ""; var deptid = 0;
3665
             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();
3665
             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
             var optcont = "";
3754
             var optcont = "";
3755
             if (!string.IsNullOrEmpty(cont))
3755
             if (!string.IsNullOrEmpty(cont))
3756
                 optcont = ",处理内容:" + cont;
3756
                 optcont = ",处理内容:" + cont;
3757
-            var content = deptname + nowUser.F_UserName + "(" + nowUser.F_UserCode + ")" + opt + "工单" + optcont;
3757
+            var content = deptname + nowUser.F_UserName + "(" + nowUser.F_WorkNumber + ")" + opt + "工单" + optcont;
3758
             var itemid = AddLog(model.F_ID, wostate, content, (int)EnumItemType.deal, optbut, "", 0, nowUser, model .F_limit , sms);
3758
             var itemid = AddLog(model.F_ID, wostate, content, (int)EnumItemType.deal, optbut, "", 0, nowUser, model .F_limit , sms);
3759
             if (itemid > 0)
3759
             if (itemid > 0)
3760
             {
3760
             {
3941
                     }
3941
                     }
3942
                     #endregion
3942
                     #endregion
3943
 
3943
 
3944
-                    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);
3944
+                    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);
3945
                     if (GetUser(input.F_WxOpenId) != null)
3945
                     if (GetUser(input.F_WxOpenId) != null)
3946
                     {
3946
                     {
3947
                         var user = GetUser(input.F_WxOpenId);
3947
                         var user = GetUser(input.F_WxOpenId);
3953
                         }
3953
                         }
3954
                         var deptmodel1 = departmentBLL.GetModel(ua.F_DeptId);
3954
                         var deptmodel1 = departmentBLL.GetModel(ua.F_DeptId);
3955
                       
3955
                       
3956
-                        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);
3956
+                        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);
3957
                     }
3957
                     }
3958
                     else
3958
                     else
3959
                     {
3959
                     {

+ 31 - 31
codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/workorder/WorkOrderNewController.cs

945
                     if (AuditState == 0)
945
                     if (AuditState == 0)
946
                     {
946
                     {
947
                         opt = "同意上报";
947
                         opt = "同意上报";
948
-                        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);
949
-                        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);
948
+                        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);
949
+                        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);
950
                         if (userid <= 0 || uaid <= 0)
950
                         if (userid <= 0 || uaid <= 0)
951
                             res = false;
951
                             res = false;
952
                     }
952
                     }
953
                     else if (AuditState == 1)
953
                     else if (AuditState == 1)
954
                     {
954
                     {
955
                         opt = "驳回修订";
955
                         opt = "驳回修订";
956
-                        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);
956
+                        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);
957
                         if (userid <= 0)
957
                         if (userid <= 0)
958
                             res = false;
958
                             res = false;
959
                     }
959
                     }
961
                     {
961
                     {
962
                         opt = "强制结案";
962
                         opt = "强制结案";
963
                         wostate = 11;
963
                         wostate = 11;
964
-                        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);
964
+                        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);
965
                         if (userid <= 0)
965
                         if (userid <= 0)
966
                             res = false;
966
                             res = false;
967
                     }
967
                     }
978
                         if (AuditState == 0)
978
                         if (AuditState == 0)
979
                         {
979
                         {
980
                             opt = "同意上报";
980
                             opt = "同意上报";
981
-                            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);
981
+                            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);
982
                             res = GetDaQucirCulation(nowUser, DateTime.Now.ToString(), model.F_ID, true);
982
                             res = GetDaQucirCulation(nowUser, DateTime.Now.ToString(), model.F_ID, true);
983
                             if (userid <= 0 || !res)
983
                             if (userid <= 0 || !res)
984
                                 res = false;
984
                                 res = false;
987
                         else if (AuditState == 1)
987
                         else if (AuditState == 1)
988
                         {
988
                         {
989
                             opt = "驳回修订";
989
                             opt = "驳回修订";
990
-                            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);
990
+                            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);
991
                             if (userid <= 0)
991
                             if (userid <= 0)
992
                                 res = false;
992
                                 res = false;
993
                             wostate = 16;
993
                             wostate = 16;
995
                         else
995
                         else
996
                         {
996
                         {
997
                             opt = "强制结案";
997
                             opt = "强制结案";
998
-                            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);
998
+                            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);
999
                             if (userid <= 0)
999
                             if (userid <= 0)
1000
                                 res = false;
1000
                                 res = false;
1001
                             wostate = 11;
1001
                             wostate = 11;
1161
                     {
1161
                     {
1162
                         DateTime time = DateTime.Parse(it.F_CreateTime.ToString()).AddHours(24);
1162
                         DateTime time = DateTime.Parse(it.F_CreateTime.ToString()).AddHours(24);
1163
                         Model.T_Wo_WorkOrder model = workOrder .GetModel(it.F_WoID);
1163
                         Model.T_Wo_WorkOrder model = workOrder .GetModel(it.F_WoID);
1164
-                        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);
1165
-                        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);
1164
+                        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);
1165
+                        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);
1166
                     }
1166
                     }
1167
                     else if (hours >= 48)
1167
                     else if (hours >= 48)
1168
                     {
1168
                     {
1204
                                 {
1204
                                 {
1205
                                     deptmodelsname = deptmodels.F_DeptName + "-";
1205
                                     deptmodelsname = deptmodels.F_DeptName + "-";
1206
                                 }
1206
                                 }
1207
-                                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);
1208
-                                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);
1207
+                                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);
1208
+                                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);
1209
                                 if (hours < 48)
1209
                                 if (hours < 48)
1210
                                 {
1210
                                 {
1211
                                     str = GetID(str, it.F_WoID);
1211
                                     str = GetID(str, it.F_WoID);
1336
                 deptname = deptmodel.F_DeptName + "-";
1336
                 deptname = deptmodel.F_DeptName + "-";
1337
             }
1337
             }
1338
             #endregion
1338
             #endregion
1339
-            var content = deptname + nowUser.F_UserName + "(" + nowUser.F_UserCode + ")" + "微信审批:" + opt + cont;
1339
+            var content = deptname + nowUser.F_UserName + "(" + nowUser.F_WorkNumber + ")" + "微信审批:" + opt + cont;
1340
             //获取上一级处理人员
1340
             //获取上一级处理人员
1341
             var touser = "";
1341
             var touser = "";
1342
             var itemid = AddLog((int)model.F_ID, wostate, content, (int)EnumItemType.deal, optbut, touser, 0, nowUser, limit, sms);
1342
             var itemid = AddLog((int)model.F_ID, wostate, content, (int)EnumItemType.deal, optbut, touser, 0, nowUser, limit, sms);
1389
                 deptname = deptmodel.F_DeptName + "-";
1389
                 deptname = deptmodel.F_DeptName + "-";
1390
             }
1390
             }
1391
             #endregion
1391
             #endregion
1392
-            var content = deptname + nowUser.F_UserName + "(" + nowUser.F_UserCode + ")" + "延期审批:"+ opt + cont;
1392
+            var content = deptname + nowUser.F_UserName + "(" + nowUser.F_WorkNumber + ")" + "延期审批:"+ opt + cont;
1393
             //获取上一级处理人员
1393
             //获取上一级处理人员
1394
             var touser = "";
1394
             var touser = "";
1395
             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();
1395
             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
                                     deptname1 = deptmodel1.F_DeptName + "-";
3207
                                     deptname1 = deptmodel1.F_DeptName + "-";
3208
                                 }
3208
                                 }
3209
 
3209
 
3210
-                                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);
3211
-                                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);
3210
+                                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);
3211
+                                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);
3212
                             }
3212
                             }
3213
                             else
3213
                             else
3214
                             {
3214
                             {
3215
-                                AddLog(modlelist.F_ID, 0, deptname + ua.F_UserName + "(" + ua.F_UserCode + ")" + "创建工单", (int)EnumWorkOrderState.neworder, (int)EnumItemOpt.create, "", 0, ua, 0, 0);
3215
+                                AddLog(modlelist.F_ID, 0, deptname + ua.F_UserName + "(" + ua.F_WorkNumber + ")" + "创建工单", (int)EnumWorkOrderState.neworder, (int)EnumItemOpt.create, "", 0, ua, 0, 0);
3216
                                 var res = AssignWO(ua, modlelist, input, "流转市场管理科", 37, 0, 0, 0);
3216
                                 var res = AssignWO(ua, modlelist, input, "流转市场管理科", 37, 0, 0, 0);
3217
                                 if (res)
3217
                                 if (res)
3218
                                     return Success("添加成功");
3218
                                     return Success("添加成功");
3222
                         }
3222
                         }
3223
                         else
3223
                         else
3224
                         {
3224
                         {
3225
-                            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);
3225
+                            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);
3226
                         }
3226
                         }
3227
                     return Success("添加成功!");
3227
                     return Success("添加成功!");
3228
 
3228
 
3417
                         deptname = deptmodel.F_DeptName + "-";
3417
                         deptname = deptmodel.F_DeptName + "-";
3418
                     }
3418
                     }
3419
                     #endregion
3419
                     #endregion
3420
-                    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);
3420
+                    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);
3421
                     Model.T_Sys_RoleInfo ro = rolebll.GetModel(ua.F_RoleId);
3421
                     Model.T_Sys_RoleInfo ro = rolebll.GetModel(ua.F_RoleId);
3422
                     if (ro !=null )
3422
                     if (ro !=null )
3423
                     {
3423
                     {
3434
                                 }
3434
                                 }
3435
                                 var deptmodel1 = departmentBLL.GetModel(ua.F_DeptId);
3435
                                 var deptmodel1 = departmentBLL.GetModel(ua.F_DeptId);
3436
 
3436
 
3437
-                                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);
3437
+                                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);
3438
                             }
3438
                             }
3439
                             else
3439
                             else
3440
                             {
3440
                             {
3657
                     }
3657
                     }
3658
                     else if (model1[i].F_State == 10)
3658
                     else if (model1[i].F_State == 10)
3659
                     {
3659
                     {
3660
-                        model.F_StateName = "已完结";
3660
+                        model.F_StateName = "已处理";
3661
                     }
3661
                     }
3662
                     else if (model1[i].F_State == 11)
3662
                     else if (model1[i].F_State == 11)
3663
                     {
3663
                     {
4445
                             deptname = deptmodel.F_DeptName + "-";
4445
                             deptname = deptmodel.F_DeptName + "-";
4446
                         }
4446
                         }
4447
 
4447
 
4448
-                        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);
4448
+                        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);
4449
                         var res = AssignWO(ua, modlelist, inputs, cont, clbm, clid, overtime, sms);
4449
                         var res = AssignWO(ua, modlelist, inputs, cont, clbm, clid, overtime, sms);
4450
                             if (res)
4450
                             if (res)
4451
                                 return Success("转派成功");
4451
                                 return Success("转派成功");
4565
                         {
4565
                         {
4566
                             deptname = deptmodel.F_DeptName + "-";
4566
                             deptname = deptmodel.F_DeptName + "-";
4567
                         }
4567
                         }
4568
-                        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);
4568
+                        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);
4569
                         var res = Overorder(ua, modlelist, 1);
4569
                         var res = Overorder(ua, modlelist, 1);
4570
                         if (res)
4570
                         if (res)
4571
                             return Success("完结成功");
4571
                             return Success("完结成功");
4898
                         {
4898
                         {
4899
                             deptname = deptmodel.F_DeptName + "-";
4899
                             deptname = deptmodel.F_DeptName + "-";
4900
                         }
4900
                         }
4901
-                        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);
4901
+                        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);
4902
                         bool n = workOrder.Update(model);
4902
                         bool n = workOrder.Update(model);
4903
                         if (n)
4903
                         if (n)
4904
                             return Success("审批成功");
4904
                             return Success("审批成功");
5114
                     deptname = deptmodel.F_DeptName + "-";
5114
                     deptname = deptmodel.F_DeptName + "-";
5115
                 }
5115
                 }
5116
                 #endregion
5116
                 #endregion
5117
-                var content = deptname + nowUser.F_UserName + "(" + nowUser.F_UserCode + ")催办工单,催办说明:" + cont;
5117
+                var content = deptname + nowUser.F_UserName + "(" + nowUser.F_WorkNumber + ")催办工单,催办说明:" + cont;
5118
                 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 () ));
5118
                 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 () ));
5119
                 if (itemid > 0)
5119
                 if (itemid > 0)
5120
                 {
5120
                 {
5163
                 deptname = deptmodel.F_DeptName + "-";
5163
                 deptname = deptmodel.F_DeptName + "-";
5164
             }
5164
             }
5165
             #endregion
5165
             #endregion
5166
-            var content = deptname + nowUser.F_UserName + "(" + nowUser.F_UserCode + ")" + "延期工单,延期说明:" + cont;
5166
+            var content = deptname + nowUser.F_UserName + "(" + nowUser.F_WorkNumber + ")" + "延期工单,延期说明:" + cont;
5167
             //获取上一级处理人员
5167
             //获取上一级处理人员
5168
             var touser = "";
5168
             var touser = "";
5169
             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();
5169
             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
                 deptname = deptmodel.F_DeptName + "-";
5214
                 deptname = deptmodel.F_DeptName + "-";
5215
             }
5215
             }
5216
             #endregion
5216
             #endregion
5217
-            var content = deptname + nowUser.F_UserName + "(" + nowUser.F_UserCode + ")" + opt + "工单,退回说明:" + cont;
5217
+            var content = deptname + nowUser.F_UserName + "(" + nowUser.F_WorkNumber + ")" + opt + "工单,退回说明:" + cont;
5218
             //获取上一级处理人员
5218
             //获取上一级处理人员
5219
             var touser = ""; var deptid=0;
5219
             var touser = ""; var deptid=0;
5220
             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();
5220
             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
                 deptname = deptmodel.F_DeptName + "-";
5309
                 deptname = deptmodel.F_DeptName + "-";
5310
             }
5310
             }
5311
             #endregion
5311
             #endregion
5312
-            var content = deptname + nowUser.F_UserName + "(" + nowUser.F_UserCode + ")" + opt + "工单:回访结果:" + cont+" , " + "工单:呼叫结果:" + call;
5312
+            var content = deptname + nowUser.F_UserName + "(" + nowUser.F_WorkNumber + ")" + opt + "工单:回访结果:" + cont+" , " + "工单:呼叫结果:" + call;
5313
            
5313
            
5314
             var touser = "";
5314
             var touser = "";
5315
             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();
5315
             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
                 deptname = deptmodel.F_DeptName + "-";
5379
                 deptname = deptmodel.F_DeptName + "-";
5380
             }
5380
             }
5381
             #endregion
5381
             #endregion
5382
-            var content = deptname + nowUser.F_UserName + "(" + nowUser.F_UserCode + ")" + opt + "完结工单";
5382
+            var content = deptname + nowUser.F_UserName + "(" + nowUser.F_WorkNumber + ")" + opt + "完结工单";
5383
 
5383
 
5384
             var touser = "";
5384
             var touser = "";
5385
             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();
5385
             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
             var optcont = "";
5458
             var optcont = "";
5459
             if (!string.IsNullOrEmpty(cont))
5459
             if (!string.IsNullOrEmpty(cont))
5460
                 optcont = ",处理内容:" + cont;
5460
                 optcont = ",处理内容:" + cont;
5461
-            var content = deptname + nowUser.F_UserName + "(" + nowUser.F_UserCode + ")" + opt + "工单" + optcont;
5461
+            var content = deptname + nowUser.F_UserName + "(" + nowUser.F_WorkNumber + ")" + opt + "工单" + optcont;
5462
             var itemid = AddLog(model.F_ID , wostate, content, (int)EnumItemType.deal, optbut, "", 0, nowUser, model.F_limit , sms );
5462
             var itemid = AddLog(model.F_ID , wostate, content, (int)EnumItemType.deal, optbut, "", 0, nowUser, model.F_limit , sms );
5463
             if (itemid > 0)
5463
             if (itemid > 0)
5464
             {
5464
             {
5552
                 deptname = deptmodel.F_DeptName + "-";
5552
                 deptname = deptmodel.F_DeptName + "-";
5553
             }
5553
             }
5554
             #endregion
5554
             #endregion
5555
-            var content = deptname + nowUser.F_UserName + "(" + nowUser.F_UserCode + ")" + opt;
5555
+            var content = deptname + nowUser.F_UserName + "(" + nowUser.F_WorkNumber + ")" + opt;
5556
             var itemid = AddLog((int)model.F_ID , wostate, content, (int)EnumItemType.deal, optbut, nowUser.F_UserCode , nowUser.F_DeptId , nowUser, overtime,sms );
5556
             var itemid = AddLog((int)model.F_ID , wostate, content, (int)EnumItemType.deal, optbut, nowUser.F_UserCode , nowUser.F_DeptId , nowUser, overtime,sms );
5557
             if (itemid > 0)
5557
             if (itemid > 0)
5558
             {
5558
             {
5775
             var optcont = "";
5775
             var optcont = "";
5776
             if (!string.IsNullOrEmpty(cont))
5776
             if (!string.IsNullOrEmpty(cont))
5777
                 optcont = ",说明:" + cont;
5777
                 optcont = ",说明:" + cont;
5778
-            var content = deptname + nowUser.F_UserName + "(" + nowUser.F_UserCode + ")" + opt + "工单给 " + tousername + optcont;
5778
+            var content = deptname + nowUser.F_UserName + "(" + nowUser.F_WorkNumber + ")" + opt + "工单给 " + tousername + optcont;
5779
             var itemid = AddLog(model.F_ID , wostate, content, (int)EnumItemType.deal, optbut, touser, clbm, nowUser , overtime,sms, creat);
5779
             var itemid = AddLog(model.F_ID , wostate, content, (int)EnumItemType.deal, optbut, touser, clbm, nowUser , overtime,sms, creat);
5780
             if (itemid > 0)
5780
             if (itemid > 0)
5781
             {
5781
             {