diff --git a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/WorkOrderInfoController.java b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/WorkOrderInfoController.java index be3f33b..b5cdc58 100644 --- a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/WorkOrderInfoController.java +++ b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/WorkOrderInfoController.java @@ -186,4 +186,12 @@ public class WorkOrderInfoController extends BaseController { TableDataInfo rs = workOrderInfoService.reviewList(bo, pageQuery); return rs; } + + + @SaCheckPermission("platform:workOrder:dispatchList") + @GetMapping("/dispatchList") + public TableDataInfo dispatchList(WorkOrderInfoBo bo, PageQuery pageQuery) { + TableDataInfo rs = workOrderInfoService.dispatchList(bo, pageQuery); + return rs; + } } diff --git a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/vo/WorkOrderInfoVo.java b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/vo/WorkOrderInfoVo.java index 344efdb..6cd22dd 100644 --- a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/vo/WorkOrderInfoVo.java +++ b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/vo/WorkOrderInfoVo.java @@ -181,6 +181,7 @@ public class WorkOrderInfoVo implements Serializable { * 4 初审 * 5 终审 * 6 结案 + * 7 处理中(已延期) */ @ExcelProperty(value = "当前状态") private Long status; diff --git a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/IWorkOrderInfoService.java b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/IWorkOrderInfoService.java index 03f5db0..ff5d702 100644 --- a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/IWorkOrderInfoService.java +++ b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/IWorkOrderInfoService.java @@ -128,4 +128,6 @@ public interface IWorkOrderInfoService { * @param bo */ void delaySubmit(WorkOrderDelayBo bo); + + TableDataInfo dispatchList(WorkOrderInfoBo bo, PageQuery pageQuery); } diff --git a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/impl/WorkOrderInfoServiceImpl.java b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/impl/WorkOrderInfoServiceImpl.java index 5c2c1ca..655bfab 100644 --- a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/impl/WorkOrderInfoServiceImpl.java +++ b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/impl/WorkOrderInfoServiceImpl.java @@ -406,7 +406,8 @@ public class WorkOrderInfoServiceImpl implements IWorkOrderInfoService { List records = result.getRecords(); List filterRecords = records.stream() .filter(record -> record.getStatus() != null - && (record.getStatus() < 4 || record.getStatus() == 7)) + && (record.getStatus() == 1 || record.getStatus() == 2 || record.getStatus() == 7) + ) .collect(Collectors.toList()); // 封装 @@ -887,4 +888,18 @@ public class WorkOrderInfoServiceImpl implements IWorkOrderInfoService { } + @Override + public TableDataInfo dispatchList(WorkOrderInfoBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + List records = result.getRecords(); + List filterRecords = records.stream() + .filter(record -> record.getStatus() != null + && (record.getStatus() == 0 || record.getStatus() == 3) + ) + .collect(Collectors.toList()); + result.setRecords(filterRecords); + return TableDataInfo.build(result); + } + }