延时

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/APPController.cs

@@ -1298,7 +1298,7 @@ namespace CallCenterApi.Interface.Controllers
                 dwthsh += ")";
             }
 
-            string dwyssh = sql + "  and F_WorkOrderID in(select F_WorkOrderID from T_Bus_DelayTime WITH(NOLOCK) where F_State=1 and F_IsDelete=0 ";
+            string dwyssh = sql + "  and F_WorkOrderID in(select F_WorkOrderID from T_Bus_DelayTime WITH(NOLOCK) where  F_IsDelete=0 ";
             if (userModel.F_RoleCode != "GLY" && userModel.F_RoleCode != "DDZG")
             {
                 dwyssh += " and F_CreateUser='" + userModel.F_UserCode + "')";
@@ -1544,7 +1544,7 @@ namespace CallCenterApi.Interface.Controllers
                     string thsql = "select *,dbo.GetUserName(F_CreateUser) as UserName,dbo.GetDeptName(F_CreateDeptId) as DeptName "
                                     + "from T_Bus_Feedback where F_State=1 and F_Type=3 and F_IsDelete=0 and  F_WorkOrderId ='" + strworkorderid + "'";
                     string yssql = "select *,dbo.GetUserName(F_CreateUser) as UserName "
-                                    + "from T_Bus_DelayTime where F_State=1 and F_IsDelete=0 and F_WorkOrderId ='" + strworkorderid + "'";
+                                    + "from T_Bus_DelayTime where  F_IsDelete=0 and F_WorkOrderId ='" + strworkorderid + "'";
                     string blsql = "select *,dbo.GetUserName(F_CreateUser) as UserName,dbo.GetDeptName(F_CreateDeptId) as DeptName "
                                     + "from T_Bus_Feedback where F_State=1 and F_Type!=3 and F_IsDelete=0 and  F_WorkOrderId ='" + strworkorderid + "'";
                     string hfsql = "select *,dbo.GetUserName(F_CreateUser) as UserName "

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/County/CountyBusinessController.cs

@@ -332,7 +332,7 @@ namespace CallCenterApi.Interface.Controllers.County
                     string thsql = "select *,dbo.GetUserName(F_CreateUser) as UserName,dbo.GetDeptName(F_CreateDeptId) as DeptName "
                                     + "from T_Bus_Feedback where F_State=1 and F_Type=3 and F_IsDelete=0 and  F_WorkOrderId ='" + strworkorderid + "'";
                     string yssql = "select *,dbo.GetUserName(F_CreateUser) as UserName "
-                                    + "from T_Bus_DelayTime where F_State=1 and F_IsDelete=0 and F_WorkOrderId ='" + strworkorderid + "'";
+                                    + "from T_Bus_DelayTime where  F_IsDelete=0 and F_WorkOrderId ='" + strworkorderid + "'";
                     string blsql = "select *,dbo.GetUserName(F_CreateUser) as UserName,dbo.GetDeptName(F_CreateDeptId) as DeptName "
                                     + "from T_Bus_Feedback where F_State=1 and F_Type!=3 and F_IsDelete=0 and  F_WorkOrderId ='" + strworkorderid + "'";
                     string hfsql = "select *,dbo.GetUserName(F_CreateUser) as UserName "

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

@@ -2281,7 +2281,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                             sql += " and F_WorkState = '" + strstate.Trim() + "' ";
                         //sql += " and F_WorkState = '" + strstate.Trim() + "' ";
                     }
-                    sql += "  and F_WorkOrderID in (select F_WorkOrderID from T_Bus_DelayTime WITH(NOLOCK) where F_State=1 and F_IsDelete=0 and F_IsAudit>0 ";
+                    sql += "  and F_WorkOrderID in (select F_WorkOrderID from T_Bus_DelayTime WITH(NOLOCK) where F_IsDelete=0 and F_IsAudit>0 ";
                     if (User.F_RoleCode != "GLY" && User.F_RoleCode != "ZXLDGLY" && User.F_RoleCode != "ZXLDGLYGLY" && User.F_RoleCode != "DDZG")
                     {
                         sql += " and F_AuditUser='" + User.F_UserCode + "')";
@@ -2958,11 +2958,11 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                 {
                                     if (isys == 0)
                                     {
-                                        sql += "and F_WorkOrderId not in (select F_WorkOrderID from T_Bus_DelayTime WITH(NOLOCK) where F_State=1 and F_IsDelete=0)";
+                                        sql += "and F_WorkOrderId not in (select F_WorkOrderID from T_Bus_DelayTime WITH(NOLOCK) where  F_IsDelete=0)";
                                     }
                                     else if (isys == 1)
                                     {
-                                        sql += "and F_WorkOrderId  in (select F_WorkOrderID from T_Bus_DelayTime WITH(NOLOCK) where F_State=1 and F_IsDelete=0)";
+                                        sql += "and F_WorkOrderId  in (select F_WorkOrderID from T_Bus_DelayTime WITH(NOLOCK) where  F_IsDelete=0)";
                                     }
                                 }
 
@@ -3049,7 +3049,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                         }
                     }
 
