fix:[表单管理]优化

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

@@ -98,6 +98,9 @@ public class StudyFormApply extends MpBaseEntity
     /** 字段勾选记录 */
     private String zdgxjl;
 
+    /** 已提交过数据的字段 */
+    private String submittedCodes;
+
     /** 签名意义 */
     @TableField(exist = false)
     private String qmyy;
@@ -143,6 +146,14 @@ public class StudyFormApply extends MpBaseEntity
     @TableField(exist = false)
     private String studyMc;
 
+    public String getSubmittedCodes() {
+        return submittedCodes;
+    }
+
+    public void setSubmittedCodes(String submittedCodes) {
+        this.submittedCodes = submittedCodes;
+    }
+
     public String getSywzmc() {
         return sywzmc;
     }

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

@@ -76,6 +76,9 @@ public class StudyFormPlan extends MpBaseEntity
     /** 字段勾选记录 */
     private String zdgxjl;
 
+    /** 已提交过数据的字段 */
+    private String submittedCodes;
+
     /** 签名意义 */
     @TableField(exist = false)
     private String qmyy;
@@ -121,6 +124,14 @@ public class StudyFormPlan extends MpBaseEntity
     @TableField(exist = false)
     private String studyMc;
 
+    public String getSubmittedCodes() {
+        return submittedCodes;
+    }
+
+    public void setSubmittedCodes(String submittedCodes) {
+        this.submittedCodes = submittedCodes;
+    }
+
     public Long getTemplateDeptId() {
         return templateDeptId;
     }

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

@@ -95,6 +95,9 @@ public class StudyFormPre extends MpBaseEntity
     /** 字段勾选记录 */
     private String zdgxjl;
 
+    /** 已提交过数据的字段 */
+    private String submittedCodes;
+
     /** 签名人密码 */
     @TableField(exist = false)
     private String qmrmm;
@@ -120,6 +123,14 @@ public class StudyFormPre extends MpBaseEntity
     @TableField(exist = false)
     private String studyMc;
 
+    public String getSubmittedCodes() {
+        return submittedCodes;
+    }
+
+    public void setSubmittedCodes(String submittedCodes) {
+        this.submittedCodes = submittedCodes;
+    }
+
     public String getSjshryMc() {
         return sjshryMc;
     }

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/study/StudyFormUpdateForm.java

