鹤壁

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/workorder/AffairsController.cs

                 {
                     return Error("请选择更正错误类别");
                 }
-
+                if (User.F_RoleCode == "WLDW")
+                {
+                    return Error("省平台工单不允许申请延时");
+                }
               
 
                 Model.T_Bus_WorkOrder modelT_Bus_WorkOrder = workorderBLL.GetModel(workorderid);

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

 
                                 if (zb == 0)
                                 {
-                                    if (modelT_Bus_RemindRecord.F_State != 2)
+                                    if (modelT_Bus_RemindRecord!=null)
                                     {
-                                        modelT_Bus_RemindRecord.F_State = 0;
-                                        new BLL.T_Bus_RemindRecord().Update(modelT_Bus_RemindRecord);
+                                        if (modelT_Bus_RemindRecord.F_State != 2)
+                                        {
+                                            modelT_Bus_RemindRecord.F_State = 0;
+                                            new BLL.T_Bus_RemindRecord().Update(modelT_Bus_RemindRecord);
+                                        }
                                     }
-
                                 }
                             }
                             else
                         return Error("该工单已超时，不能申请延时");
                     }
                 }
+                if(modelT_Bus_WorkOrder.F_InfoSource==2580&& User.F_RoleCode == "WLDW")
+                {
+                    return Error("省平台工单不允许申请延时");
+                }
                 var Delay = new BLL.T_Bus_DelayTime().GetModelList("F_WorkOrderId='" + 
                     modelT_Bus_WorkOrder.F_WorkOrderId + "' and F_IsAudit in (0,1) and F_CreateUser='" +
                     User.F_DeptId + "'and F_AssignedId='" + modelT_Bus_AssignedInfo.F_Id + "'");
                                     modelT_Bus_Feedback.F_IsFeedEnd = 1;
                                     modelT_Bus_Feedback.F_State = state;
                                     modelT_Bus_Feedback.F_Type = type;
-
+                                    modelT_Bus_Feedback.F_SatisfiedReason = staisfiedreason;
                                     modelT_Bus_Feedback.F_Id= new BLL.T_Bus_Feedback().Add(modelT_Bus_Feedback);
                                     #endregion
                                 }
                                         modelT_Bus_Feedback.F_IsSatisfied = isstaisfied;//是否满意:0未评价，1满意，2基本满意，3不满意
 
                                         modelT_Bus_Feedback.F_FeedbackReason = feedbackreason;
-
+                                        modelT_Bus_Feedback.F_SatisfiedReason = staisfiedreason;
 
                                         modelT_Bus_Feedback.F_Duties = duties;//职务
                                         modelT_Bus_Feedback.F_Situation = situation;
                                 modelT_Bus_VisitResult.F_VisitUser = User .F_UserName;
                                 modelT_Bus_VisitResult.F_Type = -1;
                                 modelT_Bus_VisitResult.F_IsSatisfie = 2;
-                                modelT_Bus_VisitResult.F_Result = "市长热线：该问题已收到办理结果，如有需要建议再次拨打12345进行反映或咨询。";
+                                modelT_Bus_VisitResult.F_Result = "12345热线：该问题已收到办理结果，如有需要建议再次拨打12345进行反映或咨询。";
                                 modelT_Bus_VisitResult.F_Remark = "";//重办原因
                                 modelT_Bus_VisitResult.F_State = 1;
                                 modelT_Bus_VisitResult.F_IsDelete = 0;

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Models/Common/ButtonGroup.cs

                       
                         if (ispd !="3")
                         {
-                            if (InfoSource == "2580")
-                                buttons.Add(ejdelay());
-                            else
+                            if (InfoSource != "2580")
                                 buttons.Add(delay());
+                               
                         }
                        
                         if (ispd == "0" || ispd == "")
                         buttons.Add(feedback());
                         if (ispd != "3")
                         {
-                            if (InfoSource == "2580")
-                                buttons.Add(ejdelay());
-                            else
+                            if (InfoSource != "2580")
                                 buttons.Add(delay());
                         }
                         if (ispd == "0" || ispd == "")