From ac963e99578dfc33cd6c0440447acff4d20f8bf0 Mon Sep 17 00:00:00 2001 From: "15881625488@163.com" <15881625488@163.com> Date: Mon, 12 Jan 2026 17:46:09 +0800 Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A[=E5=A1=AB=E6=8A=A5=E8=A1=A8?= =?UTF-8?q?=E5=8D=95][=E7=89=A9=E8=B5=84=E7=94=9F=E6=88=90=E6=B5=81?= =?UTF-8?q?=E7=A8=8B]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hxhq/business/controller/PublicController.java | 2 + .../controller/StudyFormFillController.java | 36 +++++++++++ .../com/hxhq/business/domain/StudyFormFill.java | 33 ++++++++++ .../hxhq/business/enums/template/ProductEnum.java | 61 ++++++++++++++++++ .../form/study/StudyFormFillUpdateForm.java | 61 ++++++++++++++++++ .../hxhq/business/mapper/StudyFormFillMapper.java | 22 +++++++ .../business/service/IStudyFormFillService.java | 21 +++++++ .../service/impl/StudyFormFillServiceImpl.java | 73 +++++++++++++++++----- .../mapper/business/StudyFormFillMapper.xml | 13 ++++ 9 files changed, 307 insertions(+), 15 deletions(-) create mode 100644 hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/enums/template/ProductEnum.java create mode 100644 hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/study/StudyFormFillUpdateForm.java diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/PublicController.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/PublicController.java index aef4d5d..bb754d5 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/PublicController.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/PublicController.java @@ -165,4 +165,6 @@ public class PublicController extends BaseController { public AjaxResult zcgList(ZcgSearchForm form) { return AjaxResult.success(zcgService.queryList(form)); } + + } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/StudyFormFillController.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/StudyFormFillController.java index 9939109..79d431b 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/StudyFormFillController.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/StudyFormFillController.java @@ -8,6 +8,7 @@ import com.hxhq.business.dto.study.StudyFormFillListDto; import com.hxhq.business.form.study.StudyFormFillGcForm; import com.hxhq.business.form.study.StudyFormFillShfzForm; import com.hxhq.business.form.study.StudyFormFillSearchForm; +import com.hxhq.business.form.study.StudyFormFillUpdateForm; import com.hxhq.business.service.*; import com.hxhq.common.security.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; @@ -193,4 +194,39 @@ public class StudyFormFillController extends BaseController { studyFormFillService.sy(studyFormFill); return AjaxResult.success("操作成功"); } + + /** + * 保存表单内容 + */ + @PostMapping("/updateBdnr") + @RequiresPermissions({"business:studyFormFill:bj","business:studyFormFill:xz", + "business:nonTrialFormFill:bj","business:nonTrialFormFill:xz", + "business:drugFormFill:bj","business:drugFormFill:xz"}) + public AjaxResult updateBdnr(@RequestBody StudyFormFillUpdateForm form) { + studyFormFillService.updateBdnr(form); + return AjaxResult.success("操作成功"); + } + + /** + * 保存复核意见 + */ + @PostMapping("/updateFhyjjl") + @RequiresPermissions({"business:studyFormFill:fh","business:nonTrialFormFill:fh","business:drugFormFill:fh"}) + public AjaxResult updateFhyjjl(@RequestBody StudyFormFillUpdateForm form) { + studyFormFillService.updateFhyjjl(form); + return AjaxResult.success("操作成功"); + } + + /** + * 保存字段修改记录 + */ + @PostMapping("/updateZdxgjl") + @RequiresPermissions({"business:studyFormFill:bj","business:studyFormFill:xz", + "business:nonTrialFormFill:bj","business:nonTrialFormFill:xz", + "business:drugFormFill:bj","business:drugFormFill:xz"}) + public AjaxResult updateZdxgjl(@RequestBody StudyFormFillUpdateForm form) { + studyFormFillService.updateZdxgjl(form); + return AjaxResult.success("操作成功"); + } + } 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 a5e3e15..753c954 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 @@ -56,6 +56,9 @@ public class StudyFormFill extends MpBaseEntity /** 表单状态：1：填报中；3：已提交；5：已完成（经复核）；7：已完成；9：待废止；11：已废止 */ private Integer bdzt; + /** 是否填报：1：未填报；10：已填报*/ + private Integer sftb; + /** 提交时间 */ @Excel(name = "提交时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @@ -70,6 +73,12 @@ public class StudyFormFill extends MpBaseEntity /** 存储list */ private String cclist; + /** 字段修改记录 */ + private String zdxgjl; + + /** 复核意见记录 */ + private String fhyjjl; + /** 填报开始时间 */ @Excel(name = "填报开始时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @@ -109,6 +118,30 @@ public class StudyFormFill extends MpBaseEntity @TableField(exist = false) private String studyMc; + public String getZdxgjl() { + return zdxgjl; + } + + public void setZdxgjl(String zdxgjl) { + this.zdxgjl = zdxgjl; + } + + public String getFhyjjl() { + return fhyjjl; + } + + public void setFhyjjl(String fhyjjl) { + this.fhyjjl = fhyjjl; + } + + public Integer getSftb() { + return sftb; + } + + public void setSftb(Integer sftb) { + this.sftb = sftb; + } + public String getCzlist() { return czlist; } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/enums/template/ProductEnum.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/enums/template/ProductEnum.java new file mode 100644 index 0000000..e2a16f5 --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/enums/template/ProductEnum.java @@ -0,0 +1,61 @@ +package com.hxhq.business.enums.template; + +/** + * 产物：1：试剂；3：供试品；5：给药制剂；7：麻精药 + * @author tanfei + */ +public enum ProductEnum { + + /** + * 试剂 + */ + Sj(1, "试剂"), + + /** + * 供试品 + */ + Gsp(3, "供试品"), + + /** + * 给药制剂 + */ + Gyzj(5, "给药制剂"), + + /** + * 麻精药 + */ + Mjy(7, "麻精药"); + + private int value; + private String text; + + ProductEnum(int value, String text) { + this.value = value; + this.text = text; + } + + public int getValue() { + return value; + } + + public void setValue(int value) { + this.value = value; + } + + public String getText() { + return text; + } + + public void setText(String text) { + this.text = text; + } + + public static ProductEnum getEnumByValue(int type) { + for (ProductEnum bt : values()) { + if (bt.value == type) { + return bt; + } + } + return null; + } +} diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/study/StudyFormFillUpdateForm.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/study/StudyFormFillUpdateForm.java new file mode 100644 index 0000000..7d748e4 --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/study/StudyFormFillUpdateForm.java @@ -0,0 +1,61 @@ +package com.hxhq.business.form.study; + +/** + * @author tanfei + */ +public class StudyFormFillUpdateForm { + /** id */ + private Long id; + + /** 表单内容 */ + private String bdnr; + + /** 字段修改记录 */ + private String zdxgjl; + + /** 当前字段修改内容 */ + private String filedValue; + + /** 复核意见记录 */ + private String fhyjjl; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getBdnr() { + return bdnr; + } + + public void setBdnr(String bdnr) { + this.bdnr = bdnr; + } + + public String getZdxgjl() { + return zdxgjl; + } + + public void setZdxgjl(String zdxgjl) { + this.zdxgjl = zdxgjl; + } + + public String getFiledValue() { + return filedValue; + } + + public void setFiledValue(String filedValue) { + this.filedValue = filedValue; + } + + public String getFhyjjl() { + return fhyjjl; + } + + public void setFhyjjl(String fhyjjl) { + this.fhyjjl = fhyjjl; + } +} 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 e185150..8e325b3 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 @@ -32,4 +32,26 @@ public interface StudyFormFillMapper extends BaseMapper * @return */ StudyFormFill queryInfo(@Param("id") Long id); + + /** + * 更新表单内容 + * @param id + * @param bdnr + */ + void updateBdnr(@Param("id") Long id,@Param("bdnr") String bdnr); + + /** + * 更新复核意见 + * @param id + * @param fhyjjl + */ + void updateFhyjjl(@Param("id") Long id,@Param("fhyjjl") String fhyjjl); + + /** + * 更新字段修改记录 + * @param id + * @param zdxgjl + */ + void updateZdxgjl(@Param("id") Long id,@Param("zdxgjl") String zdxgjl); + } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IStudyFormFillService.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IStudyFormFillService.java index 1f8adf7..150bb8c 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IStudyFormFillService.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IStudyFormFillService.java @@ -8,6 +8,11 @@ import com.hxhq.business.dto.study.StudyFormFillListDto; import com.hxhq.business.form.study.StudyFormFillGcForm; import com.hxhq.business.form.study.StudyFormFillSearchForm; import com.hxhq.business.form.study.StudyFormFillShfzForm; +import com.hxhq.business.form.study.StudyFormFillUpdateForm; +import com.hxhq.common.core.web.domain.AjaxResult; +import com.hxhq.common.security.annotation.RequiresPermissions; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; /** * 试验-填报单Service接口 @@ -104,4 +109,20 @@ public interface IStudyFormFillService extends IService * @param studyFormFill */ public void sy(StudyFormFill studyFormFill); + + /** + * 更新表单内容 + */ + public void updateBdnr(StudyFormFillUpdateForm form); + + /** + * 更新复核意见 + */ + public void updateFhyjjl(StudyFormFillUpdateForm form); + + /** + * 更新字段修改记录 + */ + public void updateZdxgjl(StudyFormFillUpdateForm form); + } 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 98f7938..542ccf2 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 @@ -11,15 +11,15 @@ import com.hxhq.business.enums.NormalEnum; import com.hxhq.business.enums.study.StudyFormApplyBdztEnum; import com.hxhq.business.enums.study.StudyFormFillBdztEnum; import com.hxhq.business.enums.study.StudyFormFillBdztEnum; +import com.hxhq.business.enums.template.ProductEnum; import com.hxhq.business.enums.zykgl.JcgjlxEnum; import com.hxhq.business.enums.zykgl.JcmcysEnum; import com.hxhq.business.enums.zykgl.JlztEnum; -import com.hxhq.business.form.study.StudyFormFillGcForm; -import com.hxhq.business.form.study.StudyFormFillSearchForm; -import com.hxhq.business.form.study.StudyFormFillShfzForm; +import com.hxhq.business.form.study.*; import com.hxhq.business.form.study.StudyFormFillSearchForm; import com.hxhq.business.service.IStudyFormFillJcgjService; import com.hxhq.business.service.IStudyFormFillQmxxService; +import com.hxhq.business.service.ITemplateService; import com.hxhq.business.utils.JctUtil; import com.hxhq.business.utils.ObjectCompareUtil; import com.hxhq.common.core.exception.ServiceException; @@ -49,6 +49,8 @@ public class StudyFormFillServiceImpl extends ServiceImpl fieldChanges = ObjectCompareUtil.compareObjects(studyFormFillOld, studyFormFill); if (fieldChanges.size() > 0) { //稽查轨迹 @@ -362,8 +361,10 @@ public class StudyFormFillServiceImpl extends ServiceImpl formData = new LinkedHashMap<>(); formData.put("备注", studyFormFill.getRemark()); @@ -374,6 +375,23 @@ public class StudyFormFillServiceImpl extends ServiceImpl + + + update t_study_form_fill set bdnr=#{bdnr} where id=#{id}; + + + + update t_study_form_fill set fhyjjl=#{fhyjjl} where id=#{id}; + + + + update t_study_form_fill set zdxgjl=#{zdxgjl} where id=#{id}; + + \ No newline at end of file