duhongyu лет назад: 4
Родитель
Сommit
8dd789d824

+ 14 - 5
CallCenterApi/CallCenterApi.DAL/T_Bus_Feedback.cs

@@ -38,9 +38,9 @@ namespace CallCenterApi.DAL
38 38
         {
39 39
             StringBuilder strSql = new StringBuilder();
40 40
             strSql.Append("insert into T_Bus_Feedback(");
41
-            strSql.Append("F_AssignedId,F_WorkOrderId,F_Result,F_CreateTime,F_CreateUser,F_CreateDeptId,F_IsFeedEnd,F_File,F_Type,F_State,F_IsAudit,F_AuditUser,F_AuditTime,F_IsDelete,F_DeleteUser,F_DeleteTime,F_DealUser,F_AuditReason,F_IsProResult,F_ProSituation,F_IsProtect,F_DealUserContact,F_ConnectTime,F_ConnectMode,F_ReplyContent,F_IsSatisfied,F_Duties,F_Situation,F_Unsuccessful,F_AuditPost)");
41
+            strSql.Append("F_AssignedId,F_WorkOrderId,F_Result,F_CreateTime,F_CreateUser,F_CreateDeptId,F_IsFeedEnd,F_File,F_Type,F_State,F_IsAudit,F_AuditUser,F_AuditTime,F_IsDelete,F_DeleteUser,F_DeleteTime,F_DealUser,F_AuditReason,F_IsProResult,F_ProSituation,F_IsProtect,F_DealUserContact,F_ConnectTime,F_ConnectMode,F_ReplyContent,F_IsSatisfied,F_Duties,F_Situation,F_Unsuccessful,F_AuditPost,F_AuditContact)");
42 42
             strSql.Append(" values (");
43
-            strSql.Append("@F_AssignedId,@F_WorkOrderId,@F_Result,@F_CreateTime,@F_CreateUser,@F_CreateDeptId,@F_IsFeedEnd,@F_File,@F_Type,@F_State,@F_IsAudit,@F_AuditUser,@F_AuditTime,@F_IsDelete,@F_DeleteUser,@F_DeleteTime,@F_DealUser,@F_AuditReason,@F_IsProResult,@F_ProSituation,@F_IsProtect,@F_DealUserContact,@F_ConnectTime,@F_ConnectMode,@F_ReplyContent,@F_IsSatisfied,@F_Duties,@F_Situation,@F_Unsuccessful,@F_AuditPost)");
43
+            strSql.Append("@F_AssignedId,@F_WorkOrderId,@F_Result,@F_CreateTime,@F_CreateUser,@F_CreateDeptId,@F_IsFeedEnd,@F_File,@F_Type,@F_State,@F_IsAudit,@F_AuditUser,@F_AuditTime,@F_IsDelete,@F_DeleteUser,@F_DeleteTime,@F_DealUser,@F_AuditReason,@F_IsProResult,@F_ProSituation,@F_IsProtect,@F_DealUserContact,@F_ConnectTime,@F_ConnectMode,@F_ReplyContent,@F_IsSatisfied,@F_Duties,@F_Situation,@F_Unsuccessful,@F_AuditPost,@F_AuditContact)");
44 44
             strSql.Append(";select @@IDENTITY");
45 45
             SqlParameter[] parameters = {
46 46
                     new SqlParameter("@F_AssignedId", SqlDbType.Int,4),
@@ -72,6 +72,7 @@ namespace CallCenterApi.DAL
72 72
                     new SqlParameter("@F_Duties", SqlDbType.NVarChar,200),
73 73
                      new SqlParameter("@F_Unsuccessful", SqlDbType.NVarChar,-1),
74 74
                       new SqlParameter("@F_AuditPost", SqlDbType.NVarChar,100),
75
+                       new SqlParameter("@F_AuditContact", SqlDbType.NVarChar,100),
75 76
                      
76 77
                     new SqlParameter("@F_Situation", SqlDbType.NVarChar)
77 78
             };
@@ -104,7 +105,8 @@ namespace CallCenterApi.DAL
104 105
             parameters[26].Value = model.F_Duties;
105 106
             parameters[27].Value = model.F_Unsuccessful;
106 107
             parameters[28].Value = model.F_AuditPost;
107
-            parameters[29].Value = model.F_Situation;
108
+            parameters[29].Value = model.F_AuditContact;
109
+            parameters[30].Value = model.F_Situation;
108 110
 
109 111
             object obj = DbHelperSQL.GetSingle(strSql.ToString(), parameters);
110 112
             if (obj == null)
@@ -153,6 +155,7 @@ namespace CallCenterApi.DAL
153 155
             strSql.Append("F_Unsuccessful=@F_Unsuccessful,");
154 156
             strSql.Append("F_Files=@F_Files,");
155 157
             strSql.Append("F_AuditPost=@F_AuditPost,");
158
+            strSql.Append("F_AuditContact=@F_AuditContact,");
156 159
             
157 160
             strSql.Append("F_Situation=@F_Situation");
158 161
             strSql.Append(" where F_Id=@F_Id");
@@ -187,6 +190,7 @@ namespace CallCenterApi.DAL
187 190
                      new SqlParameter("@F_Unsuccessful", SqlDbType.NVarChar,-1),
188 191
                     new SqlParameter("@F_Files", SqlDbType.VarChar,500),
189 192
                      new SqlParameter("@F_AuditPost", SqlDbType.VarChar,100),
193
+                      new SqlParameter("@F_AuditContact", SqlDbType.VarChar,100),
190 194
                     
191 195
                     new SqlParameter("@F_Situation", SqlDbType.NVarChar),
192 196
                     new SqlParameter("@F_Id", SqlDbType.Int,4)};
