Explorar el Código

三级审核领导职务,退回附件展示

duhongyu %!s(int64=4) %!d(string=hace) años
padre
commit
01d5953e8e

+ 18 - 5
CallCenterApi/CallCenterApi.DAL/T_Bus_Feedback_Next.cs

38
         {
38
         {
39
             StringBuilder strSql = new StringBuilder();
39
             StringBuilder strSql = new StringBuilder();
40
             strSql.Append("insert into T_Bus_Feedback_Next(");
40
             strSql.Append("insert into T_Bus_Feedback_Next(");
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)");
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_AuditPost)");
42
             strSql.Append(" values (");
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)");
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_AuditPost)");
44
             strSql.Append(";select @@IDENTITY");
44
             strSql.Append(";select @@IDENTITY");
45
             SqlParameter[] parameters = {
45
             SqlParameter[] parameters = {
46
                     new SqlParameter("@F_AssignedId", SqlDbType.Int,4),
46
                     new SqlParameter("@F_AssignedId", SqlDbType.Int,4),
70
                     new SqlParameter("@F_ReplyContent", SqlDbType.NVarChar),
70
                     new SqlParameter("@F_ReplyContent", SqlDbType.NVarChar),
71
                     new SqlParameter("@F_IsSatisfied", SqlDbType.Int,4),
71
                     new SqlParameter("@F_IsSatisfied", SqlDbType.Int,4),
72
                     new SqlParameter("@F_Duties", SqlDbType.NVarChar,200),
72
                     new SqlParameter("@F_Duties", SqlDbType.NVarChar,200),
73
+                     new SqlParameter("@F_AuditPost", SqlDbType.NVarChar,100),
74
+                    
73
                     new SqlParameter("@F_Situation", SqlDbType.NVarChar)
75
                     new SqlParameter("@F_Situation", SqlDbType.NVarChar)
74
             };
76
             };
75
             parameters[0].Value = model.F_AssignedId;
77
             parameters[0].Value = model.F_AssignedId;
99
             parameters[24].Value = model.F_ReplyContent;
101
             parameters[24].Value = model.F_ReplyContent;
100
             parameters[25].Value = model.F_IsSatisfied;
102
             parameters[25].Value = model.F_IsSatisfied;
101
             parameters[26].Value = model.F_Duties;
103
             parameters[26].Value = model.F_Duties;
102
-            parameters[27].Value = model.F_Situation; 
104
+            parameters[27].Value = model.F_AuditPost;
105
+            parameters[28].Value = model.F_Situation; 
103
 
106
 
104
             object obj = DbHelperSQL.GetSingle(strSql.ToString(), parameters);
107
             object obj = DbHelperSQL.GetSingle(strSql.ToString(), parameters);
105
             if (obj == null)
108
             if (obj == null)
145
             strSql.Append("F_ReplyContent=@F_ReplyContent,");
148
             strSql.Append("F_ReplyContent=@F_ReplyContent,");
146
             strSql.Append("F_IsSatisfied=@F_IsSatisfied,");
149
             strSql.Append("F_IsSatisfied=@F_IsSatisfied,");
147
             strSql.Append("F_Duties=@F_Duties,");
150
             strSql.Append("F_Duties=@F_Duties,");
151
+            strSql.Append("F_AuditPost=@F_AuditPost,");
152
+            
148
             strSql.Append("F_Situation=@F_Situation"); 
153
             strSql.Append("F_Situation=@F_Situation"); 
149
             strSql.Append(" where F_Id=@F_Id");
154
             strSql.Append(" where F_Id=@F_Id");
150
             SqlParameter[] parameters = {
155
             SqlParameter[] parameters = {
175
                     new SqlParameter("@F_ReplyContent", SqlDbType.NVarChar),
180
                     new SqlParameter("@F_ReplyContent", SqlDbType.NVarChar),
176
                     new SqlParameter("@F_IsSatisfied", SqlDbType.Int,4),
181
                     new SqlParameter("@F_IsSatisfied", SqlDbType.Int,4),
177
                     new SqlParameter("@F_Duties", SqlDbType.NVarChar,200),
182
                     new SqlParameter("@F_Duties", SqlDbType.NVarChar,200),
183
+                     new SqlParameter("@F_AuditPost", SqlDbType.NVarChar,100),
184
+                    
178
                     new SqlParameter("@F_Situation", SqlDbType.NVarChar),
185
                     new SqlParameter("@F_Situation", SqlDbType.NVarChar),
179
                     new SqlParameter("@F_Id", SqlDbType.Int,4)};
186
                     new SqlParameter("@F_Id", SqlDbType.Int,4)};
