From 06cf0528bbc31bb1be1427b270e5296d26d3a9c2 Mon Sep 17 00:00:00 2001 From: "15881625488@163.com" <15881625488@163.com> Date: Sun, 11 Jan 2026 10:26:05 +0800 Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A[=E8=AF=95=E9=AA=8C=E8=A1=A8?= =?UTF-8?q?=E5=8D=95]=E6=96=B0=E5=A2=9E=E4=BD=BF=E7=94=A8=E7=89=A9?= =?UTF-8?q?=E8=B5=84=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/hxhq/business/domain/StudyFormApply.java | 11 +++++++++++ .../java/com/hxhq/business/domain/StudyFormFill.java | 20 ++++++++++---------- .../java/com/hxhq/business/domain/StudyFormPlan.java | 11 +++++++++++ .../java/com/hxhq/business/domain/StudyFormPre.java | 11 +++++++++++ .../service/impl/StudyFormFillServiceImpl.java | 5 +++++ 5 files changed, 48 insertions(+), 10 deletions(-) diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudyFormApply.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudyFormApply.java index 8cff786..a54431a 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudyFormApply.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudyFormApply.java @@ -60,6 +60,9 @@ public class StudyFormApply extends MpBaseEntity @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date tjsj; + /** 使用物资信息 */ + private String resource; + /** 签名意义 */ @TableField(exist = false) private String qmyy; @@ -89,6 +92,14 @@ public class StudyFormApply extends MpBaseEntity @TableField(exist = false) private String studyMc; + + public String getResource() { + return resource; + } + + public void setResource(String resource) { + this.resource = resource; + } public String getStudySn() { return studySn; } 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 c1eaf87..b35ad8b 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 @@ -67,12 +67,12 @@ public class StudyFormFill extends MpBaseEntity /** 填报开始时间 */ @Excel(name = "填报开始时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date tbkssj; + private Date kssj; /** 填报结束时间 */ @Excel(name = "填报结束时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date tbjssj; + private Date jssj; /** 签名意义 */ @TableField(exist = false) @@ -111,20 +111,20 @@ public class StudyFormFill extends MpBaseEntity this.resource = resource; } - public Date getTbkssj() { - return tbkssj; + public Date getKssj() { + return kssj; } - public void setTbkssj(Date tbkssj) { - this.tbkssj = tbkssj; + public void setKssj(Date kssj) { + this.kssj = kssj; } - public Date getTbjssj() { - return tbjssj; + public Date getJssj() { + return jssj; } - public void setTbjssj(Date tbjssj) { - this.tbjssj = tbjssj; + public void setJssj(Date jssj) { + this.jssj = jssj; } public String getStudySn() { diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudyFormPlan.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudyFormPlan.java index d7d1562..9921a9c 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudyFormPlan.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudyFormPlan.java @@ -61,6 +61,10 @@ public class StudyFormPlan extends MpBaseEntity /** 复核人员名称(通知用) */ private String fhryMc; + /** 物资信息 */ + private String resource; + + /** 签名意义 */ @TableField(exist = false) private String qmyy; @@ -86,6 +90,13 @@ public class StudyFormPlan extends MpBaseEntity @TableField(exist = false) private String studyMc; + public String getResource() { + return resource; + } + + public void setResource(String resource) { + this.resource = resource; + } public Long getFhryId() { return fhryId; } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudyFormPre.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudyFormPre.java index c23d48f..955f50e 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudyFormPre.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudyFormPre.java @@ -70,6 +70,9 @@ public class StudyFormPre extends MpBaseEntity @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date tjsj; + /** 物资信息 */ + private String resource; + /** 签名人密码 */ @TableField(exist = false) private String qmrmm; @@ -95,6 +98,14 @@ public class StudyFormPre extends MpBaseEntity @TableField(exist = false) private String studyMc; + public String getResource() { + return resource; + } + + public void setResource(String resource) { + this.resource = resource; + } + public String getStudySn() { return studySn; } 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 d16e495..91a5ee9 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 @@ -421,6 +421,7 @@ public class StudyFormFillServiceImpl extends ServiceImpl formData = new LinkedHashMap<>(); @@ -451,6 +452,7 @@ public class StudyFormFillServiceImpl extends ServiceImpl formData = new LinkedHashMap<>(); @@ -481,6 +483,7 @@ public class StudyFormFillServiceImpl extends ServiceImpl formData = new LinkedHashMap<>(); @@ -510,6 +513,8 @@ public class StudyFormFillServiceImpl extends ServiceImpl formData = new LinkedHashMap<>(); formData.put("备注", studyFormFill.getRemark());