@@ -220,9 +224,10 @@ namespace CallCenterApi.DAL
220 224
             parameters[27].Value = model.F_Unsuccessful;
221 225
             parameters[28].Value = model.F_Files;
222 226
             parameters[29].Value = model.F_AuditPost;
227
+            parameters[30].Value = model.F_AuditContact;
223 228
             
224
-            parameters[30].Value = model.F_Situation;
225
-            parameters[31].Value = model.F_Id;
229
+            parameters[31].Value = model.F_Situation;
230
+            parameters[32].Value = model.F_Id;
226 231
 
227 232
             int rows = DbHelperSQL.ExecuteSql(strSql.ToString(), parameters);
228 233
             if (rows > 0)
@@ -442,6 +447,10 @@ namespace CallCenterApi.DAL
442 447
                 {
443 448
                     model.F_AuditPost = row["F_AuditPost"].ToString();
444 449
                 }
450
+                if (row["F_AuditContact"] != null)
451
+                {
452
+                    model.F_AuditContact = row["F_AuditContact"].ToString();
453
+                }
445 454
                 
446 455
             }
447 456
             return model;

Разница между файлами не показана из-за своего большого размера
+ 15 - 5
CallCenterApi/CallCenterApi.DAL/T_Sys_UserAccount.cs


+ 5 - 1
CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/UserAccountController.cs

@@ -155,7 +155,8 @@ namespace CallCenterApi.Interface.Controllers
155 155
                             F_WorkNumber = x.F_WorkNumber,
156 156
                             F_Company = x.F_Company,
157 157
                             F_Department = x.F_Department,
158
-                            F_Post = x.F_Post
158
+                            F_Post = x.F_Post,
159
+                            F_IsSms=x.F_IsSms
159 160
                         }),
160 161
                         total = recordCount
161 162
                     };
@@ -229,6 +230,7 @@ namespace CallCenterApi.Interface.Controllers
229 230
                 F_Company = User.F_Company ,
230 231
                 F_Department = User.F_Department ,
231 232
                 F_Post = User.F_Post ,
233
+                F_IsSms = User.F_IsSms,
232 234
                 //zxzname = zxzModel?.F_Name ?? "",
233 235
                 depname = depModel?.F_DeptName ?? ""
234 236
             });
@@ -264,6 +266,7 @@ namespace CallCenterApi.Interface.Controllers
264 266
             userAccountModel.F_DeleteFlag = 0;
265 267
             userAccountModel.F_ModifytTime = DateTime.Now;
266 268
             userAccountModel.F_LastActiveTime = DateTime.Now;
269
+            userAccountModel.F_IsSms = input.F_IsSms;
267 270
             //userAccountModel.F_HJType = input.HjType;