180
             parameters[0].Value = model.F_AssignedId;
187
             parameters[0].Value = model.F_AssignedId;
204
             parameters[24].Value = model.F_ReplyContent;
211
             parameters[24].Value = model.F_ReplyContent;
205
             parameters[25].Value = model.F_IsSatisfied;
212
             parameters[25].Value = model.F_IsSatisfied;
206
             parameters[26].Value = model.F_Duties;
213
             parameters[26].Value = model.F_Duties;
207
-            parameters[27].Value = model.F_Situation; 
208
-            parameters[28].Value = model.F_Id;
214
+            parameters[27].Value = model.F_AuditPost;
215
+            parameters[28].Value = model.F_Situation; 
216
+            parameters[29].Value = model.F_Id;
209
 
217
 
210
             int rows = DbHelperSQL.ExecuteSql(strSql.ToString(), parameters);
218
             int rows = DbHelperSQL.ExecuteSql(strSql.ToString(), parameters);
211
             if (rows > 0)
219
             if (rows > 0)
413
                 {
421
                 {
414
                     model.F_Situation = row["F_Situation"].ToString();
422
                     model.F_Situation = row["F_Situation"].ToString();
415
                 }
423
                 }
424
+                if (row["F_AuditPost"] != null)
425
+                {
426
+                    model.F_AuditPost = row["F_AuditPost"].ToString();
427
+                }
428
+                
416
             }
429
             }
417
             return model;
430
             return model;
418
         }
431
         }

+ 0 - 6
CallCenterApi/CallCenterApi.DAL/T_Bus_WorkOrder.cs

1061
             //}
1061
             //}
1062
             //newWorkOrderID = headPart + middlePart + endPart; 
1062
             //newWorkOrderID = headPart + middlePart + endPart; 
1063
             #endregion
1063
             #endregion
1064
-
1065
-
1066
-
1067
-
1068
-
1069
-
1070
             //string oldWorkOrderID = string.Empty;
1064
             //string oldWorkOrderID = string.Empty;
1071
             //string headPart = "GD" + DateTime.Now.ToString("yyyyMMdd");//工单号前8位
1065
             //string headPart = "GD" + DateTime.Now.ToString("yyyyMMdd");//工单号前8位
1072
             //string middlePart = string.Empty;//工单号中间部分
1066
             //string middlePart = string.Empty;//工单号中间部分

+ 1 - 2
CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/customer/AddressBookController.cs

12
 
12
 
13
 namespace CallCenterApi.Interface.Controllers.customer
13
 namespace CallCenterApi.Interface.Controllers.customer