@@ -13,6 +13,9 @@ public class StudyFormUpdateForm {
     /** 字段修改记录 */
     private String zdxgjl;
 
+    /** 已提交过数据的字段 */
+    private String submittedCodes;
+
     /** 当前字段修改内容 */
     private String filedValue;
 
@@ -28,6 +31,14 @@ public class StudyFormUpdateForm {
     /** 字段勾选记录 */
     private String zdgxjl;
 
+    public String getSubmittedCodes() {
+        return submittedCodes;
+    }
+
+    public void setSubmittedCodes(String submittedCodes) {
+        this.submittedCodes = submittedCodes;
+    }
+
     public String getContent() {
         return content;
     }

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/StudyFormApplyMapper.java

@@ -55,6 +55,15 @@ public interface StudyFormApplyMapper extends BaseMapper
      */
     void updateBdnr(@Param("id") Long id,@Param("bdnr") String bdnr,@Param("syId") Long syId,@Param("bmId") Long bmId,@Param("sdId") Long sdId,@Param("sywzmc") String sywzmc,@Param("xynd") String xynd,@Param("xysj") Date xysj);
 
+
+
+    /**
+     * 已提交过数据的字段
+     * @param id
+     * @param submittedCodes
+     */
+    void updateSubmittedCodes(@Param("id") Long id,@Param("submittedCodes") String submittedCodes);
+
     /**
      * 更新复核意见
      * @param id

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/StudyFormFillMapper.java

@@ -42,6 +42,13 @@ public interface StudyFormFillMapper extends BaseMapper
     void updateBdnrZdxgjl(@Param("id") Long id,@Param("bdnr") String bdnr,@Param("zdxgjl") String zdxgjl);
 
     /**
+     * 已提交过数据的字段
+     * @param id
+     * @param submittedCodes
+     */
+    void updateSubmittedCodes(@Param("id") Long id,@Param("submittedCodes") String submittedCodes);
+
+    /**
      * 更新表单内容
      * @param id
      * @param bdnr

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/StudyFormPlanMapper.java

@@ -46,6 +46,15 @@ public interface StudyFormPlanMapper extends BaseMapper
      */
     void updateBdnr(@Param("id") Long id,@Param("bdnr") String bdnr);
 
+
+
+    /**
+     * 已提交过数据的字段
+     * @param id
+     * @param submittedCodes
+     */
+    void updateSubmittedCodes(@Param("id") Long id,@Param("submittedCodes") String submittedCodes);
+
     /**
      * 更新复核意见
      * @param id

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/StudyFormPreMapper.java

@@ -48,6 +48,14 @@ public interface StudyFormPreMapper extends BaseMapper
      */
     void updateBdnr(@Param("id") Long id,@Param("bdnr") String bdnr);
 
+
+    /**
+     * 已提交过数据的字段
+     * @param id
+     * @param submittedCodes
+     */
+    void updateSubmittedCodes(@Param("id") Long id,@Param("submittedCodes") String submittedCodes);
+
     /**
      * 更新复核意见
      * @param id

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

@@ -691,6 +691,9 @@ public class StudyFormApplyServiceImpl extends ServiceImpl
             } else {
                 baseMapper.updateBdnr(form.getId(), form.getBdnr(), bdnr.getLong("syId"), bdnr.getLong("bmId"), bdnr.getLong("sdId"), bdnr.getString("sywzmc"), bdnr.getString("xynd"), bdnr.getDate("xysj"));
             }
+            if(StringUtils.isNoneBlank(form.getSubmittedCodes())){
+                baseMapper.updateSubmittedCodes(form.getId(), form.getSubmittedCodes());
+            }
             //稽查轨迹
             if (StringUtils.isNoneBlank(form.getFiledValue())&&!"null".equals(form.getFiledValue())) {
                 StudyFormApply studyFormApplyOld = this.getById(form.getId());

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

@@ -934,6 +934,9 @@ public class StudyFormFillServiceImpl extends ServiceImpl
         }else{
             baseMapper.updateBdnr(form.getId(), form.getBdnr());
         }
+        if(StringUtils.isNoneBlank(form.getSubmittedCodes())){
+            baseMapper.updateSubmittedCodes(form.getId(), form.getSubmittedCodes());
+        }
         //稽查轨迹
         if (StringUtils.isNoneBlank(form.getFiledValue())&&!"null".equals(form.getFiledValue())) {
             StudyFormFill studyFormFillOld = this.getById(form.getId());

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

@@ -398,6 +398,9 @@ public class StudyFormPlanServiceImpl extends ServiceImpl
         }else{
             baseMapper.updateBdnr(form.getId(), form.getBdnr());
         }
+        if(StringUtils.isNoneBlank(form.getSubmittedCodes())){
+            baseMapper.updateSubmittedCodes(form.getId(), form.getSubmittedCodes());
+        }
         //稽查轨迹
         if (StringUtils.isNoneBlank(form.getFiledValue())&&!"null".equals(form.getFiledValue())) {
             StudyFormPlan studyFormPlanOld = this.getById(form.getId());

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

@@ -537,8 +537,10 @@ public class StudyFormPreServiceImpl extends ServiceImpl
         }else{
             baseMapper.updateBdnr(form.getId(), form.getBdnr());
         }
+        if(StringUtils.isNoneBlank(form.getSubmittedCodes())){
+            baseMapper.updateSubmittedCodes(form.getId(), form.getSubmittedCodes());
+        }
         //稽查轨迹
-
         if (StringUtils.isNoneBlank(form.getFiledValue())&&!"null".equals(form.getFiledValue())) {
             StudyFormPre studyFormPreOld = this.getById(form.getId());
             JSONArray jsonArray = JSONArray.parseArray(form.getFiledValue());

hxhq-modules/hxhq-system/src/main/resources/mapper/business/StudyFormApplyMapper.xml

@@ -30,6 +30,10 @@
         update  t_study_form_apply set bdnr=#{bdnr},sy_id=#{syId},bm_id=#{bmId},sd_id=#{sdId},sywzmc=#{sywzmc},xynd=#{xynd},xysj=#{xysj}  where id=#{id};
     </update>
 
+    <update id="updateSubmittedCodes" >
+        update  t_study_form_apply set submitted_codes=#{submittedCodes}  where id=#{id};
+    </update>
+
     <update id="updateBdnrZdxgjl" >
         update  t_study_form_apply set bdnr=#{bdnr},zdxgjl=#{zdxgjl},sy_id=#{syId},bm_id=#{bmId},sd_id=#{sdId},sywzmc=#{sywzmc},xynd=#{xynd},xysj=#{xysj}  where id=#{id};
     </update>

hxhq-modules/hxhq-system/src/main/resources/mapper/business/StudyFormFillMapper.xml

@@ -30,6 +30,10 @@
         update  t_study_form_fill set bdnr=#{bdnr}  where id=#{id};
     </update>
 
+    <update id="updateSubmittedCodes" >
+        update  t_study_form_fill set submitted_codes=#{submittedCodes}  where id=#{id};
+    </update>
+
     <update id="updateBdnrZdxgjl" >
         update  t_study_form_fill set bdnr=#{bdnr},zdxgjl=#{zdxgjl}  where id=#{id};
     </update>

hxhq-modules/hxhq-system/src/main/resources/mapper/business/StudyFormPlanMapper.xml

@@ -27,6 +27,10 @@
         update  t_study_form_plan set bdnr=#{bdnr}  where id=#{id};
     </update>
 
+    <update id="updateSubmittedCodes" >
+        update  t_study_form_plan set submitted_codes=#{submittedCodes}  where id=#{id};
+    </update>
+
     <update id="updateBdnrZdxgjl" >
         update  t_study_form_plan set bdnr=#{bdnr},zdxgjl=#{zdxgjl}  where id=#{id};
     </update>

hxhq-modules/hxhq-system/src/main/resources/mapper/business/StudyFormPreMapper.xml

@@ -28,6 +28,10 @@
         update  t_study_form_pre set bdnr=#{bdnr}  where id=#{id};
     </update>
 
+    <update id="updateSubmittedCodes" >
+        update  t_study_form_pre set submitted_codes=#{submittedCodes}  where id=#{id};
+    </update>
+
     <update id="updateBdnrZdxgjl" >
         update  t_study_form_pre set bdnr=#{bdnr},zdxgjl=#{zdxgjl}  where id=#{id};
     </update>