工单问题 代办工单查询 审核驳回的工单

tuoheng-service/tuoheng-miniprogram/src/main/java/com/tuoheng/miniprogram/service/impl/WorkOrderServiceImpl.java

@@ -179,7 +179,7 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
         if (RoleEnum.SUPER_ADMIN.getCode() == type) {
             //查询当前租户下所有工单数据
             IPage<WorkOrder> workPageData = workOrderMapper.selectPage(page, Wrappers.<WorkOrder>lambdaQuery()
-                    .eq(WorkOrder::getStatus, 5)
+                    .in(WorkOrder::getStatus, 5, 12)
                     .eq(WorkOrder::getTenantId, tenantId)
                     .between(null != query.getOrderStartTime() && null != query.getOrderEndTime(), WorkOrder::getCreateTime, query.getOrderStartTime(), query.getOrderEndTime())
                     .eq(WorkOrder::getMark, MarkEnum.VALID.getCode())
@@ -215,7 +215,7 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
 
             //查询当前部门及子部门下所有工单数据
             IPage<WorkOrder> workPageData = workOrderMapper.selectPage(page, Wrappers.<WorkOrder>lambdaQuery()
-                    .eq(WorkOrder::getStatus, 5)
+                    .in(WorkOrder::getStatus, 5, 12)
                     .in(WorkOrder::getDeptId,deptIdList)
                     .eq(WorkOrder::getTenantId, tenantId)
                     .between(null != query.getOrderStartTime() && null != query.getOrderEndTime(), WorkOrder::getCreateTime, query.getOrderStartTime(), query.getOrderEndTime())
@@ -244,7 +244,7 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
                 return JsonResult.error(QueryDeptChildListCodeEnum.DEPT_ID_IS_NULL.getCode(),QueryDeptChildListCodeEnum.DEPT_ID_IS_NULL.getMsg());
             }
             IPage<WorkOrder> workPageData = workOrderMapper.selectPage(page, Wrappers.<WorkOrder>lambdaQuery()
-                    .eq(WorkOrder::getStatus, 5)
+                    .in(WorkOrder::getStatus, 5, 12)
                     .eq(WorkOrder::getDeptId,deptId)
                     .eq(WorkOrder::getTenantId, tenantId)
                     .between(null != query.getOrderStartTime() && null != query.getOrderEndTime(), WorkOrder::getCreateTime, query.getOrderStartTime(), query.getOrderEndTime())