Browse Source

Merge remote-tracking branch 'origin/master'

zhongwei
ty 9 months ago
parent
commit
2b4666e454
  1. 3
      hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/hiddenDanger/schedule/HiddenDangerPlanSchedule.java
  2. BIN
      hzims-service/ticket/src/main/resources/template/电气操作票.docx

3
hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/hiddenDanger/schedule/HiddenDangerPlanSchedule.java

@ -125,7 +125,8 @@ public class HiddenDangerPlanSchedule {
// 已经生成过任务的计划 // 已经生成过任务的计划
List<HDPlanEntity> existTaskPlanList = hdPlanService.list(Wrappers.<HDPlanEntity>lambdaQuery() List<HDPlanEntity> existTaskPlanList = hdPlanService.list(Wrappers.<HDPlanEntity>lambdaQuery()
.eq(HDPlanEntity::getStatus, Constants.PlanStatusEnum.HAVE.getStatus()) .eq(HDPlanEntity::getStatus, Constants.PlanStatusEnum.HAVE.getStatus())
.eq(HDPlanEntity::getNextGenerateTaskTime,LocalDateTime.of(currentDate,LocalTime.MIN)) .ge(HDPlanEntity::getNextGenerateTaskTime,LocalDateTime.of(currentDate,LocalTime.MIN))
.le(HDPlanEntity::getNextGenerateTaskTime,LocalDateTime.of(currentDate,LocalTime.MAX))
.eq(HDPlanEntity::getEnable,true) .eq(HDPlanEntity::getEnable,true)
); );
if(CollectionUtil.isNotEmpty(existTaskPlanList)) { if(CollectionUtil.isNotEmpty(existTaskPlanList)) {

BIN
hzims-service/ticket/src/main/resources/template/电气操作票.docx

Binary file not shown.
Loading…
Cancel
Save