fix:[填报表单]检测板

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudyFormFill.java

@@ -77,6 +77,9 @@ public class StudyFormFill extends MpBaseEntity
     /** 仪器物资信息 */
     private String yqResource;
 
+    /** 检测板信息 */
+    private String jcbList;
+
     /** 处置list */
     private String czlist;
 
@@ -159,6 +162,14 @@ public class StudyFormFill extends MpBaseEntity
     @TableField(exist = false)
     private String studyMc;
 
+    public String getJcbList() {
+        return jcbList;
+    }
+
+    public void setJcbList(String jcbList) {
+        this.jcbList = jcbList;
+    }
+
     public String getTemplateShowYjcc() {
         return templateShowYjcc;
     }

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

@@ -590,6 +590,7 @@ public class StudyFormFillServiceImpl extends ServiceImpl
             studyFormFillOld.setResource(studyFormFill.getResource());
             studyFormFillOld.setYqResource(studyFormFill.getYqResource());
             studyFormFillOld.setBdzt(StudyFormFillBdztEnum.ytj.getValue());
+            studyFormFillOld.setJcbList(studyFormFill.getJcbList());
             studyFormFillOld.setTjsj(new Date());
             if (studyFormFillOld.getSftb().equals(NormalEnum.no.getValue())) {
                 studyFormFillOld.setEndDate(new Date());
@@ -621,6 +622,7 @@ public class StudyFormFillServiceImpl extends ServiceImpl
             studyFormFill.setBdbh(getSn(studyFormFill));
             studyFormFill.setTjsj(new Date());
             this.save(studyFormFill);
+
             //生成物资
             genResource(studyFormFill, studyFormFill.getRemark());
             //稽查轨迹
@@ -641,6 +643,8 @@ public class StudyFormFillServiceImpl extends ServiceImpl
      */
     public void genResource(StudyFormFill studyFormFill, String remark) {
         Template template = templateService.getById(studyFormFill.getTemplateId());
+        //todo 保存检测板
+
         // 处置，存放，用量
         sjService.genResource(studyFormFill, template);
         gyzjService.genResource(studyFormFill, template, remark);