From 7f92377237290d81d7eb466fa647e2544a1e7a83 Mon Sep 17 00:00:00 2001 From: "15881625488@163.com" <15881625488@163.com> Date: Thu, 15 Jan 2026 20:07:40 +0800 Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A[=E8=AF=95=E9=AA=8C=E7=AE=A1?= =?UTF-8?q?=E7=90=86]=E8=A1=A8=E5=8D=95=E8=90=BD=E7=AC=94=E7=95=99?= =?UTF-8?q?=E7=97=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/StudyFormApplyController.java | 32 +++- .../controller/StudyFormFillController.java | 8 +- .../controller/StudyFormPlanController.java | 31 +++- .../controller/StudyFormPreController.java | 29 +++- .../com/hxhq/business/domain/StudyFormApply.java | 35 ++++- .../com/hxhq/business/domain/StudyFormFill.java | 2 +- .../com/hxhq/business/domain/StudyFormPlan.java | 34 ++++- .../com/hxhq/business/domain/StudyFormPre.java | 34 ++++- .../form/study/StudyFormFillUpdateForm.java | 94 ------------ .../business/form/study/StudyFormUpdateForm.java | 94 ++++++++++++ .../service/IStudyFormApplyJcgjService.java | 3 +- .../business/service/IStudyFormApplyService.java | 17 ++- .../business/service/IStudyFormFillService.java | 13 +- .../business/service/IStudyFormPlanService.java | 18 ++- .../business/service/IStudyFormPreService.java | 17 ++- .../service/impl/StudyFormApplyServiceImpl.java | 162 +++++++++++++++++---- .../service/impl/StudyFormFillServiceImpl.java | 149 ++++++++++--------- .../service/impl/StudyFormPlanServiceImpl.java | 145 +++++++++++++++--- .../service/impl/StudyFormPreServiceImpl.java | 138 +++++++++++++++--- .../java/com/hxhq/business/utils/GyzjJcnrUtil.java | 16 +- .../java/com/hxhq/business/utils/MjyJcnrUtil.java | 19 +-- .../com/hxhq/business/utils/StudyFormUtil.java | 50 +++---- 22 files changed, 814 insertions(+), 326 deletions(-) delete mode 100644 hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/study/StudyFormFillUpdateForm.java create mode 100644 hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/study/StudyFormUpdateForm.java diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/StudyFormApplyController.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/StudyFormApplyController.java index 4484e2f..f9296ef 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/StudyFormApplyController.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/StudyFormApplyController.java @@ -8,6 +8,7 @@ import com.hxhq.business.dto.study.StudyFormApplyListDto; import com.hxhq.business.form.study.StudyFormApplyGcForm; import com.hxhq.business.form.study.StudyFormApplyShfzForm; import com.hxhq.business.form.study.StudyFormApplySearchForm; +import com.hxhq.business.form.study.StudyFormUpdateForm; import com.hxhq.business.service.*; import com.hxhq.common.security.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; @@ -124,8 +125,7 @@ public class StudyFormApplyController extends BaseController { @PostMapping("/bc") @RequiresPermissions({"business:drugFormApply:bj","business:drugFormApply:xz"}) public AjaxResult bc(@RequestBody StudyFormApply studyFormApply) { - studyFormApplyService.bc(studyFormApply); - return AjaxResult.success("操作成功"); + return AjaxResult.success(studyFormApplyService.bc(studyFormApply)); } @@ -189,4 +189,32 @@ public class StudyFormApplyController extends BaseController { studyFormApplyService.shjj(studyFormApply); return AjaxResult.success("操作成功"); } + + /** + * 保存复核意见 + */ + @PostMapping("/updateFhyjjl") + public AjaxResult updateFhyjjl(@RequestBody StudyFormUpdateForm form) { + studyFormApplyService.updateFhyjjl(form); + return AjaxResult.success("操作成功"); + } + + /** + * 保存表单内容 + */ + @PostMapping("/updateBdnr") + public AjaxResult updateBdnr(@RequestBody StudyFormUpdateForm form) { + studyFormApplyService.updateBdnr(form); + return AjaxResult.success("操作成功"); + } + + /** + * 保存字段勾选记录 + */ + @PostMapping("/updateZdgxjl") + public AjaxResult updateZdgxjl(@RequestBody StudyFormUpdateForm form) { + studyFormApplyService.updateZdgxjl(form); + return AjaxResult.success("操作成功"); + } + } 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 20d3d23..b9226d1 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,7 +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.form.study.StudyFormUpdateForm; import com.hxhq.business.service.*; import com.hxhq.common.security.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; @@ -199,7 +199,7 @@ public class StudyFormFillController extends BaseController { * 保存复核意见 */ @PostMapping("/updateFhyjjl") - public AjaxResult updateFhyjjl(@RequestBody StudyFormFillUpdateForm form) { + public AjaxResult updateFhyjjl(@RequestBody StudyFormUpdateForm form) { studyFormFillService.updateFhyjjl(form); return AjaxResult.success("操作成功"); } @@ -208,7 +208,7 @@ public class StudyFormFillController extends BaseController { * 保存表单内容 */ @PostMapping("/updateBdnr") - public AjaxResult updateBdnr(@RequestBody StudyFormFillUpdateForm form) { + public AjaxResult updateBdnr(@RequestBody StudyFormUpdateForm form) { studyFormFillService.updateBdnr(form); return AjaxResult.success("操作成功"); } @@ -217,7 +217,7 @@ public class StudyFormFillController extends BaseController { * 保存字段勾选记录 */ @PostMapping("/updateZdgxjl") - public AjaxResult updateZdgxjl(@RequestBody StudyFormFillUpdateForm form) { + public AjaxResult updateZdgxjl(@RequestBody StudyFormUpdateForm form) { studyFormFillService.updateZdgxjl(form); return AjaxResult.success("操作成功"); } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/StudyFormPlanController.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/StudyFormPlanController.java index 50a5972..8676281 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/StudyFormPlanController.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/StudyFormPlanController.java @@ -6,6 +6,7 @@ import com.hxhq.business.domain.StudyFormPlanJcgj; import com.hxhq.business.domain.StudyFormPlanQmxx; import com.hxhq.business.dto.study.StudyFormPlanListDto; import com.hxhq.business.form.study.StudyFormPlanSearchForm; +import com.hxhq.business.form.study.StudyFormUpdateForm; import com.hxhq.business.service.IStudyFormPlanJcgjService; import com.hxhq.business.service.IStudyFormPlanQmxxService; import com.hxhq.common.security.annotation.RequiresPermissions; @@ -93,8 +94,7 @@ public class StudyFormPlanController extends BaseController @PostMapping("/bc") @RequiresPermissions({"business:studyFormPre:bj","business:nonTrialFormPre:xz"}) public AjaxResult bc(@RequestBody StudyFormPlan studyFormPlan) { - studyFormPlanService.bc(studyFormPlan); - return AjaxResult.success("操作成功"); + return AjaxResult.success(studyFormPlanService.bc(studyFormPlan)); } @@ -139,4 +139,31 @@ public class StudyFormPlanController extends BaseController studyFormPlanService.sy(studyFormPlan); return AjaxResult.success("操作成功"); } + + /** + * 保存复核意见 + */ + @PostMapping("/updateFhyjjl") + public AjaxResult updateFhyjjl(@RequestBody StudyFormUpdateForm form) { + studyFormPlanService.updateFhyjjl(form); + return AjaxResult.success("操作成功"); + } + + /** + * 保存表单内容 + */ + @PostMapping("/updateBdnr") + public AjaxResult updateBdnr(@RequestBody StudyFormUpdateForm form) { + studyFormPlanService.updateBdnr(form); + return AjaxResult.success("操作成功"); + } + + /** + * 保存字段勾选记录 + */ + @PostMapping("/updateZdgxjl") + public AjaxResult updateZdgxjl(@RequestBody StudyFormUpdateForm form) { + studyFormPlanService.updateZdgxjl(form); + return AjaxResult.success("操作成功"); + } } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/StudyFormPreController.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/StudyFormPreController.java index 9fb867d..da107d3 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/StudyFormPreController.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/StudyFormPreController.java @@ -7,6 +7,7 @@ import com.hxhq.business.domain.*; import com.hxhq.business.dto.study.StudyFormPreListDto; import com.hxhq.business.form.study.StudyFormPreAuditForm; import com.hxhq.business.form.study.StudyFormPreSearchForm; +import com.hxhq.business.form.study.StudyFormUpdateForm; import com.hxhq.business.service.IStudyFormPreJcgjService; import com.hxhq.business.service.IStudyFormPreQmxxService; import com.hxhq.common.security.annotation.RequiresPermissions; @@ -91,8 +92,7 @@ public class StudyFormPreController extends BaseController "business:drugFormPre:bj","business:drugFormPre:xz"}) public AjaxResult bc(@RequestBody StudyFormPre studyFormPre) { - studyFormPreService.bc(studyFormPre); - return AjaxResult.success("操作成功"); + return AjaxResult.success(studyFormPreService.bc(studyFormPre)); } /** @@ -138,5 +138,30 @@ public class StudyFormPreController extends BaseController studyFormPreService.jj(form); return AjaxResult.success("操作成功"); } + /** + * 保存复核意见 + */ + @PostMapping("/updateFhyjjl") + public AjaxResult updateFhyjjl(@RequestBody StudyFormUpdateForm form) { + studyFormPreService.updateFhyjjl(form); + return AjaxResult.success("操作成功"); + } + + /** + * 保存表单内容 + */ + @PostMapping("/updateBdnr") + public AjaxResult updateBdnr(@RequestBody StudyFormUpdateForm form) { + studyFormPreService.updateBdnr(form); + return AjaxResult.success("操作成功"); + } + /** + * 保存字段勾选记录 + */ + @PostMapping("/updateZdgxjl") + public AjaxResult updateZdgxjl(@RequestBody StudyFormUpdateForm form) { + studyFormPreService.updateZdgxjl(form); + return AjaxResult.success("操作成功"); + } } 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 cd0a82a..21c08c1 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 @@ -63,8 +63,14 @@ public class StudyFormApply extends MpBaseEntity @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date tjsj; - /** 使用物资信息 */ - private String resource; + /** 字段修改记录 */ + private String zdxgjl; + + /** 复核意见记录 */ + private String fhyjjl; + + /** 字段勾选记录 */ + private String zdgxjl; /** 签名意义 */ @TableField(exist = false) @@ -103,13 +109,30 @@ public class StudyFormApply extends MpBaseEntity this.userMcEn = userMcEn; } - public String getResource() { - return resource; + public String getZdxgjl() { + return zdxgjl; + } + + public void setZdxgjl(String zdxgjl) { + this.zdxgjl = zdxgjl; + } + + public String getFhyjjl() { + return fhyjjl; } - public void setResource(String resource) { - this.resource = resource; + public void setFhyjjl(String fhyjjl) { + this.fhyjjl = fhyjjl; } + + public String getZdgxjl() { + return zdgxjl; + } + + public void setZdgxjl(String zdgxjl) { + this.zdgxjl = zdgxjl; + } + public String getStudySn() { return studySn; } 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 10e96fe..157c6da 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 @@ -51,7 +51,7 @@ public class StudyFormFill extends MpBaseEntity private String userMcEn; /** 是否补录 */ - @Compare(name = "是否补录",nameEn = "Concentration") + @Compare(name = "是否补录",nameEn = "是否补录") private String sfbl; /** 表单状态：1：填报中；3：已提交；5：已完成（经复核）；7：已完成；9：待废止；11：已废止 */ 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 c1e34fe..d96cd11 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 @@ -67,9 +67,14 @@ public class StudyFormPlan extends MpBaseEntity /** 复核人员名称-英文(通知用) */ private String fhryMcEn; - /** 物资信息 */ - private String resource; + /** 字段修改记录 */ + private String zdxgjl; + /** 复核意见记录 */ + private String fhyjjl; + + /** 字段勾选记录 */ + private String zdgxjl; /** 签名意义 */ @TableField(exist = false) @@ -112,13 +117,30 @@ public class StudyFormPlan extends MpBaseEntity this.fhryMcEn = fhryMcEn; } - public String getResource() { - return resource; + public String getZdxgjl() { + return zdxgjl; + } + + public void setZdxgjl(String zdxgjl) { + this.zdxgjl = zdxgjl; + } + + public String getFhyjjl() { + return fhyjjl; } - public void setResource(String resource) { - this.resource = resource; + public void setFhyjjl(String fhyjjl) { + this.fhyjjl = fhyjjl; } + + public String getZdgxjl() { + return zdgxjl; + } + + public void setZdgxjl(String zdgxjl) { + this.zdgxjl = zdgxjl; + } + public Long getFhryId() { return fhryId; } 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 5337019..38b517a 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 @@ -77,8 +77,14 @@ public class StudyFormPre extends MpBaseEntity @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date tjsj; - /** 物资信息 */ - private String resource; + /** 字段修改记录 */ + private String zdxgjl; + + /** 复核意见记录 */ + private String fhyjjl; + + /** 字段勾选记录 */ + private String zdgxjl; /** 签名人密码 */ @TableField(exist = false) @@ -121,12 +127,28 @@ public class StudyFormPre extends MpBaseEntity this.shryMcEn = shryMcEn; } - public String getResource() { - return resource; + 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 String getZdgxjl() { + return zdgxjl; } - public void setResource(String resource) { - this.resource = resource; + public void setZdgxjl(String zdgxjl) { + this.zdgxjl = zdgxjl; } public String getStudySn() { 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 deleted file mode 100644 index cfb0af6..0000000 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/study/StudyFormFillUpdateForm.java +++ /dev/null @@ -1,94 +0,0 @@ -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; - - /** 意见回复 */ - private String replay; - - /** 复核意见 */ - private String content; - - /** 字段勾选记录 */ - private String zdgxjl; - - public String getContent() { - return content; - } - - public void setContent(String content) { - this.content = content; - } - - public String getReplay() { - return replay; - } - - public void setReplay(String replay) { - this.replay = replay; - } - - public String getZdgxjl() { - return zdgxjl; - } - - public void setZdgxjl(String zdgxjl) { - this.zdgxjl = zdgxjl; - } - - 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/form/study/StudyFormUpdateForm.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/study/StudyFormUpdateForm.java new file mode 100644 index 0000000..1b94686 --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/study/StudyFormUpdateForm.java @@ -0,0 +1,94 @@ +package com.hxhq.business.form.study; + +/** + * @author tanfei + */ +public class StudyFormUpdateForm { + /** id */ + private Long id; + + /** 表单内容 */ + private String bdnr; + + /** 字段修改记录 */ + private String zdxgjl; + + /** 当前字段修改内容 */ + private String filedValue; + + /** 复核意见记录 */ + private String fhyjjl; + + /** 意见回复 */ + private String replay; + + /** 复核意见 */ + private String content; + + /** 字段勾选记录 */ + private String zdgxjl; + + public String getContent() { + return content; + } + + public void setContent(String content) { + this.content = content; + } + + public String getReplay() { + return replay; + } + + public void setReplay(String replay) { + this.replay = replay; + } + + public String getZdgxjl() { + return zdgxjl; + } + + public void setZdgxjl(String zdgxjl) { + this.zdgxjl = zdgxjl; + } + + 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/service/IStudyFormApplyJcgjService.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IStudyFormApplyJcgjService.java index fae4345..6d84070 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IStudyFormApplyJcgjService.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IStudyFormApplyJcgjService.java @@ -6,8 +6,7 @@ import java.util.Map; import com.hxhq.business.domain.StudyFormApplyJcgj; import com.baomidou.mybatisplus.extension.service.IService; -import com.hxhq.business.domain.StudyFormApplyJcgj; -import com.hxhq.business.domain.StudyFormPreJcgj; +import com.hxhq.business.form.study.StudyFormUpdateForm; import com.hxhq.system.api.domain.SysUser; /** diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IStudyFormApplyService.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IStudyFormApplyService.java index 7a84c6a..1dd01a4 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IStudyFormApplyService.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IStudyFormApplyService.java @@ -8,6 +8,7 @@ import com.hxhq.business.dto.study.StudyFormApplyListDto; import com.hxhq.business.form.study.StudyFormApplyGcForm; import com.hxhq.business.form.study.StudyFormApplySearchForm; import com.hxhq.business.form.study.StudyFormApplyShfzForm; +import com.hxhq.business.form.study.StudyFormUpdateForm; /** * 试验-填报单Service接口 @@ -63,7 +64,7 @@ public interface IStudyFormApplyService extends IService * 保存 * @param studyFormApply */ - public void bc(StudyFormApply studyFormApply); + public StudyFormApply bc(StudyFormApply studyFormApply); /** * 提交 @@ -101,4 +102,18 @@ public interface IStudyFormApplyService extends IService */ public void shjj(StudyFormApply studyFormApply); + /** + * 更新表单内容 + */ + public void updateBdnr(StudyFormUpdateForm form); + + /** + * 更新复核意见 + */ + public void updateFhyjjl(StudyFormUpdateForm form); + + /** + * 更新字段勾选记录 + */ + public void updateZdgxjl(StudyFormUpdateForm form); } 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 6972588..d122bd5 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 @@ -3,16 +3,11 @@ package com.hxhq.business.service; import java.util.List; import com.hxhq.business.domain.StudyFormFill; import com.baomidou.mybatisplus.extension.service.IService; -import com.hxhq.business.dto.mjy.DetailDto; 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; +import com.hxhq.business.form.study.StudyFormUpdateForm; /** * 试验-填报单Service接口 @@ -113,16 +108,16 @@ public interface IStudyFormFillService extends IService /** * 更新表单内容 */ - public void updateBdnr(StudyFormFillUpdateForm form); + public void updateBdnr(StudyFormUpdateForm form); /** * 更新复核意见 */ - public void updateFhyjjl(StudyFormFillUpdateForm form); + public void updateFhyjjl(StudyFormUpdateForm form); /** * 更新字段勾选记录 */ - public void updateZdgxjl(StudyFormFillUpdateForm form); + public void updateZdgxjl(StudyFormUpdateForm form); } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IStudyFormPlanService.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IStudyFormPlanService.java index 480fad6..a72a266 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IStudyFormPlanService.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IStudyFormPlanService.java @@ -4,6 +4,7 @@ import java.util.List; import com.hxhq.business.domain.StudyFormPlan; import com.baomidou.mybatisplus.extension.service.IService; import com.hxhq.business.dto.study.StudyFormPlanListDto; +import com.hxhq.business.form.study.StudyFormUpdateForm; import com.hxhq.business.form.study.StudyFormPlanSearchForm; /** @@ -41,7 +42,7 @@ public interface IStudyFormPlanService extends IService * 保存 * @param studyFormPlan */ - public void bc(StudyFormPlan studyFormPlan); + public StudyFormPlan bc(StudyFormPlan studyFormPlan); /** @@ -69,4 +70,19 @@ public interface IStudyFormPlanService extends IService */ public void sy(StudyFormPlan studyFormPlan); + /** + * 更新表单内容 + */ + public void updateBdnr(StudyFormUpdateForm form); + + /** + * 更新复核意见 + */ + public void updateFhyjjl(StudyFormUpdateForm form); + + /** + * 更新字段勾选记录 + */ + public void updateZdgxjl(StudyFormUpdateForm form); + } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IStudyFormPreService.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IStudyFormPreService.java index 3afa708..5d64e9d 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IStudyFormPreService.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IStudyFormPreService.java @@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.hxhq.business.dto.study.StudyFormPreListDto; import com.hxhq.business.form.study.StudyFormPreAuditForm; import com.hxhq.business.form.study.StudyFormPreSearchForm; +import com.hxhq.business.form.study.StudyFormUpdateForm; import com.hxhq.common.core.web.domain.AjaxResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -40,7 +41,7 @@ public interface IStudyFormPreService extends IService * 保存 * @param studyFormPre */ - public void bc(StudyFormPre studyFormPre); + public StudyFormPre bc(StudyFormPre studyFormPre); /** * 提交 @@ -66,4 +67,18 @@ public interface IStudyFormPreService extends IService */ public StudyFormFill tb(StudyFormPre studyFormPre); + /** + * 更新表单内容 + */ + public void updateBdnr(StudyFormUpdateForm form); + + /** + * 更新复核意见 + */ + public void updateFhyjjl(StudyFormUpdateForm form); + + /** + * 更新字段勾选记录 + */ + public void updateZdgxjl(StudyFormUpdateForm form); } 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 1d65a43..62341ef 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 @@ -2,6 +2,7 @@ package com.hxhq.business.service.impl; import java.util.*; +import com.alibaba.fastjson2.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.hxhq.business.domain.*; @@ -13,14 +14,13 @@ import com.hxhq.business.enums.study.StudyFormApplyBdztEnum; 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.StudyFormApplyGcForm; -import com.hxhq.business.form.study.StudyFormApplySearchForm; -import com.hxhq.business.form.study.StudyFormApplyShfzForm; +import com.hxhq.business.form.study.*; import com.hxhq.business.form.study.StudyFormApplySearchForm; import com.hxhq.business.service.IStudyFormApplyJcgjService; import com.hxhq.business.service.IStudyFormApplyQmxxService; import com.hxhq.business.utils.JctUtil; import com.hxhq.business.utils.ObjectCompareUtil; +import com.hxhq.business.utils.StudyFormUtil; import com.hxhq.common.core.exception.ServiceException; import com.hxhq.common.core.utils.StringUtils; import com.hxhq.common.security.utils.SecurityUtils; @@ -117,7 +117,7 @@ public class StudyFormApplyServiceImpl extends ServiceImpl formData = new LinkedHashMap<>(); formData.put("备注", studyFormApply.getRemark()); - studyFormApplyJcgjService.saveJcgj(studyFormApply.getId(), JcgjlxEnum.lc.getValue(), "填写并保存记录", JcmcysEnum.green.getValue(), null, qmr, studyFormApply.getRemark(),null); + studyFormApplyJcgjService.saveJcgj(studyFormApply.getId(), JcgjlxEnum.lc.getValue(), "填写并保存记录", JcmcysEnum.green.getValue(), null, qmr, studyFormApply.getRemark(), null); + result = studyFormApply; } //签名信息 studyFormApplyQmxxService.saveQmxx(studyFormApply.getId(), "填写并保存记录", qmr, studyFormApply.getRemark()); - + return result; } @@ -297,7 +300,7 @@ public class StudyFormApplyServiceImpl extends ServiceImpl formData = new LinkedHashMap<>(); formData.put("原因", studyFormApply.getRemark()); - studyFormApplyJcgjService.saveJcgj(studyFormApplyOld.getId(), JcgjlxEnum.lc.getValue(), "复核拒绝", JcmcysEnum.red.getValue(), formData, qmr, null,null); + studyFormApplyJcgjService.saveJcgj(studyFormApplyOld.getId(), JcgjlxEnum.lc.getValue(), "复核拒绝", JcmcysEnum.red.getValue(), formData, qmr, null, null); //签名信息 - studyFormApplyQmxxService.saveQmxx(studyFormApplyOld.getId(), "复核拒绝", qmr, studyFormApply.getRemark()); + studyFormApplyQmxxService.saveQmxx(studyFormApplyOld.getId(), "复核拒绝", qmr, studyFormApply.getRemark()); } @@ -381,7 +384,7 @@ public class StudyFormApplyServiceImpl extends ServiceImpl formData = new LinkedHashMap<>(); formData.put("备注", studyFormApply.getRemark()); - studyFormApplyJcgjService.saveJcgj(studyFormApplyOld.getId(), JcgjlxEnum.lc.getValue(), "已审阅", JcmcysEnum.green.getValue(), null, qmr, studyFormApply.getRemark(),null); + studyFormApplyJcgjService.saveJcgj(studyFormApplyOld.getId(), JcgjlxEnum.lc.getValue(), "已审阅", JcmcysEnum.green.getValue(), null, qmr, studyFormApply.getRemark(), null); //签名信息 studyFormApplyQmxxService.saveQmxx(studyFormApplyOld.getId(), "已审阅", qmr, studyFormApply.getRemark()); @@ -413,7 +416,7 @@ public class StudyFormApplyServiceImpl extends ServiceImpl formData = new LinkedHashMap<>(); formData.put("原因", studyFormApply.getRemark()); - studyFormApplyJcgjService.saveJcgj(studyFormApplyOld.getId(), JcgjlxEnum.lc.getValue(), "审核拒绝", JcmcysEnum.red.getValue(), formData, qmr, studyFormApply.getRemark(),null); + studyFormApplyJcgjService.saveJcgj(studyFormApplyOld.getId(), JcgjlxEnum.lc.getValue(), "审核拒绝", JcmcysEnum.red.getValue(), formData, qmr, studyFormApply.getRemark(), null); //签名信息 - studyFormApplyQmxxService.saveQmxx(studyFormApplyOld.getId(), "审核拒绝", qmr, studyFormApply.getRemark()); + studyFormApplyQmxxService.saveQmxx(studyFormApplyOld.getId(), "审核拒绝", qmr, studyFormApply.getRemark()); } @@ -479,4 +482,101 @@ public class StudyFormApplyServiceImpl extends ServiceImpl formData = new LinkedHashMap<>(); + Map formDataEn = new LinkedHashMap<>(); + List studyFormApplyJcgjs = new ArrayList<>(); + if (StringUtils.isNoneBlank(jsonObject.getString("oldValue"))) { + //zh + formData.put("字段名", jsonObject.getString("fieldCn")); + formData.put("原值", jsonObject.getString("oldValue")); + formData.put("新值", jsonObject.getString("value")); + formData.put("原因", jsonObject.getString("reason")); + //en + formDataEn.put("字段名", jsonObject.getString("fieldEn")); + formDataEn.put("原值", jsonObject.getString("oldValue")); + formDataEn.put("新值", jsonObject.getString("value")); + formDataEn.put("原因", jsonObject.getString("reason")); + studyFormApplyJcgjs.add(studyFormApplyJcgjService.getJcgj(form.getId(), JcgjlxEnum.xg.getValue(), "修改记录", JcmcysEnum.orange.getValue(), JctUtil.formatStr(formData), StudyFormUtil.getJcnrEn(formDataEn), qmr, null)); + } else { + //zh + formData.put("字段名", jsonObject.getString("fieldCn")); + formData.put("填入值", jsonObject.getString("value")); + formData.put("填写人", qmr.getNickName()); + //en + formDataEn.put("字段名", jsonObject.getString("fieldEn")); + formDataEn.put("填入值", jsonObject.getString("value")); + formDataEn.put("填写人", qmr.getNickName()); + studyFormApplyJcgjs.add(studyFormApplyJcgjService.getJcgj(form.getId(), JcgjlxEnum.lc.getValue(), "填写", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), StudyFormUtil.getJcnrEn(formDataEn), null, null)); + } + studyFormApplyJcgjService.saveBatch(studyFormApplyJcgjs); + } + } + + /** + * 更新复核意见 + */ + @Override + public void updateFhyjjl(StudyFormUpdateForm form) { + SysUser qmr = SecurityUtils.getLoginUser().getSysUser(); + // {"type":"reply","newRecord":{"userNameCn":"谭飞","userNameEn":"tf","key":"_versionNum","field":"试验基本信息-版本号","title":"复核意见","time":"2026-01-14 20:23:30","content":"qweqe"},"resourceList":[{"userNameCn":"谭飞","userNameEn":"tf","key":"_versionNum","field":"试验基本信息-版本号","title":"复核意见","time":"2026-01-14 20:23:30","content":"qweqe"},{"userNameCn":"谭飞","userNameEn":"tf","key":"_methodCode","field":"试验基本信息-方法编号","title":"复核意见","time":"2026-01-14 20:23:28","content":"qweqw"}]} + // {"type":"content","newRecord":{"userNameCn":"谭飞","userNameEn":"tf","key":"_versionNum","field":"试验基本信息-版本号","title":"复核意见","time":"2026-01-14 20:23:30","content":"qweqe"},"resourceList":[{"userNameCn":"谭飞","userNameEn":"tf","key":"_versionNum","field":"试验基本信息-版本号","title":"复核意见","time":"2026-01-14 20:23:30","content":"qweqe"},{"userNameCn":"谭飞","userNameEn":"tf","key":"_methodCode","field":"试验基本信息-方法编号","title":"复核意见","time":"2026-01-14 20:23:28","content":"qweqw"}]} + //更新复核意见 todo +// baseMapper.updateFhyjjl(form.getId(), form.getFhyjjl()); + StudyFormApply studyFormApplyOld = this.queryInfo(form.getId()); + studyFormApplyOld.setFhyjjl(form.getFhyjjl()); + this.updateById(studyFormApplyOld); + Map formData = new LinkedHashMap<>(); + Map formDataEn = new LinkedHashMap<>(); + List studyFormApplyJcgjs = new ArrayList<>(); + if (StringUtils.isNoneBlank(form.getContent())) { + JSONObject jsonObject = JSONObject.parseObject(form.getContent()); + //zh + formData.put("字段名", jsonObject.getString("fieldCn")); + formData.put("意见回复", jsonObject.getString("content")); + //en + formDataEn.put("字段名", jsonObject.getString("fieldEn")); + formDataEn.put("意见回复", jsonObject.getString("content")); + studyFormApplyJcgjs.add(studyFormApplyJcgjService.getJcgj(form.getId(), JcgjlxEnum.lc.getValue(), "意见回复", JcmcysEnum.blue.getValue(), JctUtil.formatStr(formData), StudyFormUtil.getJcnrEn(formDataEn), qmr, null)); + } else { + JSONObject jsonObject = JSONObject.parseObject(form.getReplay()); + //zh + formData.put("字段名", jsonObject.getString("fieldCn")); + formData.put("复核意见", jsonObject.getString("content")); + //en + formData.put("字段名", jsonObject.getString("fieldEn")); + formData.put("复核意见", jsonObject.getString("content")); + studyFormApplyJcgjs.add(studyFormApplyJcgjService.getJcgj(form.getId(), JcgjlxEnum.lc.getValue(), "复核意见", JcmcysEnum.blue.getValue(), JctUtil.formatStr(formData), StudyFormUtil.getJcnrEn(formDataEn), qmr, null)); + } + studyFormApplyJcgjService.saveBatch(studyFormApplyJcgjs); + } + + /** + * 更新字段勾选记录 + */ + @Override + public void updateZdgxjl(StudyFormUpdateForm form) { + //更新勾选记录 todo + StudyFormApply studyFormApplyOld = this.queryInfo(form.getId()); + studyFormApplyOld.setZdxgjl(form.getZdgxjl()); + this.updateById(studyFormApplyOld); +// baseMapper.updateZdgxjl(form.getId(), form.getZdgxjl()); + } + + } 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 7816a9c..6c0b9b5 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 @@ -2,21 +2,16 @@ package com.hxhq.business.service.impl; import java.util.*; -import com.alibaba.fastjson2.JSONArray; import com.alibaba.fastjson2.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.hxhq.business.domain.*; -import com.hxhq.business.dto.mjy.DetailDto; import com.hxhq.business.dto.study.StudyFormFillListDto; 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.*; import com.hxhq.business.form.study.StudyFormFillSearchForm; import com.hxhq.business.service.*; @@ -112,7 +107,7 @@ public class StudyFormFillServiceImpl extends ServiceImpl formData = new LinkedHashMap<>(); formData.put("原因", form.getRemark()); - studyFormFillJcgjService.saveJcgj(studyFormFillOld.getId(), JcgjlxEnum.lc.getValue(), "废止通过", JcmcysEnum.green.getValue(), formData, SecurityUtils.getLoginUser().getSysUser(), null,null); + studyFormFillJcgjService.saveJcgj(studyFormFillOld.getId(), JcgjlxEnum.lc.getValue(), "废止通过", JcmcysEnum.green.getValue(), formData, SecurityUtils.getLoginUser().getSysUser(), null, null); //签名信息 studyFormFillQmxxService.saveQmxx(studyFormFillOld.getId(), "废止通过", qmr, form.getRemark()); @@ -209,7 +204,7 @@ public class StudyFormFillServiceImpl extends ServiceImpl formData = new LinkedHashMap<>(); formData.put("原因", form.getRemark()); - studyFormFillJcgjService.saveJcgj(studyFormFillOld.getId(), JcgjlxEnum.lc.getValue(), "废止拒绝", JcmcysEnum.red.getValue(), formData, SecurityUtils.getLoginUser().getSysUser(), null,null); + studyFormFillJcgjService.saveJcgj(studyFormFillOld.getId(), JcgjlxEnum.lc.getValue(), "废止拒绝", JcmcysEnum.red.getValue(), formData, SecurityUtils.getLoginUser().getSysUser(), null, null); //签名信息 studyFormFillQmxxService.saveQmxx(studyFormFillOld.getId(), "废止拒绝", qmr, form.getRemark()); @@ -225,7 +220,7 @@ public class StudyFormFillServiceImpl extends ServiceImpl formData = new LinkedHashMap<>(); formData.put("生长情况", form.getQmyy()); - studyFormFillJcgjService.saveJcgj(studyFormFillOld.getId(), JcgjlxEnum.lc.getValue(), form.getQmyy(), JcmcysEnum.orange.getValue(), null, SecurityUtils.getLoginUser().getSysUser(), form.getRemark(),null ); + studyFormFillJcgjService.saveJcgj(studyFormFillOld.getId(), JcgjlxEnum.lc.getValue(), form.getQmyy(), JcmcysEnum.orange.getValue(), null, SecurityUtils.getLoginUser().getSysUser(), form.getRemark(), null); //签名信息 studyFormFillQmxxService.saveQmxx(studyFormFillOld.getId(), form.getQmyy(), qmr, form.getRemark()); @@ -415,7 +410,7 @@ public class StudyFormFillServiceImpl extends ServiceImpl formData = new LinkedHashMap<>(); formData.put("原因", studyFormFill.getRemark()); - studyFormFillJcgjService.saveJcgj(studyFormFillOld.getId(), JcgjlxEnum.lc.getValue(), "复核拒绝", JcmcysEnum.red.getValue(), null, SecurityUtils.getLoginUser().getSysUser(), null,null ); + studyFormFillJcgjService.saveJcgj(studyFormFillOld.getId(), JcgjlxEnum.lc.getValue(), "复核拒绝", JcmcysEnum.red.getValue(), null, SecurityUtils.getLoginUser().getSysUser(), null, null); //签名信息 studyFormFillQmxxService.saveQmxx(studyFormFillOld.getId(), "复核拒绝", qmr, studyFormFill.getRemark()); @@ -478,7 +473,7 @@ public class StudyFormFillServiceImpl extends ServiceImpl formData = new LinkedHashMap<>(); formData.put("原因", studyFormFill.getRemark()); - studyFormFillJcgjService.saveJcgj(studyFormFillOld.getId(), JcgjlxEnum.lc.getValue(), "免复核通过", JcmcysEnum.green.getValue(), null, SecurityUtils.getLoginUser().getSysUser(), null,null ); + studyFormFillJcgjService.saveJcgj(studyFormFillOld.getId(), JcgjlxEnum.lc.getValue(), "免复核通过", JcmcysEnum.green.getValue(), null, SecurityUtils.getLoginUser().getSysUser(), null, null); //签名信息 studyFormFillQmxxService.saveQmxx(studyFormFillOld.getId(), "免复核通过", qmr, studyFormFill.getRemark()); @@ -511,7 +506,7 @@ public class StudyFormFillServiceImpl extends ServiceImpl formData = new LinkedHashMap<>(); - Map formDataEn = new LinkedHashMap<>(); - List studyFormFillJcgjs = new ArrayList<>(); - if(StringUtils.isNoneBlank(jsonObject.getString("oldValue"))){ - //zh - formData.put("字段名", jsonObject.getString("fieldCn")); - formData.put("原值", jsonObject.getString("oldValue")); - formData.put("新值", jsonObject.getString("value")); - formData.put("原因", jsonObject.getString("reason")); - //en - formDataEn.put("字段名", jsonObject.getString("fieldEn")); - formDataEn.put("原值", jsonObject.getString("oldValue")); - formDataEn.put("新值", jsonObject.getString("value")); - formDataEn.put("原因", jsonObject.getString("reason")); - studyFormFillJcgjs.add(studyFormFillJcgjService.getJcgj(form.getId(), JcgjlxEnum.xg.getValue(), "修改记录", JcmcysEnum.orange.getValue(), JSONObject.toJSONString(formData), StudyFormUtil.getJcnrEn(formDataEn), qmr, null)); - }else{ - //zh - formData.put("字段名", jsonObject.getString("fieldCn")); - formData.put("填入值", jsonObject.getString("value")); - formData.put("填写人", qmr.getNickName()); - //en - formData.put("字段名", jsonObject.getString("fieldEn")); - formData.put("填入值", jsonObject.getString("value")); - formData.put("填写人", qmr.getNickName()); - studyFormFillJcgjs.add(studyFormFillJcgjService.getJcgj(form.getId(), JcgjlxEnum.lc.getValue(), "填写", JcmcysEnum.green.getValue(), JSONObject.toJSONString(formData), StudyFormUtil.getJcnrEn(formDataEn), null, null)); + if (StringUtils.isNoneBlank(form.getFiledValue())) { + JSONObject jsonObject = JSONObject.parseObject(form.getFiledValue()); + Map formData = new LinkedHashMap<>(); + Map formDataEn = new LinkedHashMap<>(); + List studyFormFillJcgjs = new ArrayList<>(); + if (StringUtils.isNoneBlank(jsonObject.getString("oldValue"))) { + //zh + formData.put("字段名", jsonObject.getString("fieldCn")); + formData.put("原值", jsonObject.getString("oldValue")); + formData.put("新值", jsonObject.getString("value")); + formData.put("原因", jsonObject.getString("reason")); + //en + formDataEn.put("字段名", jsonObject.getString("fieldEn")); + formDataEn.put("原值", jsonObject.getString("oldValue")); + formDataEn.put("新值", jsonObject.getString("value")); + formDataEn.put("原因", jsonObject.getString("reason")); + studyFormFillJcgjs.add(studyFormFillJcgjService.getJcgj(form.getId(), JcgjlxEnum.xg.getValue(), "修改记录", JcmcysEnum.orange.getValue(), JctUtil.formatStr(formData), StudyFormUtil.getJcnrEn(formDataEn), qmr, null)); + } else { + //zh + formData.put("字段名", jsonObject.getString("fieldCn")); + formData.put("填入值", jsonObject.getString("value")); + formData.put("填写人", qmr.getNickName()); + //en + formDataEn.put("字段名", jsonObject.getString("fieldEn")); + formDataEn.put("填入值", jsonObject.getString("value")); + formDataEn.put("填写人", qmr.getNickName()); + studyFormFillJcgjs.add(studyFormFillJcgjService.getJcgj(form.getId(), JcgjlxEnum.lc.getValue(), "填写", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), StudyFormUtil.getJcnrEn(formDataEn), null, null)); + } + studyFormFillJcgjService.saveBatch(studyFormFillJcgjs); } - studyFormFillJcgjService.saveBatch(studyFormFillJcgjs); } /** * 更新复核意见 */ @Override - public void updateFhyjjl(StudyFormFillUpdateForm form) { - SysUser qmr=SecurityUtils.getLoginUser().getSysUser(); + public void updateFhyjjl(StudyFormUpdateForm form) { + SysUser qmr = SecurityUtils.getLoginUser().getSysUser(); // {"type":"reply","newRecord":{"userNameCn":"谭飞","userNameEn":"tf","key":"_versionNum","field":"试验基本信息-版本号","title":"复核意见","time":"2026-01-14 20:23:30","content":"qweqe"},"resourceList":[{"userNameCn":"谭飞","userNameEn":"tf","key":"_versionNum","field":"试验基本信息-版本号","title":"复核意见","time":"2026-01-14 20:23:30","content":"qweqe"},{"userNameCn":"谭飞","userNameEn":"tf","key":"_methodCode","field":"试验基本信息-方法编号","title":"复核意见","time":"2026-01-14 20:23:28","content":"qweqw"}]} // {"type":"content","newRecord":{"userNameCn":"谭飞","userNameEn":"tf","key":"_versionNum","field":"试验基本信息-版本号","title":"复核意见","time":"2026-01-14 20:23:30","content":"qweqe"},"resourceList":[{"userNameCn":"谭飞","userNameEn":"tf","key":"_versionNum","field":"试验基本信息-版本号","title":"复核意见","time":"2026-01-14 20:23:30","content":"qweqe"},{"userNameCn":"谭飞","userNameEn":"tf","key":"_methodCode","field":"试验基本信息-方法编号","title":"复核意见","time":"2026-01-14 20:23:28","content":"qweqw"}]} //更新复核意见 todo @@ -606,24 +604,24 @@ public class StudyFormFillServiceImpl extends ServiceImpl formData = new LinkedHashMap<>(); Map formDataEn = new LinkedHashMap<>(); List studyFormFillJcgjs = new ArrayList<>(); - if(StringUtils.isNoneBlank(form.getContent())){ - JSONObject jsonObject=JSONObject.parseObject(form.getContent()); + if (StringUtils.isNoneBlank(form.getContent())) { + JSONObject jsonObject = JSONObject.parseObject(form.getContent()); //zh formData.put("字段名", jsonObject.getString("fieldCn")); - formData.put("意见回复", jsonObject.getString("content")); + formData.put("意见回复", jsonObject.getString("content")); //en formDataEn.put("字段名", jsonObject.getString("fieldEn")); - formDataEn.put("意见回复", jsonObject.getString("content")); - studyFormFillJcgjs.add(studyFormFillJcgjService.getJcgj(form.getId(), JcgjlxEnum.lc.getValue(), "意见回复", JcmcysEnum.blue.getValue(), JSONObject.toJSONString(formData), StudyFormUtil.getJcnrEn(formDataEn), qmr, null)); - }else{ - JSONObject jsonObject=JSONObject.parseObject(form.getReplay()); + formDataEn.put("意见回复", jsonObject.getString("content")); + studyFormFillJcgjs.add(studyFormFillJcgjService.getJcgj(form.getId(), JcgjlxEnum.lc.getValue(), "意见回复", JcmcysEnum.blue.getValue(), JctUtil.formatStr(formData), StudyFormUtil.getJcnrEn(formDataEn), qmr, null)); + } else { + JSONObject jsonObject = JSONObject.parseObject(form.getReplay()); //zh formData.put("字段名", jsonObject.getString("fieldCn")); - formData.put("复核意见", jsonObject.getString("content")); + formData.put("复核意见", jsonObject.getString("content")); //en formData.put("字段名", jsonObject.getString("fieldEn")); - formData.put("复核意见", jsonObject.getString("content")); - studyFormFillJcgjs.add(studyFormFillJcgjService.getJcgj(form.getId(), JcgjlxEnum.lc.getValue(), "复核意见", JcmcysEnum.blue.getValue(), JSONObject.toJSONString(formData), StudyFormUtil.getJcnrEn(formDataEn), qmr, null)); + formData.put("复核意见", jsonObject.getString("content")); + studyFormFillJcgjs.add(studyFormFillJcgjService.getJcgj(form.getId(), JcgjlxEnum.lc.getValue(), "复核意见", JcmcysEnum.blue.getValue(), JctUtil.formatStr(formData), StudyFormUtil.getJcnrEn(formDataEn), qmr, null)); } studyFormFillJcgjService.saveBatch(studyFormFillJcgjs); } @@ -632,7 +630,7 @@ public class StudyFormFillServiceImpl extends ServiceImpl formData = new LinkedHashMap<>(); formData.put("备注", studyFormPlan.getRemark()); - studyFormPlanJcgjService.saveJcgj(studyFormPlan.getId(), JcgjlxEnum.lc.getValue(), "填写并保存记录", JcmcysEnum.green.getValue(), null,qmr,studyFormPlan.getRemark(),null); + studyFormPlanJcgjService.saveJcgj(studyFormPlan.getId(), JcgjlxEnum.lc.getValue(), "填写并保存记录", JcmcysEnum.green.getValue(), null, qmr, studyFormPlan.getRemark(), null); + result = studyFormPlan; } //签名信息 - studyFormPlanQmxxService.saveQmxx(studyFormPlan.getId(), "填写并保存记录", qmr,studyFormPlan.getRemark()); - + studyFormPlanQmxxService.saveQmxx(studyFormPlan.getId(), "填写并保存记录", qmr, studyFormPlan.getRemark()); + return result; } @@ -179,7 +183,7 @@ public class StudyFormPlanServiceImpl extends ServiceImpl formData = new LinkedHashMap<>(); formData.put("备注", studyFormPlan.getRemark()); - studyFormPlanJcgjService.saveJcgj(studyFormPlan.getId(), JcgjlxEnum.lc.getValue(), "填写并提交记录", JcmcysEnum.green.getValue(), null, qmr,studyFormPlan.getRemark(),null); + studyFormPlanJcgjService.saveJcgj(studyFormPlan.getId(), JcgjlxEnum.lc.getValue(), "填写并提交记录", JcmcysEnum.green.getValue(), null, qmr, studyFormPlan.getRemark(), null); //签名信息 - studyFormPlanQmxxService.saveQmxx(studyFormPlan.getId(), "填写并提交记录", qmr,studyFormPlan.getRemark()); + studyFormPlanQmxxService.saveQmxx(studyFormPlan.getId(), "填写并提交记录", qmr, studyFormPlan.getRemark()); } @@ -207,7 +211,7 @@ public class StudyFormPlanServiceImpl extends ServiceImpl formData = new LinkedHashMap<>(); formData.put("原因", studyFormPlan.getRemark()); - studyFormPlanJcgjService.saveJcgj(studyFormPlanOld.getId(), JcgjlxEnum.lc.getValue(), "复核拒绝", JcmcysEnum.red.getValue(), formData, qmr, null,null); + studyFormPlanJcgjService.saveJcgj(studyFormPlanOld.getId(), JcgjlxEnum.lc.getValue(), "复核拒绝", JcmcysEnum.red.getValue(), formData, qmr, null, null); //签名信息 studyFormPlanQmxxService.saveQmxx(studyFormPlanOld.getId(), "复核拒绝", qmr, studyFormPlan.getRemark()); @@ -268,7 +272,7 @@ public class StudyFormPlanServiceImpl extends ServiceImpl formData = new LinkedHashMap<>(); + Map formDataEn = new LinkedHashMap<>(); + List studyFormPlanJcgjs = new ArrayList<>(); + if (StringUtils.isNoneBlank(jsonObject.getString("oldValue"))) { + //zh + formData.put("字段名", jsonObject.getString("fieldCn")); + formData.put("原值", jsonObject.getString("oldValue")); + formData.put("新值", jsonObject.getString("value")); + formData.put("原因", jsonObject.getString("reason")); + //en + formDataEn.put("字段名", jsonObject.getString("fieldEn")); + formDataEn.put("原值", jsonObject.getString("oldValue")); + formDataEn.put("新值", jsonObject.getString("value")); + formDataEn.put("原因", jsonObject.getString("reason")); + studyFormPlanJcgjs.add(studyFormPlanJcgjService.getJcgj(form.getId(), JcgjlxEnum.xg.getValue(), "修改记录", JcmcysEnum.orange.getValue(), JctUtil.formatStr(formData), StudyFormUtil.getJcnrEn(formDataEn), qmr, null)); + } else { + //zh + formData.put("字段名", jsonObject.getString("fieldCn")); + formData.put("填入值", jsonObject.getString("value")); + formData.put("填写人", qmr.getNickName()); + //en + formDataEn.put("字段名", jsonObject.getString("fieldEn")); + formDataEn.put("填入值", jsonObject.getString("value")); + formDataEn.put("填写人", qmr.getNickName()); + studyFormPlanJcgjs.add(studyFormPlanJcgjService.getJcgj(form.getId(), JcgjlxEnum.lc.getValue(), "填写", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), StudyFormUtil.getJcnrEn(formDataEn), null, null)); + } + studyFormPlanJcgjService.saveBatch(studyFormPlanJcgjs); + } + + } + + /** + * 更新复核意见 + */ + @Override + public void updateFhyjjl(StudyFormUpdateForm form) { + SysUser qmr = SecurityUtils.getLoginUser().getSysUser(); + // {"type":"reply","newRecord":{"userNameCn":"谭飞","userNameEn":"tf","key":"_versionNum","field":"试验基本信息-版本号","title":"复核意见","time":"2026-01-14 20:23:30","content":"qweqe"},"resourceList":[{"userNameCn":"谭飞","userNameEn":"tf","key":"_versionNum","field":"试验基本信息-版本号","title":"复核意见","time":"2026-01-14 20:23:30","content":"qweqe"},{"userNameCn":"谭飞","userNameEn":"tf","key":"_methodCode","field":"试验基本信息-方法编号","title":"复核意见","time":"2026-01-14 20:23:28","content":"qweqw"}]} + // {"type":"content","newRecord":{"userNameCn":"谭飞","userNameEn":"tf","key":"_versionNum","field":"试验基本信息-版本号","title":"复核意见","time":"2026-01-14 20:23:30","content":"qweqe"},"resourceList":[{"userNameCn":"谭飞","userNameEn":"tf","key":"_versionNum","field":"试验基本信息-版本号","title":"复核意见","time":"2026-01-14 20:23:30","content":"qweqe"},{"userNameCn":"谭飞","userNameEn":"tf","key":"_methodCode","field":"试验基本信息-方法编号","title":"复核意见","time":"2026-01-14 20:23:28","content":"qweqw"}]} + //更新复核意见 todo +// baseMapper.updateFhyjjl(form.getId(), form.getFhyjjl()); + StudyFormPlan studyFormPlanOld = this.queryInfo(form.getId()); + studyFormPlanOld.setFhyjjl(form.getFhyjjl()); + this.updateById(studyFormPlanOld); + Map formData = new LinkedHashMap<>(); + Map formDataEn = new LinkedHashMap<>(); + List studyFormPlanJcgjs = new ArrayList<>(); + if (StringUtils.isNoneBlank(form.getContent())) { + JSONObject jsonObject = JSONObject.parseObject(form.getContent()); + //zh + formData.put("字段名", jsonObject.getString("fieldCn")); + formData.put("意见回复", jsonObject.getString("content")); + //en + formDataEn.put("字段名", jsonObject.getString("fieldEn")); + formDataEn.put("意见回复", jsonObject.getString("content")); + studyFormPlanJcgjs.add(studyFormPlanJcgjService.getJcgj(form.getId(), JcgjlxEnum.lc.getValue(), "意见回复", JcmcysEnum.blue.getValue(), JctUtil.formatStr(formData), StudyFormUtil.getJcnrEn(formDataEn), qmr, null)); + } else { + JSONObject jsonObject = JSONObject.parseObject(form.getReplay()); + //zh + formData.put("字段名", jsonObject.getString("fieldCn")); + formData.put("复核意见", jsonObject.getString("content")); + //en + formData.put("字段名", jsonObject.getString("fieldEn")); + formData.put("复核意见", jsonObject.getString("content")); + studyFormPlanJcgjs.add(studyFormPlanJcgjService.getJcgj(form.getId(), JcgjlxEnum.lc.getValue(), "复核意见", JcmcysEnum.blue.getValue(), JctUtil.formatStr(formData), StudyFormUtil.getJcnrEn(formDataEn), qmr, null)); + } + studyFormPlanJcgjService.saveBatch(studyFormPlanJcgjs); + } + + /** + * 更新字段勾选记录 + */ + @Override + public void updateZdgxjl(StudyFormUpdateForm form) { + //更新勾选记录 todo + StudyFormPlan studyFormPlanOld = this.queryInfo(form.getId()); + studyFormPlanOld.setZdxgjl(form.getZdgxjl()); + this.updateById(studyFormPlanOld); +// baseMapper.updateZdgxjl(form.getId(), form.getZdgxjl()); + } + + } \ No newline at end of file diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormPreServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormPreServiceImpl.java index a04d8fb..7a43365 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormPreServiceImpl.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormPreServiceImpl.java @@ -2,11 +2,10 @@ package com.hxhq.business.service.impl; import java.util.*; +import com.alibaba.fastjson2.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.hxhq.business.domain.StudyFormFill; -import com.hxhq.business.domain.StudyFormPlanJcgj; -import com.hxhq.business.domain.StudyFormPreJcgj; +import com.hxhq.business.domain.*; import com.hxhq.business.dto.study.StudyFormPreListDto; import com.hxhq.business.enums.NormalEnum; import com.hxhq.business.enums.study.StudyFormPreBdztEnum; @@ -16,9 +15,11 @@ import com.hxhq.business.enums.zykgl.JcmcysEnum; import com.hxhq.business.form.common.SignForm; import com.hxhq.business.form.study.StudyFormPreAuditForm; import com.hxhq.business.form.study.StudyFormPreSearchForm; +import com.hxhq.business.form.study.StudyFormUpdateForm; import com.hxhq.business.service.*; import com.hxhq.business.utils.JctUtil; import com.hxhq.business.utils.ObjectCompareUtil; +import com.hxhq.business.utils.StudyFormUtil; import com.hxhq.common.core.exception.ServiceException; import com.hxhq.common.core.utils.StringUtils; import com.hxhq.common.security.utils.SecurityUtils; @@ -27,7 +28,6 @@ import com.hxhq.system.service.ISysUserService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.hxhq.business.mapper.StudyFormPreMapper; -import com.hxhq.business.domain.StudyFormPre; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.web.bind.annotation.PostMapping; @@ -110,8 +110,9 @@ public class StudyFormPreServiceImpl extends ServiceImpl formData = new LinkedHashMap<>(); formData.put("备注", studyFormPre.getRemark()); - studyFormPreJcgjService.saveJcgj(studyFormPre.getId(), JcgjlxEnum.lc.getValue(), "制作提交预制表单", JcmcysEnum.green.getValue(), null, qmr, studyFormPre.getRemark(),null); + studyFormPreJcgjService.saveJcgj(studyFormPre.getId(), JcgjlxEnum.lc.getValue(), "制作提交预制表单", JcmcysEnum.green.getValue(), null, qmr, studyFormPre.getRemark(), null); //签名信息 studyFormPreQmxxService.saveQmxx(studyFormPre.getId(), "制作提交预制表单", qmr, studyFormPre.getRemark()); @@ -193,7 +196,7 @@ public class StudyFormPreServiceImpl extends ServiceImpl formData = new LinkedHashMap<>(); formData.put("原因", form.getRemark()); - studyFormPreJcgjService.saveJcgj(studyFormPreOld.getId(), JcgjlxEnum.lc.getValue(), "审核拒绝", JcmcysEnum.red.getValue(), formData, qmr, null,null); + studyFormPreJcgjService.saveJcgj(studyFormPreOld.getId(), JcgjlxEnum.lc.getValue(), "审核拒绝", JcmcysEnum.red.getValue(), formData, qmr, null, null); //签名信息 studyFormPreQmxxService.saveQmxx(studyFormPreOld.getId(), "审核拒绝", qmr, form.getRemark()); } @@ -259,7 +262,7 @@ public class StudyFormPreServiceImpl extends ServiceImpl formData = new LinkedHashMap<>(); + Map formDataEn = new LinkedHashMap<>(); + List studyFormPreJcgjs = new ArrayList<>(); + if (StringUtils.isNoneBlank(jsonObject.getString("oldValue"))) { + //zh + formData.put("字段名", jsonObject.getString("fieldCn")); + formData.put("原值", jsonObject.getString("oldValue")); + formData.put("新值", jsonObject.getString("value")); + formData.put("原因", jsonObject.getString("reason")); + //en + formDataEn.put("字段名", jsonObject.getString("fieldEn")); + formDataEn.put("原值", jsonObject.getString("oldValue")); + formDataEn.put("新值", jsonObject.getString("value")); + formDataEn.put("原因", jsonObject.getString("reason")); + studyFormPreJcgjs.add(studyFormPreJcgjService.getJcgj(form.getId(), JcgjlxEnum.xg.getValue(), "修改记录", JcmcysEnum.orange.getValue(), JctUtil.formatStr(formData), StudyFormUtil.getJcnrEn(formDataEn), qmr, null)); + } else { + //zh + formData.put("字段名", jsonObject.getString("fieldCn")); + formData.put("填入值", jsonObject.getString("value")); + formData.put("填写人", qmr.getNickName()); + //en + formDataEn.put("字段名", jsonObject.getString("fieldEn")); + formDataEn.put("填入值", jsonObject.getString("value")); + formDataEn.put("填写人", qmr.getNickName()); + studyFormPreJcgjs.add(studyFormPreJcgjService.getJcgj(form.getId(), JcgjlxEnum.lc.getValue(), "填写", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), StudyFormUtil.getJcnrEn(formDataEn), null, null)); + } + studyFormPreJcgjService.saveBatch(studyFormPreJcgjs); + } + + } + + /** + * 更新复核意见 + */ + @Override + public void updateFhyjjl(StudyFormUpdateForm form) { + SysUser qmr = SecurityUtils.getLoginUser().getSysUser(); + // {"type":"reply","newRecord":{"userNameCn":"谭飞","userNameEn":"tf","key":"_versionNum","field":"试验基本信息-版本号","title":"复核意见","time":"2026-01-14 20:23:30","content":"qweqe"},"resourceList":[{"userNameCn":"谭飞","userNameEn":"tf","key":"_versionNum","field":"试验基本信息-版本号","title":"复核意见","time":"2026-01-14 20:23:30","content":"qweqe"},{"userNameCn":"谭飞","userNameEn":"tf","key":"_methodCode","field":"试验基本信息-方法编号","title":"复核意见","time":"2026-01-14 20:23:28","content":"qweqw"}]} + // {"type":"content","newRecord":{"userNameCn":"谭飞","userNameEn":"tf","key":"_versionNum","field":"试验基本信息-版本号","title":"复核意见","time":"2026-01-14 20:23:30","content":"qweqe"},"resourceList":[{"userNameCn":"谭飞","userNameEn":"tf","key":"_versionNum","field":"试验基本信息-版本号","title":"复核意见","time":"2026-01-14 20:23:30","content":"qweqe"},{"userNameCn":"谭飞","userNameEn":"tf","key":"_methodCode","field":"试验基本信息-方法编号","title":"复核意见","time":"2026-01-14 20:23:28","content":"qweqw"}]} + //更新复核意见 todo +// baseMapper.updateFhyjjl(form.getId(), form.getFhyjjl()); + StudyFormPre studyFormPreOld = this.queryInfo(form.getId()); + studyFormPreOld.setFhyjjl(form.getFhyjjl()); + this.updateById(studyFormPreOld); + Map formData = new LinkedHashMap<>(); + Map formDataEn = new LinkedHashMap<>(); + List studyFormPreJcgjs = new ArrayList<>(); + if (StringUtils.isNoneBlank(form.getContent())) { + JSONObject jsonObject = JSONObject.parseObject(form.getContent()); + //zh + formData.put("字段名", jsonObject.getString("fieldCn")); + formData.put("意见回复", jsonObject.getString("content")); + //en + formDataEn.put("字段名", jsonObject.getString("fieldEn")); + formDataEn.put("意见回复", jsonObject.getString("content")); + studyFormPreJcgjs.add(studyFormPreJcgjService.getJcgj(form.getId(), JcgjlxEnum.lc.getValue(), "意见回复", JcmcysEnum.blue.getValue(), JctUtil.formatStr(formData), StudyFormUtil.getJcnrEn(formDataEn), qmr, null)); + } else { + JSONObject jsonObject = JSONObject.parseObject(form.getReplay()); + //zh + formData.put("字段名", jsonObject.getString("fieldCn")); + formData.put("复核意见", jsonObject.getString("content")); + //en + formData.put("字段名", jsonObject.getString("fieldEn")); + formData.put("复核意见", jsonObject.getString("content")); + studyFormPreJcgjs.add(studyFormPreJcgjService.getJcgj(form.getId(), JcgjlxEnum.lc.getValue(), "复核意见", JcmcysEnum.blue.getValue(), JctUtil.formatStr(formData), StudyFormUtil.getJcnrEn(formDataEn), qmr, null)); + } + studyFormPreJcgjService.saveBatch(studyFormPreJcgjs); + } + + /** + * 更新字段勾选记录 + */ + @Override + public void updateZdgxjl(StudyFormUpdateForm form) { + //更新勾选记录 todo + StudyFormPre studyFormPreOld = this.queryInfo(form.getId()); + studyFormPreOld.setZdxgjl(form.getZdgxjl()); + this.updateById(studyFormPreOld); +// baseMapper.updateZdgxjl(form.getId(), form.getZdgxjl()); + } } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/GyzjJcnrUtil.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/GyzjJcnrUtil.java index ef875d9..f2f4ed2 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/GyzjJcnrUtil.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/GyzjJcnrUtil.java @@ -44,9 +44,9 @@ public class GyzjJcnrUtil { mapJcnr.put("入库净重","Check-in Net Weight"); mapJcnr.put("入库量","Total Amount"); - mapJcnr.put("目的","todo"); - mapJcnr.put("申请备注","todo"); - mapJcnr.put("审核备注","todo"); + mapJcnr.put("目的","目的"); + mapJcnr.put("申请备注","申请备注"); + mapJcnr.put("审核备注","审核备注"); //endregion //region 稽查名称 @@ -69,11 +69,11 @@ public class GyzjJcnrUtil { mapQmyy.put("确认归还","Confirm Check-in"); mapQmyy.put("领取发放","Distribution"); - mapQmyy.put("锁定发放记录","todo"); - mapQmyy.put("解锁发放记录","todo"); - mapQmyy.put("给药制剂入库","todo"); - mapQmyy.put("同意入库","todo"); - mapQmyy.put("拒绝入库","todo"); + mapQmyy.put("锁定发放记录","锁定发放记录"); + mapQmyy.put("解锁发放记录","解锁发放记录"); + mapQmyy.put("给药制剂入库","给药制剂入库"); + mapQmyy.put("同意入库","同意入库"); + mapQmyy.put("拒绝入库","拒绝入库"); //endregion diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/MjyJcnrUtil.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/MjyJcnrUtil.java index 7a413bb..2b55475 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/MjyJcnrUtil.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/MjyJcnrUtil.java @@ -40,13 +40,13 @@ public class MjyJcnrUtil { mapJcnr.put("库管员2","Warehouse Keeper 2"); mapJcnr.put("签名人1","Signed By 1"); mapJcnr.put("签名人2","Signed By 2"); + mapJcnr.put("申请备注","Apply Comment"); + mapJcnr.put("审核备注","Approve Comment"); - mapJcnr.put("目的","todo"); - mapJcnr.put("申请备注","todo"); - mapJcnr.put("审核备注","todo"); - mapJcnr.put("入库位置","todo"); - mapJcnr.put("入库条件","todo"); - mapJcnr.put("减少量","todo"); + mapJcnr.put("目的","目的"); + mapJcnr.put("入库位置","入库位置"); + mapJcnr.put("入库条件","入库条件"); + mapJcnr.put("减少量","减少量"); //endregion @@ -68,9 +68,10 @@ public class MjyJcnrUtil { mapQmyy.put("拒绝修改库存","Reject Change Inventory"); mapQmyy.put("归还","Return"); mapQmyy.put("领取发放","Distribution"); - mapQmyy.put("锁定发放记录","todo"); - mapQmyy.put("解锁发放记录","todo"); - mapQmyy.put("麻精药入库","todo"); + + mapQmyy.put("锁定发放记录","锁定发放记录"); + mapQmyy.put("解锁发放记录","解锁发放记录"); + mapQmyy.put("麻精药入库","麻精药入库"); diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/StudyFormUtil.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/StudyFormUtil.java index 0e6293e..27e1161 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/StudyFormUtil.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/StudyFormUtil.java @@ -25,10 +25,10 @@ public class StudyFormUtil { mapJcnr.put("新归属人","New Owner"); mapJcnr.put("原归属人","Old Owner"); - mapJcnr.put("填入值","todo"); - mapJcnr.put("填写人","todo"); - mapJcnr.put("意见回复","todo"); - mapJcnr.put("复核意见","todo"); + mapJcnr.put("填入值","填入值"); + mapJcnr.put("填写人","填写人"); + mapJcnr.put("意见回复","意见回复"); + mapJcnr.put("复核意见","复核意见"); //endregion //region 稽查名称 @@ -38,27 +38,27 @@ public class StudyFormUtil { mapQmyy.put("差","Bad"); mapQmyy.put("修改","Edit"); - mapQmyy.put("修改记录","todo"); - mapQmyy.put("填写","todo"); - mapQmyy.put("意见回复","todo"); - mapQmyy.put("复核意见","todo"); - mapQmyy.put("免复核通过","todo"); - mapQmyy.put("复核拒绝","todo"); - mapQmyy.put("复核通过","todo"); - mapQmyy.put("填写并提交记录","todo"); - mapQmyy.put("废止拒绝","todo"); - mapQmyy.put("废止通过","todo"); - mapQmyy.put("申请废止","todo"); - mapQmyy.put("开始现场复核","todo"); - mapQmyy.put("结束现场复核","todo"); - mapQmyy.put("申明协作","todo"); - mapQmyy.put("已审阅","todo"); - mapQmyy.put("审核通过","todo"); - mapQmyy.put("补充说明","todo"); - mapQmyy.put("审核拒绝","todo"); - mapQmyy.put("制作保存预制表单","todo"); - mapQmyy.put("制作提交预制表单","todo"); - mapQmyy.put("创建记录","todo"); + mapQmyy.put("修改记录","修改记录"); + mapQmyy.put("填写","填写"); + mapQmyy.put("意见回复","意见回复"); + mapQmyy.put("复核意见","复核意见"); + mapQmyy.put("免复核通过","免复核通过"); + mapQmyy.put("复核拒绝","复核拒绝"); + mapQmyy.put("复核通过","复核通过"); + mapQmyy.put("填写并提交记录","填写并提交记录"); + mapQmyy.put("废止拒绝","废止拒绝"); + mapQmyy.put("废止通过","废止通过"); + mapQmyy.put("申请废止","申请废止"); + mapQmyy.put("开始现场复核","开始现场复核"); + mapQmyy.put("结束现场复核","结束现场复核"); + mapQmyy.put("申明协作","申明协作"); + mapQmyy.put("已审阅","已审阅"); + mapQmyy.put("审核通过","审核通过"); + mapQmyy.put("补充说明","补充说明"); + mapQmyy.put("审核拒绝","审核拒绝"); + mapQmyy.put("制作保存预制表单","制作保存预制表单"); + mapQmyy.put("制作提交预制表单","制作提交预制表单"); + mapQmyy.put("创建记录","创建记录"); //endregion