BJ_FS / urbanops

Commit a9ac779c3ced069716b6febebc6d231674989ecf

Authored by 王彪总
2 parents 9abc2b29 ba1af3fd

Merge remote-tracking branch 'origin/dev' into dev

Inline Side-by-side
Showing 3 changed files with 5 additions and 1 deletions
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/inspectionplan/vo/InspectionPlanSaveReqVO.java
  View file @a9ac779
@@ -48,7 +48,7 @@ public class InspectionPlanSaveReqVO { @@ -48,7 +48,7 @@ public class InspectionPlanSaveReqVO {
48 @NotEmpty(message = "频次值不能为空") 48 @NotEmpty(message = "频次值不能为空")
49 private String rateValue; 49 private String rateValue;
50 50
51 - @Schema(description = "周期ID: 1:日/次；2:周/次；3:月/次；4:年/次；5:按次；6:季度；7:半年", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") 51 + @Schema(description = "周期ID: 0:次；1:日/次；2:周/次；3:月/次；4:季/次；5:半年/次；6:年/次", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
52 @NotNull(message = "周期ID: 1:日/次；2:周/次；3:月/次；4:年/次；5:按次；6:季度；7:半年") 52 @NotNull(message = "周期ID: 1:日/次；2:周/次；3:月/次；4:年/次；5:按次；6:季度；7:半年")
53 private Integer cycleId; 53 private Integer cycleId;
54 54
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/inspectionplan/InspectionPlanServiceImpl.java
  View file @a9ac779
@@ -239,6 +239,7 @@ public class InspectionPlanServiceImpl implements InspectionPlanService { @@ -239,6 +239,7 @@ public class InspectionPlanServiceImpl implements InspectionPlanService {
239 QueryWrapper<InspectionPlanDO> sql = new QueryWrapper<>(); 239 QueryWrapper<InspectionPlanDO> sql = new QueryWrapper<>();
240 sql.lambda().eq(InspectionPlanDO::getPlanTypeId, req.getPlanTypeId()) 240 sql.lambda().eq(InspectionPlanDO::getPlanTypeId, req.getPlanTypeId())
241 .in(InspectionPlanDO::getRoadId, roadIds) 241 .in(InspectionPlanDO::getRoadId, roadIds)
  242 + .eq(InspectionPlanDO::getPlanAttr, 1) //标准计划
242 .le(InspectionPlanDO::getBeginTime, req.getEndTime()) // start_time <= endTime 243 .le(InspectionPlanDO::getBeginTime, req.getEndTime()) // start_time <= endTime
243 .ge(InspectionPlanDO::getEndTime, req.getBeginTime()); // end_time >= startTime 244 .ge(InspectionPlanDO::getEndTime, req.getBeginTime()); // end_time >= startTime
244 245
@@ -248,6 +249,7 @@ public class InspectionPlanServiceImpl implements InspectionPlanService { @@ -248,6 +249,7 @@ public class InspectionPlanServiceImpl implements InspectionPlanService {
248 sql.lambda().eq(InspectionPlanDO::getPlanTypeId, req.getPlanTypeId()) 249 sql.lambda().eq(InspectionPlanDO::getPlanTypeId, req.getPlanTypeId())
249 .in(InspectionPlanDO::getRoadId, roadIds) 250 .in(InspectionPlanDO::getRoadId, roadIds)
250 .eq(InspectionPlanDO::getDeleted, 0) 251 .eq(InspectionPlanDO::getDeleted, 0)
  252 + .eq(InspectionPlanDO::getPlanAttr, 2) //临时计划
251 .le(InspectionPlanDO::getBeginTime, req.getEndTime()) // start_time <= endTime 253 .le(InspectionPlanDO::getBeginTime, req.getEndTime()) // start_time <= endTime
252 .ge(InspectionPlanDO::getEndTime, req.getBeginTime()); // end_time >= startTime 254 .ge(InspectionPlanDO::getEndTime, req.getBeginTime()); // end_time >= startTime
253 255
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/maintainplan/MaintainPlanServiceImpl.java
  View file @a9ac779
@@ -257,6 +257,7 @@ public class MaintainPlanServiceImpl implements MaintainPlanService { @@ -257,6 +257,7 @@ public class MaintainPlanServiceImpl implements MaintainPlanService {
257 QueryWrapper<MaintainPlanDO> sql = new QueryWrapper<>(); 257 QueryWrapper<MaintainPlanDO> sql = new QueryWrapper<>();
258 sql.lambda().eq(MaintainPlanDO::getPlanTypeId, req.getPlanTypeId()) 258 sql.lambda().eq(MaintainPlanDO::getPlanTypeId, req.getPlanTypeId())
259 .in(MaintainPlanDO::getRoadId, roadIds) 259 .in(MaintainPlanDO::getRoadId, roadIds)
  260 + .eq(MaintainPlanDO::getPlanAttr, 1) //标准计划
260 .le(MaintainPlanDO::getBeginTime, req.getEndTime()) // start_time <= endTime 261 .le(MaintainPlanDO::getBeginTime, req.getEndTime()) // start_time <= endTime
261 .ge(MaintainPlanDO::getEndTime, req.getBeginTime()); // end_time >= startTime 262 .ge(MaintainPlanDO::getEndTime, req.getBeginTime()); // end_time >= startTime
262 263
@@ -266,6 +267,7 @@ public class MaintainPlanServiceImpl implements MaintainPlanService { @@ -266,6 +267,7 @@ public class MaintainPlanServiceImpl implements MaintainPlanService {
266 sql.lambda().eq(MaintainPlanDO::getPlanTypeId, req.getPlanTypeId()) 267 sql.lambda().eq(MaintainPlanDO::getPlanTypeId, req.getPlanTypeId())
267 .in(MaintainPlanDO::getRoadId, roadIds) 268 .in(MaintainPlanDO::getRoadId, roadIds)
268 .eq(MaintainPlanDO::getDeleted, 0) 269 .eq(MaintainPlanDO::getDeleted, 0)
  270 + .eq(MaintainPlanDO::getPlanAttr, 2) //临时计划
269 .le(MaintainPlanDO::getBeginTime, req.getEndTime()) // start_time <= endTime 271 .le(MaintainPlanDO::getBeginTime, req.getEndTime()) // start_time <= endTime
270 .ge(MaintainPlanDO::getEndTime, req.getBeginTime()); // end_time >= startTime 272 .ge(MaintainPlanDO::getEndTime, req.getBeginTime()); // end_time >= startTime
271 273