dal

CallCenterApi/CallCenterApi.DAL/T_Bus_Feedback_Next.cs

@@ -472,6 +472,10 @@ namespace CallCenterApi.DAL
                 {
                     model.F_AuditContact = row["F_AuditContact"].ToString();
                 }
+                if (row["F_FeedbackReason"] != null)
+                {
+                    model.F_FeedbackReason = row["F_FeedbackReason"].ToString();
+                }
                 
             }
             return model;

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

@@ -4016,11 +4016,15 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     sql += " and F_WorkState in (4,8)";
                     if (User.F_RoleCode != "GLY" && User.F_RoleCode != "SPZ" && User.F_RoleCode != "SPZJZ" && User.F_RoleCode != "DDZG")
                     {
-                        sql += "and F_WorkOrderId in(  select F_WorkOrderId from T_Bus_AssignedInfo as a  WITH(NOLOCK)  where F_State=1 and F_IsDelete=0 and ISNULL(F_FeedbackTime, '')=''and F_IsNext = 3  and F_MainDeptId =" + User.F_DeptId + "  and not exists(select 1 from T_Bus_AssignedInfo WITH(NOLOCK) where F_WorkOrderId = a.F_WorkOrderId and F_Id > a.F_Id  )) ";
+                        sql += "and F_WorkOrderId in(  select F_WorkOrderId from T_Bus_AssignedInfo as a  WITH(NOLOCK)  where F_State=1 and F_IsDelete=0 and ISNULL(F_FeedbackTime, '')=''and F_IsNext = 3  " +
+                            "and F_MainDeptId =" + User.F_DeptId + "  " +
+                            "and not exists(select 1 from T_Bus_AssignedInfo WITH(NOLOCK) where F_WorkOrderId = a.F_WorkOrderId and F_Id > a.F_Id  )  " +
+                            ") ";
                     }
                     else
                     {
-                        sql += "and F_WorkOrderId in(  select F_WorkOrderId from T_Bus_AssignedInfo as a  WITH(NOLOCK)  where F_State=1 and F_IsDelete=0 and ISNULL(F_FeedbackTime, '')=''and F_IsNext = 3  and not exists(select 1 from T_Bus_AssignedInfo WITH(NOLOCK) where F_WorkOrderId = a.F_WorkOrderId and F_Id > a.F_Id  )) ";
+                        sql += "and F_WorkOrderId in(  select F_WorkOrderId from T_Bus_AssignedInfo as a  WITH(NOLOCK)  where F_State=1 and F_IsDelete=0 and ISNULL(F_FeedbackTime, '')=''and F_IsNext = 3  " +
+                            "and not exists(select 1 from T_Bus_AssignedInfo WITH(NOLOCK) where F_WorkOrderId = a.F_WorkOrderId and F_Id > a.F_Id  )) ";
                     }
                     break;
                 case "16"://退回被拒绝
@@ -17705,12 +17709,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                             modelT_Bus_AssignedInfo.F_IsNext = 2;
                                             modelT_Bus_AssignedInfo.F_FeedbackTime = null;
                                         }
-                                        //else 
-                                        //{
-                                        //    keyValuePairs.Add("F_WorkState", (int)EnumWorkState.dealed);
-                                        //    modelT_Bus_WorkOrder.F_WorkState = (int)EnumWorkState.dealed;//待回访
-                                        //    modelT_Bus_AssignedInfo.F_FeedbackTime = DateTime.Now;
-                                        //}
+
                                     }
                                 }