268 271
 
269 272
             var model = sysUserAccountBll.GetModel(input.Usercode);
@@ -327,6 +330,7 @@ namespace CallCenterApi.Interface.Controllers
327 330
             userAccountModel.F_Mobile = input.Mobile;
328 331
             userAccountModel.F_Telephone = input.Telphone;
329 332
             userAccountModel.F_Birthday = input.Birth;
333
+            userAccountModel.F_IsSms = input.F_IsSms;
330 334
             userAccountModel.F_ModifytTime = DateTime.Now;
331 335
             //userAccountModel.F_DeleteFlag = 0;
332 336
             //userAccountModel.F_HJType = input.HjType;

+ 147 - 30
CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/workorder/WorkOrderController.cs

@@ -2388,7 +2388,6 @@ namespace CallCenterApi.Interface.Controllers.workorder
2388 2388
             string strusercode = HttpUtility.UrlDecode(RequestString.GetQueryString("usercode"));
2389 2389
             string strddusercode = HttpUtility.UrlDecode(RequestString.GetQueryString("ddusercode"));//调度员
2390 2390
             string strstate = HttpUtility.UrlDecode(RequestString.GetQueryString("state"));
2391
-
2392 2391
             int source = RequestString.GetInt("source", 0);
2393 2392
             int keyid = RequestString.GetInt("keyid", 0);
2394 2393
             int type = RequestString.GetInt("type", 0);
@@ -2396,6 +2395,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
2396 2395
             int smalltype = RequestString.GetInt("smalltype", 0);
2397 2396
             int sourcearea = RequestString.GetInt("sourcearea", 0);
2398 2397
             int deptid = RequestString.GetInt("deptid", 0);
2398
+            int ejdeptid = RequestString.GetInt("ejdeptid", 0);
2399 2399
             int deptlevel = RequestString.GetInt("deptlevel", 0);
2400 2400
             int distribute = RequestString.GetInt("distribute", -1);//0未派单1已派单
2401 2401
             int blstate = RequestString.GetInt("blstate", 0);//办理状态0办理中1已办理
@@ -2879,7 +2879,10 @@ namespace CallCenterApi.Interface.Controllers.workorder
2879 2879
             {
2880 2880
                 sql += " and  (F_MainDeptId = '" + deptid + "' or F_MainDeptID3='" + deptid + "')";
2881 2881
             }
2882
-
2882
+            if (ejdeptid>0)
2883
+            {
2884
+                sql += "and F_MainDeptID3='" + ejdeptid + "'";
2885
+            }
2883 2886
             if (strpageindex.Trim() != "")
2884 2887
             {
2885 2888
                 pageindex = Convert.ToInt32(strpageindex);
@@ -5339,7 +5342,8 @@ namespace CallCenterApi.Interface.Controllers.workorder
5339 5342
             string strusercode = HttpUtility.UrlDecode(RequestString.GetQueryString("usercode"));
5340 5343
             string strddusercode = HttpUtility.UrlDecode(RequestString.GetQueryString("ddusercode"));//调度员
5341 5344
             string strstate = HttpUtility.UrlDecode(RequestString.GetQueryString("state"));
5342
-
5345
+            
5346
+                 int ejdeptid = RequestString.GetInt("ejdeptid", 0);
5343 5347
             int source = RequestString.GetInt("source", 0);
5344 5348
             int keyid = RequestString.GetInt("keyid", 0);
5345 5349
             int type = RequestString.GetInt("type", 0);
@@ -5368,6 +5372,11 @@ namespace CallCenterApi.Interface.Controllers.workorder
5368 5372
                     sql += " and F_CreateUser in (" + newusercode + ") ";
5369 5373
                 }
5370 5374
             }
5375
+
5376
+            if (ejdeptid > 0)
5377
+            {
5378
+                sql += "and F_MainDeptID3='" + ejdeptid + "'";
5379
+            }
5371 5380
             if (strddusercode.Trim() != "" && strddusercode != "undefined")
