diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudyFormFill.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudyFormFill.java index b35ad8b..a5e3e15 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudyFormFill.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudyFormFill.java @@ -64,15 +64,21 @@ public class StudyFormFill extends MpBaseEntity /** 物资信息 */ private String resource; + /** 处置list */ + private String czlist; + + /** 存储list */ + private String cclist; + /** 填报开始时间 */ @Excel(name = "填报开始时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date kssj; + private Date startDate; /** 填报结束时间 */ @Excel(name = "填报结束时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date jssj; + private Date endDate; /** 签名意义 */ @TableField(exist = false) @@ -103,6 +109,22 @@ public class StudyFormFill extends MpBaseEntity @TableField(exist = false) private String studyMc; + public String getCzlist() { + return czlist; + } + + public void setCzlist(String czlist) { + this.czlist = czlist; + } + + public String getCclist() { + return cclist; + } + + public void setCclist(String cclist) { + this.cclist = cclist; + } + public String getResource() { return resource; } @@ -111,20 +133,20 @@ public class StudyFormFill extends MpBaseEntity this.resource = resource; } - public Date getKssj() { - return kssj; + public Date getStartDate() { + return startDate; } - public void setKssj(Date kssj) { - this.kssj = kssj; + public void setStartDate(Date startDate) { + this.startDate = startDate; } - public Date getJssj() { - return jssj; + public Date getEndDate() { + return endDate; } - public void setJssj(Date jssj) { - this.jssj = jssj; + public void setEndDate(Date endDate) { + this.endDate = endDate; } public String getStudySn() { diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormFillServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormFillServiceImpl.java index 91a5ee9..98f7938 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormFillServiceImpl.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormFillServiceImpl.java @@ -294,6 +294,7 @@ public class StudyFormFillServiceImpl extends ServiceImpl