fix：[试验表单]新增使用物资信息

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;
     }

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() {

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;
     }

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;
     }

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormFillServiceImpl.java

@@ -421,6 +421,7 @@ public class StudyFormFillServiceImpl extends ServiceImpl
             throw new ServiceException("表单不是已提交状态，不能复核");
         }
         studyFormFillOld.setBdzt(StudyFormFillBdztEnum.ywcfh.getValue());
+        studyFormFillOld.setBdnr(studyFormFill.getBdnr());
         this.updateById(studyFormFillOld);
         //稽查轨迹
         Map<String, String> formData = new LinkedHashMap<>();
@@ -451,6 +452,7 @@ public class StudyFormFillServiceImpl extends ServiceImpl
             throw new ServiceException("表单不是已提交状态，不能复核");
         }
         studyFormFillOld.setBdzt(StudyFormFillBdztEnum.tbz.getValue());
+        studyFormFillOld.setBdnr(studyFormFill.getBdnr());
         this.updateById(studyFormFillOld);
         //稽查轨迹
         Map<String, String> formData = new LinkedHashMap<>();
@@ -481,6 +483,7 @@ public class StudyFormFillServiceImpl extends ServiceImpl
             throw new ServiceException("表单不是已提交状态，不能复核");
         }
         studyFormFillOld.setBdzt(StudyFormFillBdztEnum.ywc.getValue());
+        studyFormFillOld.setBdnr(studyFormFill.getBdnr());
         this.updateById(studyFormFillOld);
         //稽查轨迹
         Map<String, String> formData = new LinkedHashMap<>();
@@ -510,6 +513,8 @@ public class StudyFormFillServiceImpl extends ServiceImpl
         if (!(studyFormFillOld.getBdzt().equals(StudyFormFillBdztEnum.ywcfh.getValue()) || studyFormFillOld.getBdzt().equals(StudyFormFillBdztEnum.ywc.getValue()))) {
             throw new ServiceException("表单不是已完成状态，不能审阅");
         }
+        studyFormFillOld.setBdnr(studyFormFill.getBdnr());
+        this.updateById(studyFormFillOld);
         //稽查轨迹
         Map<String, String> formData = new LinkedHashMap<>();
         formData.put("备注", studyFormFill.getRemark());