5372 5381
             {//调度员
5373 5382
                 var ddusercode = strddusercode.Trim().Split(',');
@@ -6896,7 +6905,8 @@ namespace CallCenterApi.Interface.Controllers.workorder
6896 6905
             int deptid = RequestString.GetInt("deptid", 0);
6897 6906
             int deptlevel = RequestString.GetInt("deptlevel", 0);
6898 6907
             int issatisfie = RequestString.GetInt("issatisfie", -1);//0不满意 1满意
6899
-
6908
+            int ejdeptid = RequestString.GetInt("ejdeptid", 0);
6909
+            
6900 6910
             int pageindex = RequestString.GetInt("page", 1);
6901 6911
             int pagesize = RequestString.GetInt("pagesize", 10);
6902 6912
             int business = RequestString.GetInt("business", 0);
@@ -6927,8 +6937,11 @@ namespace CallCenterApi.Interface.Controllers.workorder
6927 6937
                 sql += " and (F_ComContent like '%" + comContent + "%' " +
6928 6938
                     "or F_Content like '%" + comContent + "%'  )";
6929 6939
             }
6930
-           
6931 6940
 
6941
+            if (ejdeptid > 0)
6942
+            {
6943
+                sql += "and F_MainDeptID3='" + ejdeptid + "'";
6944
+            }
6932 6945
             if (result.Trim() != "" && result != "undefined")
6933 6946
             {
6934 6947
                 sql += " and F_Result like'%" + result + "%' ";
@@ -9709,9 +9722,18 @@ namespace CallCenterApi.Interface.Controllers.workorder
9709 9722
                                 foreach (var u in users)
9710 9723
                                 {
9711 9724
                                     msg.AddInternalMessagesInfo("工单消息", msgss + ",工单编号:" + modelT_Bus_WorkOrder.F_WorkOrderId, u.F_UserCode, curuser.F_UserCode, (int)EnumSmsType.workorder);
9712
-                                    string count = "你有新工单:" + modelT_Bus_WorkOrder.F_WorkOrderId + ",请及时查收处理。";
9713
-                                    string mag = modelT_Bus_WorkOrder.F_WorkOrderId;
9714
-                                    bool n = SMSController.AddSmS(0, mag, count, u.F_Mobile, "153305", "");
9725
+                                    if(u .F_RoleCode =="WLDW"&&u .F_IsSms ==1)
9726
+                                    {
9727
+                                        continue;
9728
+                                    }
9729
+                                    else
9730
+                                    {
9731
+                                        string count = "你有新工单:" + modelT_Bus_WorkOrder.F_WorkOrderId + ",请及时查收处理。";
9732
+                                        string mag = modelT_Bus_WorkOrder.F_WorkOrderId;
9733
+                                        bool n = SMSController.AddSmS(0, mag, count, u.F_Mobile, "153305", "");
9734
+
9735
+                                    }
9736
+                                  
9715 9737
                                 }
9716 9738
                             });
9717 9739
                         }
@@ -9991,9 +10013,17 @@ namespace CallCenterApi.Interface.Controllers.workorder
9991 10013
                             foreach (var u in users)
9992 10014
                             {
9993 10015
                                 msg.AddInternalMessagesInfo("工单消息", msgss + ",工单编号:" + modelT_Bus_WorkOrder.F_WorkOrderId, u.F_UserCode, User.F_UserCode, (int)EnumSmsType.workorder);
9994
-                                string count = "你有新工单:" + modelT_Bus_WorkOrder.F_WorkOrderId + ",请及时查收处理。";
9995
-                                string mag = modelT_Bus_WorkOrder.F_WorkOrderId;
9996
-                                bool n = SMSController.AddSmS(0, mag, count, u.F_Mobile, "153305", "");
10016
+                                if (u.F_RoleCode == "WLDW" && u.F_IsSms == 1)
10017
+                                {
10018
+                                    continue;
10019
+                                }
10020
+                                else
10021
+                                {
10022
+                                    string count = "你有新工单:" + modelT_Bus_WorkOrder.F_WorkOrderId + ",请及时查收处理。";
10023
+                                    string mag = modelT_Bus_WorkOrder.F_WorkOrderId;
10024
+                                    bool n = SMSController.AddSmS(0, mag, count, u.F_Mobile, "153305", "");
10025
+                                }
10026
+                               
9997 10027
                             }
