diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/inspectionplan/vo/AppInspectionPlanPageReqVO.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/inspectionplan/vo/AppInspectionPlanPageReqVO.java index 3e65621..ae62771 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/inspectionplan/vo/AppInspectionPlanPageReqVO.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/inspectionplan/vo/AppInspectionPlanPageReqVO.java @@ -8,6 +8,7 @@ import jakarta.validation.constraints.Min; import jakarta.validation.constraints.NotNull; import lombok.Data; +import java.time.LocalDate; import java.util.List; import java.util.Set; @@ -37,4 +38,8 @@ public class AppInspectionPlanPageReqVO extends PageParam { @Hidden private Long deptId; + @Schema(description = "系统时间") + @Hidden + private LocalDate localDate; + } diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/maintainplan/vo/AppMaintainPlanPagePlanTypeReqVO.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/maintainplan/vo/AppMaintainPlanPagePlanTypeReqVO.java index eee1c29..2dc937d 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/maintainplan/vo/AppMaintainPlanPagePlanTypeReqVO.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/maintainplan/vo/AppMaintainPlanPagePlanTypeReqVO.java @@ -46,5 +46,9 @@ public class AppMaintainPlanPagePlanTypeReqVO extends PageParam { @Hidden private Long deptId; + @Schema(description = "开始时间") + @Hidden + private LocalDateTime localDateTime; + } \ No newline at end of file diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/maintainplan/vo/AppMaintainPlanPageRoadReqVO.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/maintainplan/vo/AppMaintainPlanPageRoadReqVO.java index 3f47b69..7446432 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/maintainplan/vo/AppMaintainPlanPageRoadReqVO.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/maintainplan/vo/AppMaintainPlanPageRoadReqVO.java @@ -42,6 +42,10 @@ public class AppMaintainPlanPageRoadReqVO extends PageParam { @Hidden private Long deptId; + @Schema(description = "当前时间") + @Hidden + private LocalDate localDate; + } \ No newline at end of file diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/inspectionplan/InspectionPlanServiceImpl.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/inspectionplan/InspectionPlanServiceImpl.java index ff401b8..42da16b 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/inspectionplan/InspectionPlanServiceImpl.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/inspectionplan/InspectionPlanServiceImpl.java @@ -370,6 +370,7 @@ public class InspectionPlanServiceImpl implements InspectionPlanService { } pageReqVO.setDeptId(SecurityFrameworkUtils.getDeptId()); pageReqVO.setRoleIds(new HashSet<>(roleIds)); + pageReqVO.setLocalDate(LocalDate.now()); /*2.分页*/ IPage mpPage = MyBatisUtils.buildPage(pageReqVO); IPage page = inspectionPlanMapper.getInspectionPlanAppPage(mpPage, pageReqVO); diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/maintainplan/MaintainPlanServiceImpl.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/maintainplan/MaintainPlanServiceImpl.java index 4b6f8ef..2b53b49 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/maintainplan/MaintainPlanServiceImpl.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/maintainplan/MaintainPlanServiceImpl.java @@ -384,6 +384,7 @@ public class MaintainPlanServiceImpl implements MaintainPlanService { } pageReqVO.setRoleIds(new HashSet<>(roleIds)); pageReqVO.setDeptId(SecurityFrameworkUtils.getDeptId()); + pageReqVO.setLocalDate(LocalDate.now()); /*2.分页*/ IPage mpPage = MyBatisUtils.buildPage(pageReqVO); IPage page = maintainPlanMapper.appMaintainPlanRoadPage(mpPage, pageReqVO); @@ -404,6 +405,7 @@ public class MaintainPlanServiceImpl implements MaintainPlanService { } pageReqVO.setDeptId(SecurityFrameworkUtils.getDeptId()); pageReqVO.setRoleIds(new HashSet<>(roleIds)); + pageReqVO.setLocalDateTime(LocalDateTime.now()); /*2.分页*/ IPage mpPage = MyBatisUtils.buildPage(pageReqVO); IPage page = maintainPlanMapper.appMaintainPlanPlanTypePage(mpPage, pageReqVO); diff --git a/urbanops-module-garden/src/main/resources/mapper/inspectionplan/InspectionPlanMapper.xml b/urbanops-module-garden/src/main/resources/mapper/inspectionplan/InspectionPlanMapper.xml index 2e6b790..561997d 100644 --- a/urbanops-module-garden/src/main/resources/mapper/inspectionplan/InspectionPlanMapper.xml +++ b/urbanops-module-garden/src/main/resources/mapper/inspectionplan/InspectionPlanMapper.xml @@ -53,7 +53,22 @@ and b.finish_state = a.finish_state - and b.finish_state = #{req.finishState} + + and a.finish_state = b.finish_state + + and a.finish_state = 1 + = #{req.localDate}]]> + + + and a.finish_state = 2 + + + and a.finish_state = 3 + + + and a.finish_state = 4 + diff --git a/urbanops-module-garden/src/main/resources/mapper/maintainplan/MaintainPlanMapper.xml b/urbanops-module-garden/src/main/resources/mapper/maintainplan/MaintainPlanMapper.xml index 7c7a611..28915ff 100644 --- a/urbanops-module-garden/src/main/resources/mapper/maintainplan/MaintainPlanMapper.xml +++ b/urbanops-module-garden/src/main/resources/mapper/maintainplan/MaintainPlanMapper.xml @@ -55,7 +55,20 @@ and a.finish_state = b.finish_state - and a.finish_state = #{req.finishState} + + and a.finish_state = 1 + = #{req.localDate}]]> + + + and a.finish_state = 2 + + + and a.finish_state = 3 + + + and a.finish_state = 4 +