-                    sql += "  and F_WorkOrderID in(select F_WorkOrderID from T_Bus_DelayTime WITH(NOLOCK) where F_State=1 and F_IsDelete=0 ";
+                    sql += "  and F_WorkOrderID in(select F_WorkOrderID from T_Bus_DelayTime WITH(NOLOCK) where  F_IsDelete=0 ";
                     if (User.F_RoleCode != "GLY" && User.F_RoleCode != "DDZG" && User.F_RoleCode != "ZXHWY" && User.F_RoleCode != "ZXLD" && User.F_RoleCode != "DDZG" && User.F_RoleCode != "MTDD")
                     {
                         sql += " and F_CreateUser='" + User.F_UserCode + "')";
@@ -4583,7 +4583,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                         if (isys == 0)  //未延时
                         {
                             sql += " and F_WorkOrderId in (select F_WorkOrderId from T_Bus_AssignedInfo_Next WITH(NOLOCK) where F_State=1 and F_IsDelete=0 and "
-                       + " ISNULL(F_FeedbackTime, '')='' and F_MainDeptId =" + User.F_DeptId + " and F_IsSure in (0,1) and F_WorkOrderId not in (select F_WorkOrderID from T_Bus_DelayTime WITH(NOLOCK) where F_State=1 and F_IsDelete=0 and F_IsAudit=1)  ) " +
+                       + " ISNULL(F_FeedbackTime, '')='' and F_MainDeptId =" + User.F_DeptId + " and F_IsSure in (0,1) and F_WorkOrderId not in (select F_WorkOrderID from T_Bus_DelayTime WITH(NOLOCK) where  F_IsDelete=0 and F_IsAudit=1)  ) " +
                        "and  F_MainDeptID3='" + User.F_DeptId + "'";
                         }
                         else
@@ -4639,7 +4639,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     sql += " and F_WorkOrderId in (select F_WorkOrderId from T_Bus_AssignedInfo_Next WITH(NOLOCK) where F_State=1 and F_IsDelete=0 and F_MainDeptId =" + User.F_DeptId + " and F_IsSure in (1))";
                     break;
                 case "5"://
-                    sql += "  and F_WorkOrderID in(select F_WorkOrderID from T_Bus_DelayTime WITH(NOLOCK) where F_State=1 and F_IsDelete=0)" +
+                    sql += "  and F_WorkOrderID in(select F_WorkOrderID from T_Bus_DelayTime WITH(NOLOCK) where  F_IsDelete=0)" +
                         "and F_MainDeptID3 ='" + User.F_DeptId + "'";
                     break;
                 case "6"://已完结
@@ -4808,7 +4808,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     + "  dbo.GetDeptNames(F_MainDeptId ) 主办单位, "
                     + " (select top 1 F_Result from T_Bus_Feedback WITH(NOLOCK) where F_State=1 and F_Type!=3 and F_IsDelete=0 and  F_WorkOrderId =a.F_WorkOrderId order by F_Id desc) 办理结果, "
                     + " (select top 1 (case F_IsSatisfie when 1 then'满意' when 0 then '不满意' else '未评价' end) F_Satisfie from T_Bus_VisitResult WITH(NOLOCK) where F_State = 1 and F_IsDelete = 0 and F_WorkOrderId = a.F_WorkOrderId order by F_Id desc) 是否满意 ,"
-                + "(case when F_WorkOrderId  in (select F_WorkOrderID from T_Bus_DelayTime WITH(NOLOCK) where F_State=1 and F_IsDelete=0 and F_IsAudit=1) then '1'else '0' end) 延时状态"
+                + "(case when F_WorkOrderId  in (select F_WorkOrderID from T_Bus_DelayTime WITH(NOLOCK) where  F_IsDelete=0 and F_IsAudit=1) then '1'else '0' end) 延时状态"
                     + " from T_Bus_WorkOrder a WITH(NOLOCK) where 1=1 " + sql).Tables[0];
 
                 var msg = new NPOIHelper().ExportToExcel("工单列表", dtdc);