9998 10028
                             //var user = new BLL.T_Sys_UserAccount().GetModelList("F_DeptId in (" + maindept.F_DeptId + ") ");
9999 10029
                         }
@@ -11393,9 +11423,17 @@ namespace CallCenterApi.Interface.Controllers.workorder
11393 11423
                     {
11394 11424
                         foreach (var it in user)
11395 11425
                         {
11396
-                            string count = "你有新工单:" + workorderid + ",请及时查收处理。";
11397
-                            string msg = workorderid;
11398
-                            bool n = SMSController.AddSmS(0, msg, count, it.F_Mobile, "153305", "");
11426
+                            if (it.F_RoleCode == "WLDW" && it.F_IsSms == 1)
11427
+                            {
11428
+                                continue;
11429
+                            }
11430
+                            else
11431
+                            {
11432
+                                string count = "你有新工单:" + workorderid + ",请及时查收处理。";
11433
+                                string msg = workorderid;
11434
+                                bool n = SMSController.AddSmS(0, msg, count, it.F_Mobile, "153305", "");
11435
+                            }
11436
+                           
11399 11437
                         }
11400 11438
                     }
11401 11439
 
@@ -11664,12 +11702,21 @@ namespace CallCenterApi.Interface.Controllers.workorder
11664 11702
                                             }
11665 11703
                                             else
11666 11704
                                             {
11705
+                                            if (u.F_RoleCode == "WLDW" && u.F_IsSms == 1)
11706
+                                            {
11707
+                                                continue;
11708
+                                            }
11709
+                                            else
11710
+                                            {
11667 11711
                                                 string count = "你有新工单:" + modelT_Bus_WorkOrder.F_WorkOrderId + ",请及时查收处理。";
11668 11712
                                                 string msgcount = modelT_Bus_WorkOrder.F_WorkOrderId;
11669 11713
                                                 bool n = SMSController.AddSmS(0, msgcount, count, u.F_Mobile, "153305", "");
11670 11714
                                                 msg.AddInternalMessagesInfo("工单消息", msgss + ",工单编号:" + modelT_Bus_WorkOrder.F_WorkOrderId, u.F_UserCode, curuser.F_UserCode, (int)EnumSmsType.workorder);
11671 11715
 
11672 11716
                                             }
11717
+                                           
11718
+
11719
+                                            }
11673 11720
                                         }
11674 11721
                                     }
11675 11722
                                     else
@@ -11686,9 +11733,17 @@ namespace CallCenterApi.Interface.Controllers.workorder
11686 11733
                                             }
11687 11734
                                             else
11688 11735
                                             {
11736
+                                            if (u.F_RoleCode == "WLDW" && u.F_IsSms == 1)
11737
+                                            {
11738
+                                                continue;
11739
+                                            }
11740
+                                            else
11741
+                                            {
11689 11742
                                                 string count = "你有新工单:" + modelT_Bus_WorkOrder.F_WorkOrderId + ",请及时查收处理。";
11690 11743
                                                 string msgcount = modelT_Bus_WorkOrder.F_WorkOrderId;
11691 11744
                                                 bool n = SMSController.AddSmS(0, msgcount, count, u.F_Mobile, "153305", "");
11745
+                                            }
11746
+                                           
11692 11747
                                                 msg.AddInternalMessagesInfo("工单消息", msgss + ",工单编号:" + modelT_Bus_WorkOrder.F_WorkOrderId, u.F_UserCode, curuser.F_UserCode, (int)EnumSmsType.workorder);
11693 11748
                                             }
11694 11749
 
@@ -11807,9 +11862,17 @@ namespace CallCenterApi.Interface.Controllers.workorder
11807 11862
                                                 }
11808 11863
                                                 else
