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

CallCenterApi/CallCenterApi.DAL/T_Bus_Feedback_Next.cs

@@ -38,9 +38,9 @@ namespace CallCenterApi.DAL
         {
             StringBuilder strSql = new StringBuilder();
             strSql.Append("insert into T_Bus_Feedback_Next(");
-            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)");
+            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)");
             strSql.Append(" values (");
-            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)");
+            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)");
             strSql.Append(";select @@IDENTITY");
             SqlParameter[] parameters = {
                     new SqlParameter("@F_AssignedId", SqlDbType.Int,4),
@@ -70,6 +70,8 @@ namespace CallCenterApi.DAL
                     new SqlParameter("@F_ReplyContent", SqlDbType.NVarChar),
                     new SqlParameter("@F_IsSatisfied", SqlDbType.Int,4),
                     new SqlParameter("@F_Duties", SqlDbType.NVarChar,200),
+                     new SqlParameter("@F_AuditPost", SqlDbType.NVarChar,100),
+                    
                     new SqlParameter("@F_Situation", SqlDbType.NVarChar)
             };
             parameters[0].Value = model.F_AssignedId;
@@ -99,7 +101,8 @@ namespace CallCenterApi.DAL
             parameters[24].Value = model.F_ReplyContent;
             parameters[25].Value = model.F_IsSatisfied;
             parameters[26].Value = model.F_Duties;
-            parameters[27].Value = model.F_Situation; 
+            parameters[27].Value = model.F_AuditPost;
+            parameters[28].Value = model.F_Situation; 
 
             object obj = DbHelperSQL.GetSingle(strSql.ToString(), parameters);
             if (obj == null)
@@ -145,6 +148,8 @@ namespace CallCenterApi.DAL
             strSql.Append("F_ReplyContent=@F_ReplyContent,");
             strSql.Append("F_IsSatisfied=@F_IsSatisfied,");
             strSql.Append("F_Duties=@F_Duties,");
+            strSql.Append("F_AuditPost=@F_AuditPost,");
+            
             strSql.Append("F_Situation=@F_Situation"); 
             strSql.Append(" where F_Id=@F_Id");
             SqlParameter[] parameters = {
@@ -175,6 +180,8 @@ namespace CallCenterApi.DAL
                     new SqlParameter("@F_ReplyContent", SqlDbType.NVarChar),
                     new SqlParameter("@F_IsSatisfied", SqlDbType.Int,4),
                     new SqlParameter("@F_Duties", SqlDbType.NVarChar,200),
+                     new SqlParameter("@F_AuditPost", SqlDbType.NVarChar,100),
+                    
                     new SqlParameter("@F_Situation", SqlDbType.NVarChar),
                     new SqlParameter("@F_Id", SqlDbType.Int,4)};
             parameters[0].Value = model.F_AssignedId;
@@ -204,8 +211,9 @@ namespace CallCenterApi.DAL
             parameters[24].Value = model.F_ReplyContent;
             parameters[25].Value = model.F_IsSatisfied;
             parameters[26].Value = model.F_Duties;
-            parameters[27].Value = model.F_Situation; 
-            parameters[28].Value = model.F_Id;
+            parameters[27].Value = model.F_AuditPost;
+            parameters[28].Value = model.F_Situation; 
+            parameters[29].Value = model.F_Id;
 
             int rows = DbHelperSQL.ExecuteSql(strSql.ToString(), parameters);
             if (rows > 0)
@@ -413,6 +421,11 @@ namespace CallCenterApi.DAL
                 {
                     model.F_Situation = row["F_Situation"].ToString();
                 }
+                if (row["F_AuditPost"] != null)
+                {
+                    model.F_AuditPost = row["F_AuditPost"].ToString();
+                }
+                
             }
             return model;
         }

CallCenterApi/CallCenterApi.DAL/T_Bus_WorkOrder.cs

@@ -1061,12 +1061,6 @@ namespace CallCenterApi.DAL
             //}
             //newWorkOrderID = headPart + middlePart + endPart; 
             #endregion
-
-
-
-
-
-
             //string oldWorkOrderID = string.Empty;
             //string headPart = "GD" + DateTime.Now.ToString("yyyyMMdd");//工单号前8位
             //string middlePart = string.Empty;//工单号中间部分

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/customer/AddressBookController.cs