@@ -8080,7 +8080,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     string thsql = "select *,dbo.GetUserName(F_CreateUser) as UserName,dbo.GetDeptName(F_CreateDeptId) as DeptName "
                                     + "from T_Bus_Feedback WITH(NOLOCK) where F_State=1 and F_Type=3 and F_IsDelete=0 and  F_WorkOrderId ='" + strworkorderid + "' order by F_CreateTime";
                     string yssql = "select *,dbo.GetUserName(F_CreateUser) as UserName "
-                                    + "from T_Bus_DelayTime WITH(NOLOCK) where F_State=1 and F_IsDelete=0 and F_WorkOrderId ='" + strworkorderid + "' order by F_CreateTime";
+                                    + "from T_Bus_DelayTime WITH(NOLOCK) where  F_IsDelete=0 and F_WorkOrderId ='" + strworkorderid + "' order by F_CreateTime";
                     string blsql = "select *,dbo.GetUserName(F_CreateUser) as UserName,dbo.GetDeptName(F_CreateDeptId) as DeptName "
                                     + "from T_Bus_Feedback WITH(NOLOCK) where F_State=1 and F_Type!=3 and F_IsDelete=0 and  F_WorkOrderId ='" + strworkorderid + "' order by F_CreateTime";
                     string ejblsql = "select *,dbo.GetUserName(F_CreateUser) as UserName,dbo.GetDeptName(F_CreateDeptId) as DeptName "
@@ -8656,7 +8656,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     #endregion
                     case 5:
                         #region 延时信息
-                        string yssql = "select *,dbo.GetUserName(F_CreateUser) as UserName from T_Bus_DelayTime WITH(NOLOCK) where F_State=1 and F_IsDelete=0 and F_WorkOrderId ='" + strworkorderid + "' order by F_CreateTime";
+                        string yssql = "select *,dbo.GetUserName(F_CreateUser) as UserName from T_Bus_DelayTime WITH(NOLOCK) where  F_IsDelete=0 and F_WorkOrderId ='" + strworkorderid + "' order by F_CreateTime";
                         var ysdt = DbHelperSQL.Query(yssql).Tables[0];
                         if (configfj != null)
                         {
@@ -8835,7 +8835,11 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     case 2: sql = "select top 1 * from T_Bus_DelayTime WITH(NOLOCK) where "; break;
                     case 3: sql = "select top 1 * from T_Bus_PerformDuties WITH(NOLOCK) where "; break;
                 }
-                sql += " F_WorkOrderId='" + strworkorderid + "' and F_State=1 and F_IsDelete=0 and F_IsAudit=0 order by F_CreateTime desc";
+                if (type != 2)
+                {
+                    sql += " and F_State=1";
+                }
+                sql += " F_WorkOrderId='" + strworkorderid + "' and F_IsDelete=0 and F_IsAudit=0 order by F_CreateTime desc";
                 var dt = DbHelperSQL.Query(sql).Tables[0];
                 if (dt.Rows.Count > 0)
                 {
@@ -14061,7 +14065,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                         using (TransactionScope trans = new TransactionScope(TransactionScopeOption.Required, new TimeSpan(0, 10, 0)))
                         {
                             Model.T_Bus_WorkOrder modelT_Bus_WorkOrder = workorderBLL.GetModel(str);
-                            Model.T_Bus_DelayTime modelT_Bus_DelayTime = new BLL.T_Bus_DelayTime().GetModelList("   F_WorkOrderId = '" + str + "' and F_State = 1 and F_IsDelete = 0 and F_IsAudit = 0 order by  F_CreateTime desc").FirstOrDefault();
+                            Model.T_Bus_DelayTime modelT_Bus_DelayTime = new BLL.T_Bus_DelayTime().GetModelList("   F_WorkOrderId = '" + str + "'  and F_IsDelete = 0 and F_IsAudit = 0 order by  F_CreateTime desc").FirstOrDefault();
                             Model.T_Bus_AssignedInfo modelT_Bus_AssignedInfo = assignBLL.GetNewModelByWorkOrderID(str);
                             var modelT_Bus_AssignedInfo_Next = new BLL.T_Bus_AssignedInfo_Next().GetModelList("F_State=1 and F_IsDelete=0 and F_WorkOrderId='" + str + "'  order by F_CreateTime desc");
                             if (modelT_Bus_WorkOrder != null && modelT_Bus_DelayTime != null && modelT_Bus_AssignedInfo != null)