11809 11864
                                                 {
11810
-                                                    string count = "你有新工单:" + modelT_Bus_WorkOrder1.F_WorkOrderId + ",请及时查收处理。";
11811
-                                                    string msg = modelT_Bus_WorkOrder1.F_WorkOrderId;
11812
-                                                    bool n = SMSController.AddSmS(0, msg, count, it.F_Mobile, "153305", "");
11865
+                                                    if (it.F_RoleCode == "WLDW" && it.F_IsSms == 1)
11866
+                                                    {
11867
+                                                        continue;
11868
+                                                    }
11869
+                                                    else
11870
+                                                    {
11871
+                                                        string count = "你有新工单:" + modelT_Bus_WorkOrder1.F_WorkOrderId + ",请及时查收处理。";
11872
+                                                        string msg = modelT_Bus_WorkOrder1.F_WorkOrderId;
11873
+                                                        bool n = SMSController.AddSmS(0, msg, count, it.F_Mobile, "153305", "");
11874
+                                                    }
11875
+                                                   
11813 11876
                                                 }
11814 11877
 
11815 11878
                                             }
@@ -12227,9 +12290,17 @@ namespace CallCenterApi.Interface.Controllers.workorder
12227 12290
                     {
12228 12291
                         foreach (var it in user)
12229 12292
                         {
12230
-                            string count = "你有新工单:" + workorderid + ",请及时查收处理。";
12231
-                            string msg = workorderid;
12232
-                            bool n = SMSController.AddSmS(0, msg, count, it.F_Mobile, "153305", "");
12293
+                            if (it.F_RoleCode == "WLDW" && it.F_IsSms == 1)
12294
+                            {
12295
+                                continue;
12296
+                            }
12297
+                            else
12298
+                            {
12299
+                                string count = "你有新工单:" + workorderid + ",请及时查收处理。";
12300
+                                string msg = workorderid;
12301
+                                bool n = SMSController.AddSmS(0, msg, count, it.F_Mobile, "153305", "");
12302
+                            }
12303
+                           
12233 12304
                         }
12234 12305
                     }
12235 12306
 
@@ -12496,6 +12567,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
12496 12567
                             string count = "你有新工单:" + modelT_Bus_WorkOrder.F_WorkOrderId + ",请及时查收处理。";
12497 12568
                             string msg = modelT_Bus_WorkOrder.F_WorkOrderId;
12498 12569
                             bool n = SMSController.AddSmS(0, msg, count, it.F_Mobile, "153305", "");
12570
+
12499 12571
                         }
12500 12572
 
12501 12573
                     }
@@ -12582,6 +12654,8 @@ namespace CallCenterApi.Interface.Controllers.workorder
12582 12654
                                     string count = "你有新工单:" + modelT_Bus_WorkOrder.F_WorkOrderId + ",请及时查收处理。";
12583 12655
                                     string msg = modelT_Bus_WorkOrder.F_WorkOrderId;
12584 12656
                                     bool n = SMSController.AddSmS(0, msg, count, it.F_Mobile, "153305", "");
12657
+
12658
+
12585 12659
                                 }
12586 12660
                             }
12587 12661
                             #endregion
@@ -14177,7 +14251,8 @@ namespace CallCenterApi.Interface.Controllers.workorder
14177 14251
                 string Unsuccessful = RequestString.GetFormString("Unsuccessful");
14178 14252
                 string AuditUser = RequestString.GetFormString("AuditUser");//审核领导
14179 14253
                 string post = RequestString.GetFormString("post");//审核领导职务
14180
-
14254
+                string auditContact = RequestString.GetFormString("auditContact");//审核领导职务
14255
+                
14181 14256
 
14182 14257
                 Model.T_Bus_WorkOrder modelT_Bus_WorkOrder = workorderBLL.GetModel(workorderid);
14183 14258
                 Model.T_Bus_AssignedInfo modelT_Bus_AssignedInfo = assignBLL.GetNewModelByWorkOrderID(workorderid);
@@ -14199,6 +14274,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
14199 14274
                                     modelT_Bus_Feedback.F_WorkOrderId = modelT_Bus_WorkOrder.F_WorkOrderId;//工单编号
14200 14275
                                     modelT_Bus_Feedback.F_AssignedId = modelT_Bus_AssignedInfo.F_Id;//交办id
14201 14276
                                     modelT_Bus_Feedback.F_AuditPost = post;
14277
+                                    modelT_Bus_Feedback.F_AuditContact = auditContact;
14202 14278
                                     modelT_Bus_Feedback.F_AuditUser = AuditUser;
14203 14279
                                     modelT_Bus_Feedback.F_DealUser = dealman;
14204 14280
                                     modelT_Bus_Feedback.F_Result = result;//反馈内容