@@ -12,7 +12,7 @@ using System.Web.Mvc;
 
 namespace CallCenterApi.Interface.Controllers.customer
 {
-    //[Authority]
+    [Authority]
     public class AddressBookController : BaseController
     {
         BLL.T_Cus_AddressBook bll = new BLL.T_Cus_AddressBook();
@@ -48,7 +48,6 @@ namespace CallCenterApi.Interface.Controllers.customer
             }
             if (User.F_RoleCode == "GLY" || User.F_RoleCode == "ZXLD" || User.F_RoleCode == "ZXHWY"|| User.F_RoleCode == "MTDD")
             {
-
             }
             else
             {

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/workorder/WorkOrderController.cs

@@ -7466,6 +7466,10 @@ namespace CallCenterApi.Interface.Controllers.workorder
                             ejjbdt = BindFileData(ejjbdt, configfj.F_ParamValue);
                         }
                         var thdt = DbHelperSQL.Query(thsql).Tables[0];
+                        if (!string.IsNullOrEmpty(configfj.F_ParamValue))
+                        {
+                            BindFileData(thdt, configfj.F_ParamValue);
+                        }
                         var obj1 = new
                         {
                             jbdata = jbdt,
@@ -12190,7 +12194,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 string IsProResultState = RequestString.GetFormString("IsProResultState ");
                 string Unsuccessful = RequestString.GetFormString("Unsuccessful");
                 string AuditUser = RequestString.GetFormString("AuditUser");//审核领导
-                string post = RequestString.GetFormString("post");//审核领导
+                string post = RequestString.GetFormString("post");//审核领导职务
                 
 
                 Model.T_Bus_WorkOrder modelT_Bus_WorkOrder = workorderBLL.GetModel(workorderid);
@@ -13632,10 +13636,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
         //[Authority]
         public ActionResult DealWorkOrder()
         {
-            
-
-            
-
+           
             if (User.F_RoleCode == "EJWLDW" || User.F_RoleCode == "GLY" || User.F_RoleCode == "DDZG")
             {
                 string workorderid = RequestString.GetFormString("workorderid");
@@ -13654,7 +13655,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 string duties = RequestString.GetFormString("duties");//职务
                 string situation = RequestString.GetFormString("situation");
                 string AuditUser = RequestString.GetFormString("AuditUser");
-                
+                string post = RequestString.GetFormString("post");
                 Model.T_Bus_WorkOrder modelT_Bus_WorkOrder = workorderBLL.GetModel(workorderid);
                 Model.T_Bus_AssignedInfo modelT_Bus_AssignedInfo = assignBLL.GetNewModelByWorkOrderID(workorderid);
                 Model.T_Bus_AssignedInfo_Next modelT_Bus_AssignedInfo_Next = new BLL.T_Bus_AssignedInfo_Next().GetNewModelByWorkOrderID(workorderid);
@@ -13697,6 +13698,8 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                     modelT_Bus_Feedback_Next.F_File = files;
                                     modelT_Bus_Feedback_Next.F_IsAudit = 0;
                                     modelT_Bus_Feedback_Next.F_AuditUser  = AuditUser;
+                                    modelT_Bus_Feedback_Next.F_AuditPost = post;
+                                    
                                     modelT_Bus_Feedback_Next.F_IsDelete = 0;
                                     modelT_Bus_Feedback_Next.F_CreateUser = User.F_UserCode;//办理人
                                     modelT_Bus_Feedback_Next.F_CreateTime = DateTime.Now;//办理时间
@@ -14060,7 +14063,10 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                 modelT_Bus_VisitResult.F_AssignedId = 0;
                                 modelT_Bus_VisitResult.F_VisitUser = visituser;
                                 modelT_Bus_VisitResult.F_Type = type;
-                                modelT_Bus_VisitResult.F_IsSatisfie = issatisfie;
+                                if (nexttype == 1)
+                                    modelT_Bus_VisitResult.F_IsSatisfie = 1;
+                                else
+                                    modelT_Bus_VisitResult.F_IsSatisfie = issatisfie;
                                 modelT_Bus_VisitResult.F_Result = result;
                                 modelT_Bus_VisitResult.F_State = state;
                                 if (!string.IsNullOrEmpty(callid))
@@ -14095,7 +14101,11 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                     modelT_Bus_VisitResult.F_AssignedId = 0;
                                     modelT_Bus_VisitResult.F_VisitUser = visituser;
                                     modelT_Bus_VisitResult.F_Type = type;
-                                    modelT_Bus_VisitResult.F_IsSatisfie = issatisfie;
+                                    if (nexttype == 1)
+                                        modelT_Bus_VisitResult.F_IsSatisfie = 1;
+                                    else
+                                        modelT_Bus_VisitResult.F_IsSatisfie = issatisfie;
+                                   
                                     modelT_Bus_VisitResult.F_Result = result;
                                     modelT_Bus_VisitResult.F_State = state;
                                     if (!string.IsNullOrEmpty(callid))
@@ -14125,7 +14135,10 @@ namespace CallCenterApi.Interface.Controllers.workorder
                             if (modelT_Bus_VisitResult != null && modelT_Bus_VisitResult.F_State == 1)
                             {
                                 #region 保存交办信息
-                                modelT_Bus_AssignedInfo.F_IsSatisfie = issatisfie;
+                                if (nexttype==1)
+                                modelT_Bus_AssignedInfo.F_IsSatisfie = 1;
+                                else
+                                    modelT_Bus_AssignedInfo.F_IsSatisfie = issatisfie;
                                 assignBLL.Update(modelT_Bus_AssignedInfo);
                                 #endregion
 

CallCenterApi/CallCenterApi.Model/T_Bus_Feedback_Next.cs

@@ -144,6 +144,10 @@ namespace CallCenterApi.Model
             get { return _f_audituser; }
         }
         /// <summary>
+        /// 审批人职务
+        /// </summary>
+        public string F_AuditPost { set; get; }
+        /// <summary>
         /// 审批时间
         /// </summary>
         public DateTime? F_AuditTime