diff --git a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/RoutineInspectionInfoController.java b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/RoutineInspectionInfoController.java index 7e30f27..dcc1578 100644 --- a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/RoutineInspectionInfoController.java +++ b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/RoutineInspectionInfoController.java @@ -127,5 +127,15 @@ public class RoutineInspectionInfoController extends BaseController { return R.ok("创建日常巡检任务成功!"); } + + + /** + * 查询日常巡检-计划列表 + */ + @SaCheckPermission("platform:routineInspectionInfo:specialList") + @GetMapping("/specialList") + public TableDataInfo specialList(RoutineInspectionInfoBo bo, PageQuery pageQuery) { + return routineInspectionInfoService.queryPageSpecialList(bo, pageQuery); + } } diff --git a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/RoutineInspectionInfo.java b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/RoutineInspectionInfo.java index f0b35e4..564d14e 100644 --- a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/RoutineInspectionInfo.java +++ b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/RoutineInspectionInfo.java @@ -96,6 +96,11 @@ public class RoutineInspectionInfo extends TenantEntity { */ private String approver; + /** + * 交付内容 + */ + private String deliverContent; + /** * 删除标志(0代表存在 2代表删除) */ diff --git a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/bo/RoutineInspectionInfoBo.java b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/bo/RoutineInspectionInfoBo.java index 24ed2ef..f68d9c0 100644 --- a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/bo/RoutineInspectionInfoBo.java +++ b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/bo/RoutineInspectionInfoBo.java @@ -105,5 +105,8 @@ public class RoutineInspectionInfoBo extends BaseEntity { //@NotBlank(message = "审批人不能为空", groups = { AddGroup.class, EditGroup.class }) private String approver; - + /** + * 交付内容 + */ + private String deliverContent; } diff --git a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/vo/InspectionPlanInfoVo.java b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/vo/InspectionPlanInfoVo.java index 51dbd07..bfe5302 100644 --- a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/vo/InspectionPlanInfoVo.java +++ b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/vo/InspectionPlanInfoVo.java @@ -102,5 +102,8 @@ public class InspectionPlanInfoVo implements Serializable { @ExcelProperty(value = "计划时间") private Date planDate; - + /** + * 交付内容 + */ + private String deliverContent; } diff --git a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/vo/RoutineInspectionInfoVo.java b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/vo/RoutineInspectionInfoVo.java index 0669848..a66fa52 100644 --- a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/vo/RoutineInspectionInfoVo.java +++ b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/vo/RoutineInspectionInfoVo.java @@ -114,5 +114,9 @@ public class RoutineInspectionInfoVo implements Serializable { @ExcelProperty(value = "审批人") private String approver; + /** + * 交付内容 + */ + private String deliverContent; } diff --git a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/IRoutineInspectionInfoService.java b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/IRoutineInspectionInfoService.java index 5c736f6..2e7b88a 100644 --- a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/IRoutineInspectionInfoService.java +++ b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/IRoutineInspectionInfoService.java @@ -70,4 +70,6 @@ public interface IRoutineInspectionInfoService { void createRoutineInspection(List finishStatus,String projectName, String contractName,String description,String serviceProject, String ioCompany,String pointName); + + TableDataInfo queryPageSpecialList(RoutineInspectionInfoBo bo, PageQuery pageQuery); } diff --git a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/impl/RoutineInspectionInfoServiceImpl.java b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/impl/RoutineInspectionInfoServiceImpl.java index aa0b779..d1ed8e1 100644 --- a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/impl/RoutineInspectionInfoServiceImpl.java +++ b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/impl/RoutineInspectionInfoServiceImpl.java @@ -21,6 +21,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; import java.util.Collection; +import java.util.stream.Collectors; /** * 日常巡检-计划Service业务层处理 @@ -164,4 +165,17 @@ public class RoutineInspectionInfoServiceImpl implements IRoutineInspectionInfoS baseMapper.insert(addList); log.info("添加日常巡检-任务成功!"); } + + @Override + public TableDataInfo queryPageSpecialList(RoutineInspectionInfoBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + List records = result.getRecords(); + //过滤 records中的每一个元素 交付内容不是 "立项操作"的元素 用Stream流 + List filteredRecords = records.stream() + .filter(record -> !"例行操作".equals(record.getDeliverContent())) + .collect(Collectors.toList()); + result.setRecords(filteredRecords); + return TableDataInfo.build(result); + } }