@@ -16166,11 +16242,10 @@ namespace CallCenterApi.Interface.Controllers.workorder
16166 16242
                                 }
16167 16243
                                 #endregion
16168 16244
                             }
16245
+                            
16246
+                           
16169 16247
                             //多次不满意转督办
16170
-                            if (issatisfie == 0 && nexttype > 0)
16171
-                            {
16172
-                                Remind(modelT_Bus_WorkOrder, modelT_Bus_AssignedInfo);
16173
-                            }
16248
+                           
16174 16249
                             if (modelT_Bus_VisitResult != null && modelT_Bus_VisitResult.F_State == 1)
16175 16250
                             {
16176 16251
                                 //提交重办满意度改为满意
@@ -16247,6 +16322,14 @@ namespace CallCenterApi.Interface.Controllers.workorder
16247 16322
                                 else if (nexttype == 1)
16248 16323
                                 {
16249 16324
                                     #region 保存工单信息
16325
+                                    if (modelT_Bus_WorkOrder.F_RemindDay == 2|| modelT_Bus_WorkOrder.F_RemindDay == 3)
16326
+                                    {
16327
+                                        return Error("回访时,提交重办只能操作一次");
16328
+                                    }
16329
+                                    if (modelT_Bus_WorkOrder.F_RemindDay == 1 || modelT_Bus_WorkOrder.F_RemindDay == 3)
16330
+                                        modelT_Bus_WorkOrder.F_RemindDay = 3;
16331
+                                    else
16332
+                                        modelT_Bus_WorkOrder.F_RemindDay = 2;
16250 16333
                                     modelT_Bus_WorkOrder.F_WorkState = (int)EnumWorkState.resubmit;
16251 16334
                                     modelT_Bus_WorkOrder.F_IsExamine = 1;
16252 16335
                                     modelT_Bus_WorkOrder.F_IsSms = 0;
@@ -16255,6 +16338,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
16255 16338
                                     #endregion
16256 16339
                                     opt = "于" + DateTime.Now
16257 16340
                                                                         .ToString("yyyy年MM月dd日HH时mm分ss秒") + "回访";
16341
+
16258 16342
                                     cbreasons = ",重办原因:" + cbreason;
16259 16343
                                     #endregion
16260 16344
                                 }
@@ -16368,6 +16452,10 @@ namespace CallCenterApi.Interface.Controllers.workorder
16368 16452
                                 }
16369 16453
                             }
16370 16454
                             trans.Complete();
16455
+                            if (issatisfie == 0 && nexttype > 0)
16456
+                            {
16457
+                                Remind(modelT_Bus_WorkOrder, modelT_Bus_AssignedInfo);
16458
+                            }
16371 16459
                         }
16372 16460
                         return Success("操作成功", modelT_Bus_VisitResult.F_Id);
16373 16461
                     }
@@ -17327,10 +17415,18 @@ namespace CallCenterApi.Interface.Controllers.workorder
17327 17415
                             }
17328 17416
                             else
