diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/inspectionplan/vo/InspectionPlanSaveReqVO.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/inspectionplan/vo/InspectionPlanSaveReqVO.java index ccce473..c1dbcbe 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/inspectionplan/vo/InspectionPlanSaveReqVO.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/inspectionplan/vo/InspectionPlanSaveReqVO.java @@ -48,7 +48,7 @@ public class InspectionPlanSaveReqVO { @NotEmpty(message = "频次值不能为空") private String rateValue; - @Schema(description = "周期ID: 1:日/次;2:周/次;3:月/次;4:年/次;5:按次;6:季度;7:半年", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") + @Schema(description = "周期ID: 0:次;1:日/次;2:周/次;3:月/次;4:季/次;5:半年/次;6:年/次", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") @NotNull(message = "周期ID: 1:日/次;2:周/次;3:月/次;4:年/次;5:按次;6:季度;7:半年") private Integer cycleId; 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 8de75b7..2085c72 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 @@ -239,6 +239,7 @@ public class InspectionPlanServiceImpl implements InspectionPlanService { QueryWrapper sql = new QueryWrapper<>(); sql.lambda().eq(InspectionPlanDO::getPlanTypeId, req.getPlanTypeId()) .in(InspectionPlanDO::getRoadId, roadIds) + .eq(InspectionPlanDO::getPlanAttr, 1) //标准计划 .le(InspectionPlanDO::getBeginTime, req.getEndTime()) // start_time <= endTime .ge(InspectionPlanDO::getEndTime, req.getBeginTime()); // end_time >= startTime @@ -248,6 +249,7 @@ public class InspectionPlanServiceImpl implements InspectionPlanService { sql.lambda().eq(InspectionPlanDO::getPlanTypeId, req.getPlanTypeId()) .in(InspectionPlanDO::getRoadId, roadIds) .eq(InspectionPlanDO::getDeleted, 0) + .eq(InspectionPlanDO::getPlanAttr, 2) //临时计划 .le(InspectionPlanDO::getBeginTime, req.getEndTime()) // start_time <= endTime .ge(InspectionPlanDO::getEndTime, req.getBeginTime()); // end_time >= startTime 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 bcfb857..bd41119 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 @@ -257,6 +257,7 @@ public class MaintainPlanServiceImpl implements MaintainPlanService { QueryWrapper sql = new QueryWrapper<>(); sql.lambda().eq(MaintainPlanDO::getPlanTypeId, req.getPlanTypeId()) .in(MaintainPlanDO::getRoadId, roadIds) + .eq(MaintainPlanDO::getPlanAttr, 1) //标准计划 .le(MaintainPlanDO::getBeginTime, req.getEndTime()) // start_time <= endTime .ge(MaintainPlanDO::getEndTime, req.getBeginTime()); // end_time >= startTime @@ -266,6 +267,7 @@ public class MaintainPlanServiceImpl implements MaintainPlanService { sql.lambda().eq(MaintainPlanDO::getPlanTypeId, req.getPlanTypeId()) .in(MaintainPlanDO::getRoadId, roadIds) .eq(MaintainPlanDO::getDeleted, 0) + .eq(MaintainPlanDO::getPlanAttr, 2) //临时计划 .le(MaintainPlanDO::getBeginTime, req.getEndTime()) // start_time <= endTime .ge(MaintainPlanDO::getEndTime, req.getBeginTime()); // end_time >= startTime