diff --git a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/param/LineParam.java b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/param/LineParam.java index 5089b0c80..4eaa3dcdb 100644 --- a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/param/LineParam.java +++ b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/param/LineParam.java @@ -46,18 +46,20 @@ public class LineParam { /** * 调度任务开始时间 */ + @NotBlank(message = "调度任务开始时间不可为空") private String beginTime; /** * 调度任务结束时间 */ + @NotBlank(message = "调度任务结束时间不可为空") private String endTime; /** * 是否补招标识,默认false不补招 */ - @ApiModelProperty(name = "repairFlag",value = "0.不补招 1.补招") - private Integer repairFlag = 0; + @ApiModelProperty(name = "repairFlag",value = "0.不补招 1.补招",example = "false") + private Boolean repairFlag = false; } diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/line/DayDataController.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/line/DayDataController.java index 2dd55b712..a8dad8e14 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/line/DayDataController.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/line/DayDataController.java @@ -27,10 +27,7 @@ import org.springframework.web.bind.annotation.RestController; import java.text.SimpleDateFormat; import java.time.LocalDateTime; -import java.util.ArrayList; -import java.util.Calendar; -import java.util.Date; -import java.util.List; +import java.util.*; /** * Description: @@ -94,7 +91,7 @@ public class DayDataController extends BaseController { } else{ indexLists = jobParam.getLineIds(); } - if (jobParam.getRepairFlag() == 1){ + if (Objects.nonNull(jobParam.getRepairFlag()) && jobParam.getRepairFlag()){ List timeRange = NjcnDateUtils.findEveryDay(jobParam.getBeginTime(),jobParam.getEndTime()); for (String item : timeRange) { log.info(item+"-->开始执行"); diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/line/IntegrityController.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/line/IntegrityController.java index f7b81d9c2..a09a16127 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/line/IntegrityController.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/line/IntegrityController.java @@ -23,6 +23,7 @@ import org.springframework.web.bind.annotation.RestController; import java.time.LocalDateTime; import java.util.List; +import java.util.Objects; /** * @author xiaoyao @@ -58,7 +59,7 @@ public class IntegrityController extends BaseController { log.info(LocalDateTime.now()+"dataIntegrity开始执行"); String methodDescribe = getMethodDescribe("dataIntegrity"); String startTime,endTime; - if (lineParam.getRepairFlag() == 1){ + if (Objects.nonNull(lineParam.getRepairFlag()) && lineParam.getRepairFlag()){ List timeRange = NjcnDateUtils.findEveryDay(lineParam.getBeginTime(),lineParam.getEndTime()); for (String item : timeRange) { log.info(item+"-->开始执行");