17329 17417
                             {
17330
-                                if (modelT_Bus_WorkOrder.F_WorkState == (int)EnumWorkState.finish && modelT_Bus_WorkOrder.F_RemindDay == 1)
17418
+                                if (modelT_Bus_WorkOrder.F_WorkState == (int)EnumWorkState.finish && (modelT_Bus_WorkOrder.F_RemindDay == 1 || modelT_Bus_WorkOrder.F_RemindDay == 3))
17331 17419
                                 {
17332 17420
                                     return Error("结案后工单只能提交重办一次");
17333 17421
                                 }
17422
+
17423
+                                if (modelT_Bus_WorkOrder.F_WorkState == (int)EnumWorkState.finish)
17424
+                                {
17425
+                                    if (modelT_Bus_WorkOrder.F_RemindDay==2|| modelT_Bus_WorkOrder.F_RemindDay == 3)
17426
+                                        modelT_Bus_WorkOrder.F_RemindDay = 3;
17427
+                                    else
17428
+                                        modelT_Bus_WorkOrder.F_RemindDay = 1;
17429
+                                }
17334 17430
                                 if (modelT_Bus_WorkOrder.F_MainDeptId != null &&
17335 17431
                                 modelT_Bus_WorkOrder.F_MainDeptId > 0)
17336 17432
                                 {
@@ -17372,10 +17468,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
17372 17468
                                             modelT_Bus_WorkOrder.F_OtherDeptIds = modelT_Bus_WorkOrder.F_OtherDeptIds;
17373 17469
                                             modelT_Bus_WorkOrder.F_AssignUser = User.F_UserCode;
17374 17470
                                             modelT_Bus_WorkOrder.F_AssignTime = DateTime.Now;
17375
-                                            if (modelT_Bus_WorkOrder.F_WorkState == (int)EnumWorkState.finish)
17376
-                                            {
17377
-                                                modelT_Bus_WorkOrder.F_RemindDay = 1;
17378
-                                            }
17471
+                                           
17379 17472
 
17380 17473
                                             modelT_Bus_WorkOrder.F_IsReload = n + 1;
17381 17474
                                             if (!string.IsNullOrEmpty(resdatetime))
@@ -19641,5 +19734,29 @@ namespace CallCenterApi.Interface.Controllers.workorder
19641 19734
         }
19642 19735
 
19643 19736
         #endregion
19737
+
19738
+
19739
+        /// <summary>
19740
+        /// 二级单位下工单数量
19741
+        /// </summary>
19742
+        /// <returns></returns>
19743
+        //[Authority]
19744
+        public ActionResult GetDWCount()
19745
+        {
19746
+           
19747
+            Dictionary<string, string> paras = new Dictionary<string, string>();
19748
+            paras.Add("@deptid", User.F_DeptId .ToString ());
19749
+           if (User.F_RoleCode != "GLY" && User.F_RoleCode != "DDZG")
19750
+            {
19751
+                var obj = DbHelperSQL.RunProcedure("P_DWCount", paras, "DWCount");
19752
+                return Success("成功", obj);
19753
+            }
19754
+           else
19755
+            {
19756
+                var obj = DbHelperSQL.RunProcedure("P_GLCount", paras, "DWCount");
19757
+                return Success("成功", obj);
19758
+            }
19759
+           
19760
+        }
19644 19761
     }
19645 19762
 }

+ 1 - 0
CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Models/Input/UserAccountInput.cs

@@ -25,5 +25,6 @@ namespace CallCenterApi.Interface.Models.Input
25 25
         public DateTime? Birth { get; set; }
26 26
         //public int? HjType { get; set; }
27 27
         public string Remark { get; set; }
28
+        public int? F_IsSms { set; get; }
28 29
     }
29 30
 }

+ 5 - 0
CallCenterApi/CallCenterApi.Model/T_Bus_Feedback.cs

@@ -147,6 +147,11 @@ namespace CallCenterApi.Model
147 147
         /// 审核领导职务
148 148
         /// </summary>
149 149
         public string F_AuditPost { set; get;  }
150
+
151
+        /// <summary>
152
+        /// 审核领导联系方式
153
+        /// </summary>
154
+        public string F_AuditContact { set; get; }
150 155
         /// <summary>
151 156
         /// 审批时间
152 157
         /// </summary>

+ 2 - 0
CallCenterApi/CallCenterApi.Model/T_Sys_UserAccount.cs

@@ -357,6 +357,7 @@ namespace CallCenterApi.Model
357 357
         /// 职务
358 358
         /// </summary>
359 359
         public string F_Post { set; get; }
360
+        public int? F_IsSms { set; get; }
360 361
         /// <summary>
361 362
         /// 修改时间
362 363
         /// </summary>
@@ -365,6 +366,7 @@ namespace CallCenterApi.Model
365 366
             set { _f_modifyttime = value; }
366 367
             get { return _f_modifyttime; }
367 368
         }
369
+     
368 370
         #endregion Model
369 371
 
370 372
 

+ 2 - 0
CallCenterApi/CallCenterApi.Model/UserAccount.cs

@@ -307,6 +307,8 @@ namespace CallCenterApi.Model
307 307
         /// 职务
308 308
         /// </summary>
309 309
         public string F_Post { set; get; }
310
+
311
+        public int? F_IsSms { set;get  }
310 312
         #endregion Model
311 313
     }
312 314
 }