14
 {
14
 {
15
-    //[Authority]
15
+    [Authority]
16
     public class AddressBookController : BaseController
16
     public class AddressBookController : BaseController
17
     {
17
     {
18
         BLL.T_Cus_AddressBook bll = new BLL.T_Cus_AddressBook();
18
         BLL.T_Cus_AddressBook bll = new BLL.T_Cus_AddressBook();
48
             }
48
             }
49
             if (User.F_RoleCode == "GLY" || User.F_RoleCode == "ZXLD" || User.F_RoleCode == "ZXHWY"|| User.F_RoleCode == "MTDD")
49
             if (User.F_RoleCode == "GLY" || User.F_RoleCode == "ZXLD" || User.F_RoleCode == "ZXHWY"|| User.F_RoleCode == "MTDD")
50
             {
50
             {
51
-
52
             }
51
             }
53
             else
52
             else
54
             {
53
             {

+ 22 - 9
CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/workorder/WorkOrderController.cs

7466
                             ejjbdt = BindFileData(ejjbdt, configfj.F_ParamValue);
7466
                             ejjbdt = BindFileData(ejjbdt, configfj.F_ParamValue);
7467
                         }
7467
                         }
7468
                         var thdt = DbHelperSQL.Query(thsql).Tables[0];
7468
                         var thdt = DbHelperSQL.Query(thsql).Tables[0];
7469
+                        if (!string.IsNullOrEmpty(configfj.F_ParamValue))
7470
+                        {
7471
+                            BindFileData(thdt, configfj.F_ParamValue);
7472
+                        }
7469
                         var obj1 = new
7473
                         var obj1 = new
7470
                         {
7474
                         {
7471
                             jbdata = jbdt,
7475
                             jbdata = jbdt,
12190
                 string IsProResultState = RequestString.GetFormString("IsProResultState ");
12194
                 string IsProResultState = RequestString.GetFormString("IsProResultState ");
12191
                 string Unsuccessful = RequestString.GetFormString("Unsuccessful");
12195
                 string Unsuccessful = RequestString.GetFormString("Unsuccessful");
12192
                 string AuditUser = RequestString.GetFormString("AuditUser");//审核领导
12196
                 string AuditUser = RequestString.GetFormString("AuditUser");//审核领导
12193
-                string post = RequestString.GetFormString("post");//审核领导
12197
+                string post = RequestString.GetFormString("post");//审核领导职务
12194
                 
12198
                 
12195
 
12199
 
12196
                 Model.T_Bus_WorkOrder modelT_Bus_WorkOrder = workorderBLL.GetModel(workorderid);
12200
                 Model.T_Bus_WorkOrder modelT_Bus_WorkOrder = workorderBLL.GetModel(workorderid);
13632
         //[Authority]
13636
         //[Authority]
13633
         public ActionResult DealWorkOrder()
13637
         public ActionResult DealWorkOrder()
13634
         {
13638
         {
13635
-            
13636
-
13637
-            
13638
-
13639
+           
13639
             if (User.F_RoleCode == "EJWLDW" || User.F_RoleCode == "GLY" || User.F_RoleCode == "DDZG")
13640
             if (User.F_RoleCode == "EJWLDW" || User.F_RoleCode == "GLY" || User.F_RoleCode == "DDZG")
13640
             {
13641
             {
13641
                 string workorderid = RequestString.GetFormString("workorderid");
13642
                 string workorderid = RequestString.GetFormString("workorderid");
13654
                 string duties = RequestString.GetFormString("duties");//职务
13655
                 string duties = RequestString.GetFormString("duties");//职务
13655
                 string situation = RequestString.GetFormString("situation");
13656
                 string situation = RequestString.GetFormString("situation");
13656
                 string AuditUser = RequestString.GetFormString("AuditUser");
13657
                 string AuditUser = RequestString.GetFormString("AuditUser");
13657
-                
13658
+                string post = RequestString.GetFormString("post");
13658
                 Model.T_Bus_WorkOrder modelT_Bus_WorkOrder = workorderBLL.GetModel(workorderid);
13659
                 Model.T_Bus_WorkOrder modelT_Bus_WorkOrder = workorderBLL.GetModel(workorderid);
13659
                 Model.T_Bus_AssignedInfo modelT_Bus_AssignedInfo = assignBLL.GetNewModelByWorkOrderID(workorderid);
13660
                 Model.T_Bus_AssignedInfo modelT_Bus_AssignedInfo = assignBLL.GetNewModelByWorkOrderID(workorderid);
13660
                 Model.T_Bus_AssignedInfo_Next modelT_Bus_AssignedInfo_Next = new BLL.T_Bus_AssignedInfo_Next().GetNewModelByWorkOrderID(workorderid);
13661
                 Model.T_Bus_AssignedInfo_Next modelT_Bus_AssignedInfo_Next = new BLL.T_Bus_AssignedInfo_Next().GetNewModelByWorkOrderID(workorderid);
13697
                                     modelT_Bus_Feedback_Next.F_File = files;
13698
                                     modelT_Bus_Feedback_Next.F_File = files;
13698
                                     modelT_Bus_Feedback_Next.F_IsAudit = 0;
13699
                                     modelT_Bus_Feedback_Next.F_IsAudit = 0;
13699
                                     modelT_Bus_Feedback_Next.F_AuditUser  = AuditUser;
13700
                                     modelT_Bus_Feedback_Next.F_AuditUser  = AuditUser;
13701
+                                    modelT_Bus_Feedback_Next.F_AuditPost = post;
13702
+                                    
13700
                                     modelT_Bus_Feedback_Next.F_IsDelete = 0;
13703
                                     modelT_Bus_Feedback_Next.F_IsDelete = 0;
13701
                                     modelT_Bus_Feedback_Next.F_CreateUser = User.F_UserCode;//办理人
13704
                                     modelT_Bus_Feedback_Next.F_CreateUser = User.F_UserCode;//办理人
13702
                                     modelT_Bus_Feedback_Next.F_CreateTime = DateTime.Now;//办理时间
13705
                                     modelT_Bus_Feedback_Next.F_CreateTime = DateTime.Now;//办理时间
14060
                                 modelT_Bus_VisitResult.F_AssignedId = 0;
14063
                                 modelT_Bus_VisitResult.F_AssignedId = 0;
14061
                                 modelT_Bus_VisitResult.F_VisitUser = visituser;
14064
                                 modelT_Bus_VisitResult.F_VisitUser = visituser;
14062
                                 modelT_Bus_VisitResult.F_Type = type;
14065
                                 modelT_Bus_VisitResult.F_Type = type;
14063
-                                modelT_Bus_VisitResult.F_IsSatisfie = issatisfie;
14066
+                                if (nexttype == 1)
14067
+                                    modelT_Bus_VisitResult.F_IsSatisfie = 1;
14068
+                                else
14069
+                                    modelT_Bus_VisitResult.F_IsSatisfie = issatisfie;
14064
                                 modelT_Bus_VisitResult.F_Result = result;
14070
                                 modelT_Bus_VisitResult.F_Result = result;
14065
                                 modelT_Bus_VisitResult.F_State = state;
14071
                                 modelT_Bus_VisitResult.F_State = state;
14066
                                 if (!string.IsNullOrEmpty(callid))
14072
                                 if (!string.IsNullOrEmpty(callid))
14095
                                     modelT_Bus_VisitResult.F_AssignedId = 0;
14101
                                     modelT_Bus_VisitResult.F_AssignedId = 0;
14096
                                     modelT_Bus_VisitResult.F_VisitUser = visituser;
14102
                                     modelT_Bus_VisitResult.F_VisitUser = visituser;
14097
                                     modelT_Bus_VisitResult.F_Type = type;
14103
                                     modelT_Bus_VisitResult.F_Type = type;
14098
-                                    modelT_Bus_VisitResult.F_IsSatisfie = issatisfie;
14104
+                                    if (nexttype == 1)
14105
+                                        modelT_Bus_VisitResult.F_IsSatisfie = 1;
14106
+                                    else
14107
+                                        modelT_Bus_VisitResult.F_IsSatisfie = issatisfie;
14108
+                                   
14099
                                     modelT_Bus_VisitResult.F_Result = result;
14109
                                     modelT_Bus_VisitResult.F_Result = result;
14100
                                     modelT_Bus_VisitResult.F_State = state;
14110
                                     modelT_Bus_VisitResult.F_State = state;
14101
                                     if (!string.IsNullOrEmpty(callid))
14111
                                     if (!string.IsNullOrEmpty(callid))
14125
                             if (modelT_Bus_VisitResult != null && modelT_Bus_VisitResult.F_State == 1)
14135
                             if (modelT_Bus_VisitResult != null && modelT_Bus_VisitResult.F_State == 1)
14126
                             {
14136
                             {
14127
                                 #region 保存交办信息
14137
                                 #region 保存交办信息
14128
-                                modelT_Bus_AssignedInfo.F_IsSatisfie = issatisfie;
14138
+                                if (nexttype==1)
14139
+                                modelT_Bus_AssignedInfo.F_IsSatisfie = 1;
14140
+                                else
14141
+                                    modelT_Bus_AssignedInfo.F_IsSatisfie = issatisfie;
14129
                                 assignBLL.Update(modelT_Bus_AssignedInfo);
14142
                                 assignBLL.Update(modelT_Bus_AssignedInfo);
14130
                                 #endregion
14143
                                 #endregion
14131
 
14144
 

+ 4 - 0
CallCenterApi/CallCenterApi.Model/T_Bus_Feedback_Next.cs

144
             get { return _f_audituser; }
144
             get { return _f_audituser; }
145
         }
145
         }
146
         /// <summary>
146
         /// <summary>
147
+        /// 审批人职务
148
+        /// </summary>
149
+        public string F_AuditPost { set; get; }
150
+        /// <summary>
147
         /// 审批时间
151
         /// 审批时间
148
         /// </summary>
152
         /// </summary>
149
         public DateTime? F_AuditTime
153
         public DateTime? F_AuditTime