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 3f96aa6..53fbc89 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 @@ -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; } 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 43a76ca..880852f 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 @@ -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; } 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 93ba331..d46041d 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 @@ -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; } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/study/StudyFormUpdateForm.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/study/StudyFormUpdateForm.java index 228e0a8..08a4503 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/study/StudyFormUpdateForm.java +++ b/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; } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/StudyFormApplyMapper.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/StudyFormApplyMapper.java index 2239c83..02052ab 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/StudyFormApplyMapper.java +++ b/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 diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/StudyFormFillMapper.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/StudyFormFillMapper.java index 7259c9c..c79b9ad 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/StudyFormFillMapper.java +++ b/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 diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/StudyFormPlanMapper.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/StudyFormPlanMapper.java index 145b922..5dec56b 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/StudyFormPlanMapper.java +++ b/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 diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/StudyFormPreMapper.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/StudyFormPreMapper.java index 14342ce..76b64c6 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/StudyFormPreMapper.java +++ b/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 diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormApplyServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormApplyServiceImpl.java index d82e405..81a4048 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormApplyServiceImpl.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormApplyServiceImpl.java @@ -691,6 +691,9 @@ public class StudyFormApplyServiceImpl extends ServiceImpl + + update t_study_form_apply set submitted_codes=#{submittedCodes} where id=#{id}; + + 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}; diff --git a/hxhq-modules/hxhq-system/src/main/resources/mapper/business/StudyFormFillMapper.xml b/hxhq-modules/hxhq-system/src/main/resources/mapper/business/StudyFormFillMapper.xml index 682377c..94ce359 100644 --- a/hxhq-modules/hxhq-system/src/main/resources/mapper/business/StudyFormFillMapper.xml +++ b/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 t_study_form_fill set submitted_codes=#{submittedCodes} where id=#{id}; + + update t_study_form_fill set bdnr=#{bdnr},zdxgjl=#{zdxgjl} where id=#{id}; diff --git a/hxhq-modules/hxhq-system/src/main/resources/mapper/business/StudyFormPlanMapper.xml b/hxhq-modules/hxhq-system/src/main/resources/mapper/business/StudyFormPlanMapper.xml index 38deff6..229fbbc 100644 --- a/hxhq-modules/hxhq-system/src/main/resources/mapper/business/StudyFormPlanMapper.xml +++ b/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 t_study_form_plan set submitted_codes=#{submittedCodes} where id=#{id}; + + update t_study_form_plan set bdnr=#{bdnr},zdxgjl=#{zdxgjl} where id=#{id}; diff --git a/hxhq-modules/hxhq-system/src/main/resources/mapper/business/StudyFormPreMapper.xml b/hxhq-modules/hxhq-system/src/main/resources/mapper/business/StudyFormPreMapper.xml index 6ff618c..c842b4a 100644 --- a/hxhq-modules/hxhq-system/src/main/resources/mapper/business/StudyFormPreMapper.xml +++ b/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 t_study_form_pre set submitted_codes=#{submittedCodes} where id=#{id}; + + update t_study_form_pre set bdnr=#{bdnr},zdxgjl=#{zdxgjl} where id=#{id};