diff --git a/inventory-dao/src/main/java/com/rzyc/bean/user/dto/ChangeFactorDto.java b/inventory-dao/src/main/java/com/rzyc/bean/user/dto/ChangeFactorDto.java index 6264322..7c1750c 100644 --- a/inventory-dao/src/main/java/com/rzyc/bean/user/dto/ChangeFactorDto.java +++ b/inventory-dao/src/main/java/com/rzyc/bean/user/dto/ChangeFactorDto.java @@ -28,10 +28,6 @@ public class ChangeFactorDto { @ApiModelProperty(value = "考核指标 1:每年 2:每半年 4:每季度 12:每月",required = true) private Integer checkstandard; - @ApiModelProperty("类型 1:检查 2:会议 3:调研 4:其他") - @NotNull(message = "类型不能为空") - private Integer type; - /** * 频率 */ @@ -40,21 +36,6 @@ public class ChangeFactorDto { private Integer frequency; - /** - * 红色提醒天数 - */ - @NotNull(message = "红色提醒天数不能为空") - @ApiModelProperty(value = "红色提醒天数",required = true) - private String redAlert; - - /** - * 黄色提醒天数 - */ - @NotNull(message = "黄色提醒天数不能为空") - @ApiModelProperty(value = "黄色提醒天数",required = true) - private String yellowAlert; - - public String getListfactorid() { return listfactorid; } @@ -102,28 +83,4 @@ public class ChangeFactorDto { public void setFrequency(Integer frequency) { this.frequency = frequency; } - - public String getRedAlert() { - return redAlert; - } - - public void setRedAlert(String redAlert) { - this.redAlert = redAlert; - } - - public String getYellowAlert() { - return yellowAlert; - } - - public void setYellowAlert(String yellowAlert) { - this.yellowAlert = yellowAlert; - } - - public Integer getType() { - return type; - } - - public void setType(Integer type) { - this.type = type; - } } diff --git a/inventory-gov/src/main/java/com/rzyc/controller/PcPersonalController.java b/inventory-gov/src/main/java/com/rzyc/controller/PcPersonalController.java index ad24feb..8eec798 100644 --- a/inventory-gov/src/main/java/com/rzyc/controller/PcPersonalController.java +++ b/inventory-gov/src/main/java/com/rzyc/controller/PcPersonalController.java @@ -2100,6 +2100,13 @@ public class PcPersonalController extends com.rzyc.controller.BaseController { listFactor.setCreatedon(new Date()); listFactor.setModifiedon(new Date()); + //清单提醒时间 + listFactor.setYellowAlert(5+""); + listFactor.setRedAlert(2+""); + + //清单类型 + listFactor.setType(1); + //数据初始