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 79d431b..20d3d23 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 @@ -127,8 +127,7 @@ public class StudyFormFillController extends BaseController { "business:nonTrialFormFill:bj","business:nonTrialFormFill:xz", "business:drugFormFill:bj","business:drugFormFill:xz"}) public AjaxResult bc(@RequestBody StudyFormFill studyFormFill) { - studyFormFillService.bc(studyFormFill); - return AjaxResult.success("操作成功"); + return AjaxResult.success(studyFormFillService.bc(studyFormFill)); } @@ -195,38 +194,33 @@ public class StudyFormFillController extends BaseController { 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); + @PostMapping("/updateBdnr") + public AjaxResult updateBdnr(@RequestBody StudyFormFillUpdateForm form) { + studyFormFillService.updateBdnr(form); return AjaxResult.success("操作成功"); } + /** + * 保存字段勾选记录 + */ + @PostMapping("/updateZdgxjl") + public AjaxResult updateZdgxjl(@RequestBody StudyFormFillUpdateForm form) { + studyFormFillService.updateZdgxjl(form); + return AjaxResult.success("操作成功"); + } + + } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/Gyzj.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/Gyzj.java index b028e8f..00d78dd 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/Gyzj.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/Gyzj.java @@ -32,23 +32,23 @@ public class Gyzj extends MpBaseEntity private String bh; /** 浓度 */ - @Compare(name = "浓度") + @Compare(name = "浓度",nameEn = "Concentration") private String nd; /** 浓度单位 */ - @Compare(name = "浓度单位") + @Compare(name = "浓度单位",nameEn = "Concentration") private String nddw; /** 库存 */ - @Compare(name = "库存") + @Compare(name = "库存",nameEn = "Concentration") private String kc; /** 库存单位 */ - @Compare(name = "库存单位") + @Compare(name = "库存单位",nameEn = "Concentration") private String kcdw; /** 失效日期 */ - @Compare(name = "失效日期") + @Compare(name = "失效日期",nameEn = "Concentration") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date sxrq; diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/Mjy.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/Mjy.java index 56898b8..bcc6c5f 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/Mjy.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/Mjy.java @@ -34,7 +34,7 @@ public class Mjy extends MpBaseEntity private String nd; /** 浓度单位 */ - @Compare(name = "浓度单位",nameEn = "todo浓度单位") + @Compare(name = "浓度单位",nameEn = "todo") private String nddw; /** 库存 */ @@ -42,11 +42,11 @@ public class Mjy extends MpBaseEntity private String kc; /** 库存单位 */ - @Compare(name = "库存单位",nameEn = "todo库存单位") + @Compare(name = "库存单位",nameEn = "todo") private String kcdw; /** 失效日期 */ - @Compare(name = "失效日期",nameEn = "todo失效日期") + @Compare(name = "失效日期",nameEn = "todo") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date sxrq; 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 753c954..b9fd65d 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 @@ -31,11 +31,11 @@ public class StudyFormFill extends MpBaseEntity private String bdbh; /** 表单名称 */ - @Compare(name = "表单名称") + @Compare(name = "表单名称",nameEn = "Concentration") private String bdmc; /** 表单说明 */ - @Compare(name = "表单说明") + @Compare(name = "表单说明",nameEn = "Concentration") private String bdsm; /** 模板id */ @@ -79,6 +79,9 @@ public class StudyFormFill extends MpBaseEntity /** 复核意见记录 */ private String fhyjjl; + /** 字段勾选记录 */ + private String zdgxjl; + /** 填报开始时间 */ @Excel(name = "填报开始时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @@ -118,6 +121,14 @@ public class StudyFormFill extends MpBaseEntity @TableField(exist = false) private String studyMc; + public String getZdgxjl() { + return zdgxjl; + } + + public void setZdgxjl(String zdgxjl) { + this.zdgxjl = zdgxjl; + } + public String getZdxgjl() { return zdxgjl; } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudyFormFillJcgj.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudyFormFillJcgj.java index b4f1048..5a351b3 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudyFormFillJcgj.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudyFormFillJcgj.java @@ -24,18 +24,50 @@ public class StudyFormFillJcgj extends MpBaseEntity /** 稽查名称 */ private String jcmc; + /** 稽查名称-英文 */ + private String jcmcEn; + /** 稽查名称颜色：1：蓝色；3：红色；5：绿色；7：橙色 */ private Integer jcmcys; /** 稽查内容 */ private String jcnr; + /** 稽查内容-英文 */ + private String jcnrEn; + /** 签名人id */ private Long qmrId; /** 签名人名称 */ private String qmrMc; + /** 签名人名称-英文 */ + private String qmrMcEn; + + public String getJcmcEn() { + return jcmcEn; + } + + public void setJcmcEn(String jcmcEn) { + this.jcmcEn = jcmcEn; + } + + public String getJcnrEn() { + return jcnrEn; + } + + public void setJcnrEn(String jcnrEn) { + this.jcnrEn = jcnrEn; + } + + public String getQmrMcEn() { + return qmrMcEn; + } + + public void setQmrMcEn(String qmrMcEn) { + this.qmrMcEn = qmrMcEn; + } public void setFormId(Long formId) { diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudyFormFillQmxx.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudyFormFillQmxx.java index ba0d658..cb7a19c 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudyFormFillQmxx.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudyFormFillQmxx.java @@ -21,12 +21,33 @@ public class StudyFormFillQmxx extends MpBaseEntity /** 签名意义 */ private String qmyy; + /** 签名意义-英文 */ + private String qmyyEn; + /** 签名人id */ private Long qmrId; /** 签名人名称 */ private String qmrMc; + /** 签名人名称-英文 */ + private String qmrMcEn; + + public String getQmyyEn() { + return qmyyEn; + } + + public void setQmyyEn(String qmyyEn) { + this.qmyyEn = qmyyEn; + } + + public String getQmrMcEn() { + return qmrMcEn; + } + + public void setQmrMcEn(String qmrMcEn) { + this.qmrMcEn = qmrMcEn; + } public void setFormId(Long formId) { diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/BjForm.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/BjForm.java index 47818ff..4de7ea0 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/BjForm.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/BjForm.java @@ -1,6 +1,7 @@ package com.hxhq.business.form.gyzj; import com.fasterxml.jackson.annotation.JsonFormat; +import com.hxhq.common.core.annotation.Compare; import com.hxhq.common.core.annotation.Excel; import java.util.Date; @@ -14,36 +15,36 @@ public class BjForm { private Long id; /** 名称编辑 */ - @Excel(name = "名称") + @Compare(name = "名称",nameEn = "Name") private String mc; /** 浓度编辑 */ - @Excel(name = "浓度") + @Compare(name = "浓度",nameEn = "Concentration") private String nd; /** 浓度单位编辑 */ - @Excel(name = "浓度单位") + @Compare(name = "浓度单位",nameEn = "todo浓度单位") private String nddw; /** 库存编辑 */ - @Excel(name = "库存") + @Compare(name = "库存",nameEn = "Inventory") private String kc; /** 库存单位编辑 */ - @Excel(name = "库存单位") + @Compare(name = "库存单位",nameEn = "todo库存单位") private String kcdw; /** 失效日期编辑 */ - @Excel(name = "失效日期") + @Compare(name = "失效日期",nameEn = "todo失效日期") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date sxrq; /** 存储条件编辑 */ - @Excel(name = "存储条件") + @Compare(name = "存储条件",nameEn = "todo库存单位") private String cctj; /** 存储位置编辑 */ - @Excel(name = "存储位置") + @Compare(name = "存储位置",nameEn = "Storage Location") private String ccwz; /** 编辑备注 */ 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 index 7d748e4..cfb0af6 100644 --- 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 @@ -19,6 +19,39 @@ public class StudyFormFillUpdateForm { /** 复核意见记录 */ 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; } 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 8e325b3..22e3a4e 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 @@ -38,7 +38,7 @@ public interface StudyFormFillMapper extends BaseMapper * @param id * @param bdnr */ - void updateBdnr(@Param("id") Long id,@Param("bdnr") String bdnr); + void updateBdnr(@Param("id") Long id,@Param("bdnr") String bdnr,@Param("zdxgjl") String zdxgjl); /** * 更新复核意见 @@ -48,10 +48,10 @@ public interface StudyFormFillMapper extends BaseMapper void updateFhyjjl(@Param("id") Long id,@Param("fhyjjl") String fhyjjl); /** - * 更新字段修改记录 + * 更新字段勾选记录 * @param id - * @param zdxgjl + * @param zdgxjl */ - void updateZdxgjl(@Param("id") Long id,@Param("zdxgjl") String zdxgjl); + void updateZdgxjl(@Param("id") Long id,@Param("zdgxjl") String zdgxjl); } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IGyzjJcgjService.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IGyzjJcgjService.java index 63ef315..98cf19f 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IGyzjJcgjService.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IGyzjJcgjService.java @@ -47,6 +47,7 @@ public interface IGyzjJcgjService extends IService * @param remark 备注 */ public GyzjJcgj getJcgj(Long mjyId, Integer jcgjlx, String jcmc, Integer jcmcys, Map jcnr, SysUser qmr, String remark); + /** * 新增稽查轨迹 * @param mjyId 给药制剂id diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IStudyFormFillJcgjService.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IStudyFormFillJcgjService.java index a06b0b6..2f106a9 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IStudyFormFillJcgjService.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IStudyFormFillJcgjService.java @@ -1,9 +1,14 @@ package com.hxhq.business.service; +import java.util.Date; import java.util.List; +import java.util.Map; + +import com.hxhq.business.domain.GyzjJcgj; import com.hxhq.business.domain.StudyFormFillJcgj; import com.baomidou.mybatisplus.extension.service.IService; import com.hxhq.business.domain.StudyFormPreJcgj; +import com.hxhq.system.api.domain.SysUser; /** * 试验-填报单-稽查轨迹Service接口 @@ -23,13 +28,40 @@ public interface IStudyFormFillJcgjService extends IService /** * 新增稽查轨迹 - * @param formId 记录id + * @param formId 表单id + * @param jcgjlx 稽查轨迹类型:1:流程；3：编辑 + * @param jcmc 稽查名称 + * @param jcmcys 稽查名称颜色：1：蓝色；3：红色；5：绿色；7：橙色 + * @param jcnr 稽查内容 + * @param qmr 签名人 + * @param remark 备注 + * @param time 时间 + */ + public void saveJcgj(Long formId, Integer jcgjlx, String jcmc, Integer jcmcys, Map jcnr, SysUser qmr, String remark, Date time); + + /** + * 新增稽查轨迹 + * @param formId 表单id * @param jcgjlx 稽查轨迹类型:1:流程；3：编辑 * @param jcmc 稽查名称 * @param jcmcys 稽查名称颜色：1：蓝色；3：红色；5：绿色；7：橙色 * @param jcnr 稽查内容 - * @param jcrId 稽查人id - * @param jcrMc 稽查人名称 + * @param qmr 签名人 + * @param remark 备注 */ - public void saveJcgj(Long formId, Integer jcgjlx, String jcmc, Integer jcmcys, String jcnr,Long jcrId,String jcrMc); + public StudyFormFillJcgj getJcgj(Long formId, Integer jcgjlx, String jcmc, Integer jcmcys, Map jcnr, SysUser qmr, String remark); + + /** + * 新增稽查轨迹 + * @param formId 表单id + * @param jcgjlx 稽查轨迹类型:1:流程；3：编辑 + * @param jcmc 稽查名称 + * @param jcmcys 稽查名称颜色：1：蓝色；3：红色；5：绿色；7：橙色 + * @param jcnr 稽查内容 + * @param jcnrEn 稽查内容英文 + * @param qmr 签名人 + * @param remark 备注 + */ + public StudyFormFillJcgj getJcgj(Long formId, Integer jcgjlx, String jcmc, Integer jcmcys, String jcnr, String jcnrEn, SysUser qmr, String remark); + } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IStudyFormFillQmxxService.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IStudyFormFillQmxxService.java index e6ae4c5..10e2f12 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IStudyFormFillQmxxService.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IStudyFormFillQmxxService.java @@ -4,6 +4,7 @@ import java.util.List; import com.hxhq.business.domain.StudyFormFillQmxx; import com.baomidou.mybatisplus.extension.service.IService; import com.hxhq.business.domain.StudyFormPreQmxx; +import com.hxhq.system.api.domain.SysUser; /** * 试验-填报单-签名信息Service接口 @@ -26,9 +27,8 @@ public interface IStudyFormFillQmxxService extends IService * 新增签名信息 * @param formId * @param qmyy - * @param qmrId - * @param qmrMc + * @param qmr * @param remark */ - public void saveQmxx(Long formId, String qmyy, Long qmrId, String qmrMc,String remark); + public void saveQmxx(Long formId, String qmyy, SysUser qmr, String remark); } 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 150bb8c..6972588 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 @@ -68,7 +68,7 @@ public interface IStudyFormFillService extends IService * 保存 * @param studyFormFill */ - public void bc(StudyFormFill studyFormFill); + public StudyFormFill bc(StudyFormFill studyFormFill); /** @@ -121,8 +121,8 @@ public interface IStudyFormFillService extends IService public void updateFhyjjl(StudyFormFillUpdateForm form); /** - * 更新字段修改记录 + * 更新字段勾选记录 */ - public void updateZdxgjl(StudyFormFillUpdateForm form); + public void updateZdgxjl(StudyFormFillUpdateForm form); } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GyzjServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GyzjServiceImpl.java index e37acb9..ea5c82d 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GyzjServiceImpl.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GyzjServiceImpl.java @@ -1054,8 +1054,8 @@ public class GyzjServiceImpl extends ServiceImpl implements IG @Override @Transactional(rollbackFor = Exception.class) public void sqrk(RkForm form) { - SysUser qmr1 = sysUserService.selectUserById(form.getQmr1Id()); - SysUser qmr2 = sysUserService.selectUserById(form.getQmr1Id()); + SysUser qmr1 = SecurityUtils.getLoginUser().getSysUser(); + SysUser qmr2 = sysUserService.selectUserById(form.getQmr2Id()); //验证签名人1密码 checkPassword(qmr1,form.getQmr1mm()); //验证签名人2密码 @@ -1068,7 +1068,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG if (gyzjOld == null) { throw new ServiceException("给药制剂不存在或已删除"); } - if (!gyzjOld.getZjzt().equals(ZjztEnum.yff.getValue())) { + if (!gyzjOld.getZjzt().equals(ZjztEnum.wrk.getValue())) { throw new ServiceException("给药制剂【" + gyzjOld.getMc() + "】不是已发放状态，不能归还"); } if (!gyzjOld.getGhzt().equals(GhztEnum.wsq.getValue())) { @@ -1131,17 +1131,18 @@ public class GyzjServiceImpl extends ServiceImpl implements IG formData.put("申请备注", gyzjOld.getRkbz()); formData.put("审核备注", form.getRemark()); if (form.getQmyy().equals(ShXgkcEnum.ty.getValue())) { + SysUser qmr1 = sysUserService.selectUserById(form.getQmr1Id()); + SysUser qmr2 = sysUserService.selectUserById(form.getQmr2Id()); gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "同意入库", JcmcysEnum.green.getValue(), formData, SecurityUtils.getLoginUser().getSysUser(),null); gyzjOld.setKc(form.getRkl()); gyzjOld.setZjzt(ZjztEnum.rk.getValue()); + //台账 + gyzjTzService.saveTz(gyzjOld.getId(),null,null,qmr1,qmr2,null,null,jsr1,jsr2,null,"给药制剂入库",form.getRkl(),gyzjOld.getKcdw(),form.getRemark()); } else { gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "拒绝入库", JcmcysEnum.red.getValue(), formData, SecurityUtils.getLoginUser().getSysUser(),null); } - //台账 - gyzjTzService.saveTz(gyzjOld.getId(),null,null,null,null,null,null,null,null,null,"给药制剂入库",form.getRkl(),gyzjOld.getKcdw(),form.getRemark()); - // 更新 - gyzjOld.setGhzytj(null); + gyzjOld.setRkzytj(null); gyzjOld.setRkwz(null); gyzjOld.setRktj(null); gyzjOld.setQmr1Id(null); diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormFillJcgjServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormFillJcgjServiceImpl.java index fd16d0e..156b0b1 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormFillJcgjServiceImpl.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormFillJcgjServiceImpl.java @@ -1,12 +1,20 @@ package com.hxhq.business.service.impl; +import java.util.Date; import java.util.List; +import java.util.Map; + import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.hxhq.business.domain.GyzjJcgj; import com.hxhq.business.domain.StudyFormPreJcgj; +import com.hxhq.business.utils.StudyFormUtil; +import com.hxhq.business.utils.JctUtil; +import com.hxhq.business.utils.StudyFormUtil; import com.hxhq.common.core.exception.ServiceException; import com.hxhq.common.core.utils.DateUtils; import com.hxhq.common.core.utils.StringUtils; +import com.hxhq.system.api.domain.SysUser; import org.springframework.stereotype.Service; import com.hxhq.business.mapper.StudyFormFillJcgjMapper; import com.hxhq.business.domain.StudyFormFillJcgj; @@ -48,25 +56,99 @@ public class StudyFormFillJcgjServiceImpl extends ServiceImpl jcnr, SysUser qmr, String remark, Date time){ + StudyFormFillJcgj formJcgj = new StudyFormFillJcgj(); + formJcgj.setFormId(formId); + formJcgj.setJcgjlx(jcgjlx); + formJcgj.setJcmc(jcmc); + formJcgj.setJcmcEn(StudyFormUtil.getQmyyEn(jcmc)); + formJcgj.setJcmcys(jcmcys); + if(jcnr!=null){ + formJcgj.setJcnr(JctUtil.formatStr(jcnr)); + formJcgj.setJcnrEn(StudyFormUtil.getJcnrEn(jcnr)); + } + if(qmr!=null){ + formJcgj.setQmrId(qmr.getUserId()); + formJcgj.setQmrMc(qmr.getNickName()); + formJcgj.setQmrMcEn(qmr.getUserName()); + } + if(time!=null){ + formJcgj.setCreateTime(time); + } + formJcgj.setRemark(remark); + this.save(formJcgj); + } + + + /** + * 新增稽查轨迹 + * @param formId 表单id + * @param jcgjlx 稽查轨迹类型:1:流程；3：编辑 + * @param jcmc 稽查名称 + * @param jcmcys 稽查名称颜色：1：蓝色；3：红色；5：绿色；7：橙色 + * @param jcnr 稽查内容 + * @param qmr 签名人 + * @param remark 备注 + */ + @Override + public StudyFormFillJcgj getJcgj(Long formId, Integer jcgjlx, String jcmc, Integer jcmcys, Map jcnr, SysUser qmr, String remark){ + StudyFormFillJcgj formJcgj = new StudyFormFillJcgj(); + formJcgj.setFormId(formId); + formJcgj.setJcgjlx(jcgjlx); + formJcgj.setJcmc(jcmc); + formJcgj.setJcmcEn(StudyFormUtil.getQmyyEn(jcmc)); + formJcgj.setJcmcys(jcmcys); + if(jcnr!=null){ + formJcgj.setJcnr(JctUtil.formatStr(jcnr)); + formJcgj.setJcnrEn(StudyFormUtil.getJcnrEn(jcnr)); + } + if(qmr!=null) { + formJcgj.setQmrId(qmr.getUserId()); + formJcgj.setQmrMc(qmr.getNickName()); + formJcgj.setQmrMcEn(qmr.getUserName()); + } + formJcgj.setRemark(remark); + return formJcgj; + } + + /** + * 新增稽查轨迹 + * @param formId 表单id * @param jcgjlx 稽查轨迹类型:1:流程；3：编辑 * @param jcmc 稽查名称 * @param jcmcys 稽查名称颜色：1：蓝色；3：红色；5：绿色；7：橙色 * @param jcnr 稽查内容 - * @param jcrId 稽查人id - * @param jcrMc 稽查人名称 + * @param jcnrEn 稽查内容英文 + * @param qmr 签名人 + * @param remark 备注 */ @Override - public void saveJcgj(Long formId, Integer jcgjlx, String jcmc, Integer jcmcys, String jcnr,Long jcrId,String jcrMc){ - StudyFormFillJcgj studyFormFillJcgj = new StudyFormFillJcgj(); - studyFormFillJcgj.setFormId(formId); - studyFormFillJcgj.setJcgjlx(jcgjlx); - studyFormFillJcgj.setJcmc(jcmc); - studyFormFillJcgj.setJcmcys(jcmcys); - studyFormFillJcgj.setJcnr(jcnr); - studyFormFillJcgj.setQmrId(jcrId); - studyFormFillJcgj.setQmrMc(jcrMc); - this.save(studyFormFillJcgj); + public StudyFormFillJcgj getJcgj(Long formId, Integer jcgjlx, String jcmc, Integer jcmcys, String jcnr,String jcnrEn, SysUser qmr, String remark){ + StudyFormFillJcgj formJcgj = new StudyFormFillJcgj(); + formJcgj.setFormId(formId); + formJcgj.setJcgjlx(jcgjlx); + formJcgj.setJcmc(jcmc); + formJcgj.setJcmcEn(StudyFormUtil.getQmyyEn(jcmc)); + formJcgj.setJcmcys(jcmcys); + formJcgj.setJcnr(jcnr); + formJcgj.setJcnrEn(jcnrEn); + if(qmr!=null) { + formJcgj.setQmrId(qmr.getUserId()); + formJcgj.setQmrMc(qmr.getNickName()); + formJcgj.setQmrMcEn(qmr.getUserName()); + } + formJcgj.setRemark(remark); + return formJcgj; } } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormFillQmxxServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormFillQmxxServiceImpl.java index a6b9ef7..08b3ed7 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormFillQmxxServiceImpl.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormFillQmxxServiceImpl.java @@ -4,8 +4,10 @@ import java.util.List; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.hxhq.business.domain.StudyFormPreQmxx; +import com.hxhq.business.utils.StudyFormUtil; import com.hxhq.common.core.exception.ServiceException; import com.hxhq.common.core.utils.DateUtils; +import com.hxhq.system.api.domain.SysUser; import org.springframework.stereotype.Service; import com.hxhq.business.mapper.StudyFormFillQmxxMapper; import com.hxhq.business.domain.StudyFormFillQmxx; @@ -44,17 +46,18 @@ public class StudyFormFillQmxxServiceImpl extends ServiceImpl formData = new LinkedHashMap<>(); - formData.put("备注", studyFormFill.getRemark()); - studyFormFillJcgjService.saveJcgj(studyFormFillOld.getId(), JcgjlxEnum.bj.getValue(), studyFormFill.getQmyy(), JcmcysEnum.orange.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName()); + studyFormFillJcgjService.saveJcgj(studyFormFillOld.getId(), JcgjlxEnum.bj.getValue(), studyFormFill.getQmyy(), JcmcysEnum.orange.getValue(), null, SecurityUtils.getLoginUser().getSysUser(), studyFormFill.getRemark(),null); //签名信息 - studyFormFillQmxxService.saveQmxx(studyFormFill.getId(), studyFormFill.getQmyy(), SecurityUtils.getUserId(), SecurityUtils.getNickName(), studyFormFill.getRemark()); + studyFormFillQmxxService.saveQmxx(studyFormFill.getId(), studyFormFill.getQmyy(),qmr, studyFormFill.getRemark()); } @@ -147,8 +147,9 @@ public class StudyFormFillServiceImpl extends ServiceImpl formData = new LinkedHashMap<>(); - formData.put("备注", studyFormFill.getRemark()); - studyFormFillJcgjService.saveJcgj(studyFormFillOld.getId(), JcgjlxEnum.lc.getValue(), "申请废止", JcmcysEnum.orange.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName()); + studyFormFillJcgjService.saveJcgj(studyFormFillOld.getId(), JcgjlxEnum.lc.getValue(), "申请废止", JcmcysEnum.orange.getValue(), null, SecurityUtils.getLoginUser().getSysUser(), null,null); //签名信息 - studyFormFillQmxxService.saveQmxx(studyFormFill.getId(), "申请废止", SecurityUtils.getUserId(), SecurityUtils.getNickName(), studyFormFill.getRemark()); + studyFormFillQmxxService.saveQmxx(studyFormFill.getId(), "申请废止", qmr, studyFormFill.getRemark()); } @@ -178,8 +177,9 @@ public class StudyFormFillServiceImpl extends ServiceImpl formData = new LinkedHashMap<>(); formData.put("原因", form.getRemark()); - studyFormFillJcgjService.saveJcgj(studyFormFillOld.getId(), JcgjlxEnum.lc.getValue(), "废止通过", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName()); + studyFormFillJcgjService.saveJcgj(studyFormFillOld.getId(), JcgjlxEnum.lc.getValue(), "废止通过", JcmcysEnum.green.getValue(), formData, SecurityUtils.getLoginUser().getSysUser(), null,null); //签名信息 - studyFormFillQmxxService.saveQmxx(studyFormFillOld.getId(), "废止通过", SecurityUtils.getUserId(), SecurityUtils.getNickName(), form.getRemark()); + studyFormFillQmxxService.saveQmxx(studyFormFillOld.getId(), "废止通过", qmr, form.getRemark()); } else { studyFormFillOld.setBdzt(StudyFormFillBdztEnum.tbz.getValue()); @@ -206,9 +206,9 @@ public class StudyFormFillServiceImpl extends ServiceImpl formData = new LinkedHashMap<>(); formData.put("原因", form.getRemark()); - studyFormFillJcgjService.saveJcgj(studyFormFillOld.getId(), JcgjlxEnum.lc.getValue(), "废止拒绝", JcmcysEnum.red.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName()); + studyFormFillJcgjService.saveJcgj(studyFormFillOld.getId(), JcgjlxEnum.lc.getValue(), "废止拒绝", JcmcysEnum.red.getValue(), formData, SecurityUtils.getLoginUser().getSysUser(), null,null); //签名信息 - studyFormFillQmxxService.saveQmxx(studyFormFillOld.getId(), "废止拒绝", SecurityUtils.getUserId(), SecurityUtils.getNickName(), form.getRemark()); + studyFormFillQmxxService.saveQmxx(studyFormFillOld.getId(), "废止拒绝", qmr, form.getRemark()); } @@ -222,8 +222,9 @@ public class StudyFormFillServiceImpl extends ServiceImpl fieldChanges = ObjectCompareUtil.compareObjects(studyFormFillOld, studyFormFill); if (fieldChanges.size() > 0) { //稽查轨迹 List studyFormFillJcgjs = new ArrayList<>(); for (ObjectCompareUtil.FieldChange fieldChange : fieldChanges) { - StudyFormFillJcgj studyFormFillJcgj = new StudyFormFillJcgj(); - studyFormFillJcgj.setFormId(studyFormFill.getId()); - studyFormFillJcgj.setJcgjlx(JcgjlxEnum.xg.getValue()); - studyFormFillJcgj.setJcmc("修改"); - studyFormFillJcgj.setJcmcys(JcmcysEnum.orange.getValue()); - studyFormFillJcgj.setJcnr(fieldChange.toString()); - studyFormFillJcgj.setQmrId(SecurityUtils.getUserId()); - studyFormFillJcgj.setQmrMc(SecurityUtils.getNickName()); - studyFormFillJcgjs.add(studyFormFillJcgj); + studyFormFillJcgjs.add(studyFormFillJcgjService.getJcgj(studyFormFillOld.getId(), JcgjlxEnum.xg.getValue(), "修改", JcmcysEnum.orange.getValue(), fieldChange.toString(), fieldChange.toEnString(), SecurityUtils.getLoginUser().getSysUser(), studyFormFill.getRemark())); } studyFormFillJcgjService.saveBatch(studyFormFillJcgjs); } - //稽查轨迹 - Map formData = new LinkedHashMap<>(); - formData.put("备注", studyFormFill.getRemark()); - studyFormFillJcgjService.saveJcgj(studyFormFillOld.getId(), JcgjlxEnum.lc.getValue(), "填写并保存记录", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName()); + studyFormFillJcgjService.saveJcgj(studyFormFillOld.getId(), JcgjlxEnum.lc.getValue(), "填写并提交记录", JcmcysEnum.green.getValue(), null, SecurityUtils.getLoginUser().getSysUser(), studyFormFill.getRemark(),null ); } else { studyFormFill.setBdzt(StudyFormFillBdztEnum.tbz.getValue()); studyFormFill.setUserId(SecurityUtils.getUserId()); studyFormFill.setStartDate(new Date()); studyFormFill.setUserMc(SecurityUtils.getNickName()); this.save(studyFormFill); - + result = studyFormFill; //稽查轨迹 - Map formData = new LinkedHashMap<>(); - formData.put("备注", studyFormFill.getRemark()); - studyFormFillJcgjService.saveJcgj(studyFormFill.getId(), JcgjlxEnum.lc.getValue(), "填写并保存记录", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName()); + studyFormFillJcgjService.saveJcgj(studyFormFill.getId(), JcgjlxEnum.lc.getValue(), "填写并提交记录", JcmcysEnum.green.getValue(), null, SecurityUtils.getLoginUser().getSysUser(), studyFormFill.getRemark(),null ); } //签名信息 - studyFormFillQmxxService.saveQmxx(studyFormFill.getId(), "填写并保存记录", SecurityUtils.getUserId(), SecurityUtils.getNickName(), studyFormFill.getRemark()); - + studyFormFillQmxxService.saveQmxx(studyFormFill.getId(), "填写并保存记录", qmr, studyFormFill.getRemark()); + return result; } @@ -318,6 +308,7 @@ public class StudyFormFillServiceImpl extends ServiceImpl studyFormFillJcgjs = new ArrayList<>(); for (ObjectCompareUtil.FieldChange fieldChange : fieldChanges) { - StudyFormFillJcgj studyFormFillJcgj = new StudyFormFillJcgj(); - studyFormFillJcgj.setFormId(studyFormFill.getId()); - studyFormFillJcgj.setJcgjlx(JcgjlxEnum.xg.getValue()); - studyFormFillJcgj.setJcmc("修改"); - studyFormFillJcgj.setJcmcys(JcmcysEnum.orange.getValue()); - studyFormFillJcgj.setJcnr(fieldChange.toString()); - studyFormFillJcgj.setQmrId(SecurityUtils.getUserId()); - studyFormFillJcgj.setQmrMc(SecurityUtils.getNickName()); - studyFormFillJcgjs.add(studyFormFillJcgj); + studyFormFillJcgjs.add(studyFormFillJcgjService.getJcgj(studyFormFillOld.getId(), JcgjlxEnum.xg.getValue(), "修改", JcmcysEnum.orange.getValue(), fieldChange.toString(), fieldChange.toEnString(), SecurityUtils.getLoginUser().getSysUser(), studyFormFill.getRemark())); } studyFormFillJcgjService.saveBatch(studyFormFillJcgjs); } //稽查轨迹 - Map formData = new LinkedHashMap<>(); - formData.put("备注", studyFormFill.getRemark()); - studyFormFillJcgjService.saveJcgj(studyFormFill.getId(), JcgjlxEnum.lc.getValue(), "填写并提交记录", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName()); + studyFormFillJcgjService.saveJcgj(studyFormFillOld.getId(), JcgjlxEnum.lc.getValue(), "填写并提交记录", JcmcysEnum.green.getValue(), null, SecurityUtils.getLoginUser().getSysUser(), studyFormFill.getRemark(),null ); } else { studyFormFill.setBdzt(StudyFormFillBdztEnum.ytj.getValue()); studyFormFill.setUserId(SecurityUtils.getUserId()); @@ -365,20 +346,19 @@ public class StudyFormFillServiceImpl extends ServiceImpl formData = new LinkedHashMap<>(); - formData.put("备注", studyFormFill.getRemark()); - studyFormFillJcgjService.saveJcgj(studyFormFill.getId(), JcgjlxEnum.lc.getValue(), "填写并提交记录", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName()); + studyFormFillJcgjService.saveJcgj(studyFormFill.getId(), JcgjlxEnum.lc.getValue(), "填写并提交记录", JcmcysEnum.green.getValue(), null, SecurityUtils.getLoginUser().getSysUser(), studyFormFill.getRemark(),null ); } //签名信息 - studyFormFillQmxxService.saveQmxx(studyFormFill.getId(), "填写并提交记录", SecurityUtils.getUserId(), SecurityUtils.getNickName(), studyFormFill.getRemark()); + studyFormFillQmxxService.saveQmxx(studyFormFill.getId(), "填写并提交记录", qmr, studyFormFill.getRemark()); } /** * 生成物资 + * * @param studyFormFill */ - public void genResource(StudyFormFill studyFormFill){ + public void genResource(StudyFormFill studyFormFill) { Template template = templateService.getById(studyFormFill.getTemplateId()); // todo 处置，存放，用量 if (template.getProduct().equals(ProductEnum.Sj.getValue())) { @@ -402,8 +382,9 @@ public class StudyFormFillServiceImpl extends ServiceImpl formData = new LinkedHashMap<>(); formData.put("生长情况", form.getQmyy()); - formData.put("备注", form.getRemark()); - studyFormFillJcgjService.saveJcgj(studyFormFillOld.getId(), JcgjlxEnum.lc.getValue(), form.getQmyy(), JcmcysEnum.orange.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName()); + 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(), SecurityUtils.getUserId(), SecurityUtils.getNickName(), form.getRemark()); + studyFormFillQmxxService.saveQmxx(studyFormFillOld.getId(), form.getQmyy(), qmr, form.getRemark()); } @@ -432,8 +412,9 @@ public class StudyFormFillServiceImpl extends ServiceImpl formData = new LinkedHashMap<>(); - formData.put("备注", studyFormFill.getRemark()); - studyFormFillJcgjService.saveJcgj(studyFormFillOld.getId(), JcgjlxEnum.lc.getValue(), "复核通过", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName()); + studyFormFillJcgjService.saveJcgj(studyFormFillOld.getId(), JcgjlxEnum.lc.getValue(), "复核通过", JcmcysEnum.green.getValue(), null, SecurityUtils.getLoginUser().getSysUser(), studyFormFill.getRemark(),null ); //签名信息 - studyFormFillQmxxService.saveQmxx(studyFormFillOld.getId(), "复核通过", SecurityUtils.getUserId(), SecurityUtils.getNickName(), studyFormFill.getRemark()); + studyFormFillQmxxService.saveQmxx(studyFormFillOld.getId(), "复核通过", qmr, studyFormFill.getRemark()); } @@ -463,8 +442,9 @@ public class StudyFormFillServiceImpl extends ServiceImpl formData = new LinkedHashMap<>(); formData.put("原因", studyFormFill.getRemark()); - studyFormFillJcgjService.saveJcgj(studyFormFillOld.getId(), JcgjlxEnum.lc.getValue(), "复核拒绝", JcmcysEnum.red.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName()); + studyFormFillJcgjService.saveJcgj(studyFormFillOld.getId(), JcgjlxEnum.lc.getValue(), "复核拒绝", JcmcysEnum.red.getValue(), null, SecurityUtils.getLoginUser().getSysUser(), null,null ); + //签名信息 - studyFormFillQmxxService.saveQmxx(studyFormFillOld.getId(), "复核拒绝", SecurityUtils.getUserId(), SecurityUtils.getNickName(), studyFormFill.getRemark()); + studyFormFillQmxxService.saveQmxx(studyFormFillOld.getId(), "复核拒绝", qmr, studyFormFill.getRemark()); } @@ -494,8 +475,9 @@ public class StudyFormFillServiceImpl extends ServiceImpl formData = new LinkedHashMap<>(); formData.put("原因", studyFormFill.getRemark()); - studyFormFillJcgjService.saveJcgj(studyFormFillOld.getId(), JcgjlxEnum.lc.getValue(), "免复核通过", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName()); + studyFormFillJcgjService.saveJcgj(studyFormFillOld.getId(), JcgjlxEnum.lc.getValue(), "免复核通过", JcmcysEnum.green.getValue(), null, SecurityUtils.getLoginUser().getSysUser(), null,null ); + //签名信息 - studyFormFillQmxxService.saveQmxx(studyFormFillOld.getId(), "免复核通过", SecurityUtils.getUserId(), SecurityUtils.getNickName(), studyFormFill.getRemark()); + studyFormFillQmxxService.saveQmxx(studyFormFillOld.getId(), "免复核通过", qmr, studyFormFill.getRemark()); } @@ -525,8 +508,9 @@ public class StudyFormFillServiceImpl extends ServiceImpl formData = new LinkedHashMap<>(); - formData.put("备注", studyFormFill.getRemark()); - studyFormFillJcgjService.saveJcgj(studyFormFillOld.getId(), JcgjlxEnum.lc.getValue(), "已审阅", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName()); + studyFormFillJcgjService.saveJcgj(studyFormFillOld.getId(), JcgjlxEnum.lc.getValue(), "已审阅", JcmcysEnum.green.getValue(), null, SecurityUtils.getLoginUser().getSysUser(), studyFormFill.getRemark(),null ); //签名信息 - studyFormFillQmxxService.saveQmxx(studyFormFillOld.getId(), "已审阅", SecurityUtils.getUserId(), SecurityUtils.getNickName(), studyFormFill.getRemark()); + studyFormFillQmxxService.saveQmxx(studyFormFillOld.getId(), "已审阅", qmr, studyFormFill.getRemark()); } @@ -566,7 +548,24 @@ public class StudyFormFillServiceImpl extends ServiceImpl formData = new LinkedHashMap<>(); + if(StringUtils.isNoneBlank(jsonObject.getString("oldValue"))){ + formData.put("字段名", jsonObject.getString("field")); + formData.put("原值", jsonObject.getString("oldValue")); + formData.put("新值", jsonObject.getString("value")); + formData.put("原因", "todo"); + studyFormFillJcgjService.saveJcgj(form.getId(), JcgjlxEnum.lc.getValue(), "修改记录", JcmcysEnum.green.getValue(), formData, SecurityUtils.getLoginUser().getSysUser(),null,jsonObject.getDate("time")); + }else{ + formData.put("字段名", jsonObject.getString("field")); + formData.put("填入值", jsonObject.getString("value")); + formData.put("填写人", SecurityUtils.getNickName()); + studyFormFillJcgjService.saveJcgj(form.getId(), JcgjlxEnum.lc.getValue(), "填写", JcmcysEnum.green.getValue(), formData, null ,null,jsonObject.getDate("time")); + } } /** @@ -574,16 +573,31 @@ public class StudyFormFillServiceImpl extends ServiceImpl formData = new LinkedHashMap<>(); + if(StringUtils.isNoneBlank(form.getContent())){ + JSONObject jsonObject=JSONObject.parseObject(form.getContent()); + formData.put("字段名", jsonObject.getString("field")); + formData.put("意见回复", jsonObject.getString("content")); + studyFormFillJcgjService.saveJcgj(form.getId(), JcgjlxEnum.lc.getValue(), "意见回复", JcmcysEnum.blue.getValue(), formData, SecurityUtils.getLoginUser().getSysUser(), null,jsonObject.getDate("time")); + }else{ + JSONObject jsonObject=JSONObject.parseObject(form.getReplay()); + formData.put("字段名", jsonObject.getString("field")); + formData.put("复核意见", jsonObject.getString("content")); + studyFormFillJcgjService.saveJcgj(form.getId(), JcgjlxEnum.lc.getValue(), "复核意见", JcmcysEnum.blue.getValue(), formData, SecurityUtils.getLoginUser().getSysUser(), null,jsonObject.getDate("time")); + } } /** - * 更新字段修改记录 + * 更新字段勾选记录 */ @Override - public void updateZdxgjl(StudyFormFillUpdateForm form) { - baseMapper.updateZdxgjl(form.getId(), form.getZdxgjl()); - //新增稽查轨迹 todo + public void updateZdgxjl(StudyFormFillUpdateForm form) { + //更新勾选记录 + 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 1eedca2..6fce5f1 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 @@ -17,61 +17,61 @@ public class GyzjJcnrUtil { static { //region 稽查内容 - mapJcnr.put("借阅开始时间","todo借阅开始时间"); - mapJcnr.put("借阅结束时间","todo借阅结束时间"); - mapJcnr.put("处置方式","todo处置方式"); - mapJcnr.put("处置原因","todo处置原因"); - mapJcnr.put("处置量","todo处置量"); - mapJcnr.put("处置人","todo处置人"); - mapJcnr.put("复核人","todo复核人"); - mapJcnr.put("监督人","todo监督人"); - mapJcnr.put("钥匙1领取人","todo钥匙1领取人"); - mapJcnr.put("钥匙2领取人","todo钥匙2领取人"); - mapJcnr.put("发放人","todo发放人"); - mapJcnr.put("出库量","todo出库量"); - mapJcnr.put("转移条件","todo转移条件"); - mapJcnr.put("出库毛重","todo出库毛重"); - mapJcnr.put("目的","todo目的"); - mapJcnr.put("申请备注","todo申请备注"); - mapJcnr.put("审核备注","todo审核备注"); - mapJcnr.put("入库位置","todo入库位置"); - mapJcnr.put("入库条件","todo入库条件"); - mapJcnr.put("入库量","todo入库量"); - mapJcnr.put("入库毛重","todo入库毛重"); - mapJcnr.put("使用量","todo使用量"); - mapJcnr.put("归还人1","todo归还人1"); - mapJcnr.put("归还人2","todo归还人2"); - mapJcnr.put("库管员1","todo库管员1"); - mapJcnr.put("库管员2","todo库管员2"); - mapJcnr.put("入库净重","todo入库净重"); - mapJcnr.put("签名人1","todo签名人1"); - mapJcnr.put("签名人2","todo签名人2"); + mapJcnr.put("借阅开始时间","todo"); + mapJcnr.put("借阅结束时间","todo"); + mapJcnr.put("处置方式","todo"); + mapJcnr.put("处置原因","todo"); + mapJcnr.put("处置量","todo"); + mapJcnr.put("处置人","todo"); + mapJcnr.put("复核人","todo"); + mapJcnr.put("监督人","todo"); + mapJcnr.put("钥匙1领取人","todo"); + mapJcnr.put("钥匙2领取人","todo"); + mapJcnr.put("发放人","todo"); + mapJcnr.put("出库量","todo"); + mapJcnr.put("转移条件","todo"); + mapJcnr.put("出库毛重","todo"); + mapJcnr.put("目的","todo"); + mapJcnr.put("申请备注","todo"); + mapJcnr.put("审核备注","todo"); + mapJcnr.put("入库位置","todo"); + mapJcnr.put("入库条件","todo"); + mapJcnr.put("入库量","todo"); + mapJcnr.put("入库毛重","todo"); + mapJcnr.put("使用量","todo"); + mapJcnr.put("归还人1","todo"); + mapJcnr.put("归还人2","todo"); + mapJcnr.put("库管员1","todo"); + mapJcnr.put("库管员2","todo"); + mapJcnr.put("入库净重","todo"); + mapJcnr.put("签名人1","todo"); + mapJcnr.put("签名人2","todo"); //endregion //region 稽查名称 - 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("拒绝入库","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("同意入库","todo"); + mapQmyy.put("拒绝入库","todo"); 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 73869e8..0ca8a59 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 @@ -18,58 +18,58 @@ public class MjyJcnrUtil { static { //region 稽查内容 - mapJcnr.put("借阅开始时间","todo借阅开始时间"); - mapJcnr.put("借阅结束时间","todo借阅结束时间"); - mapJcnr.put("处置方式","todo处置方式"); - mapJcnr.put("处置原因","todo处置原因"); - mapJcnr.put("处置量","todo处置量"); - mapJcnr.put("处置人","todo处置人"); - mapJcnr.put("复核人","todo复核人"); - mapJcnr.put("监督人","todo监督人"); - mapJcnr.put("钥匙1领取人","todo钥匙1领取人"); - mapJcnr.put("钥匙2领取人","todo钥匙2领取人"); - mapJcnr.put("发放人","todo发放人"); - mapJcnr.put("出库量","todo出库量"); - mapJcnr.put("转移条件","todo转移条件"); - mapJcnr.put("出库毛重","todo出库毛重"); - mapJcnr.put("目的","todo目的"); - mapJcnr.put("申请备注","todo申请备注"); - mapJcnr.put("审核备注","todo审核备注"); - mapJcnr.put("入库位置","todo入库位置"); - mapJcnr.put("入库条件","todo入库条件"); - mapJcnr.put("减少量","todo减少量"); - mapJcnr.put("入库毛重","todo入库毛重"); - mapJcnr.put("使用量","todo使用量"); - mapJcnr.put("归还人1","todo归还人1"); - mapJcnr.put("归还人2","todo归还人2"); - mapJcnr.put("库管员1","todo库管员1"); - mapJcnr.put("库管员2","todo库管员2"); - mapJcnr.put("签名人1","todo签名人1"); - mapJcnr.put("签名人2","todo签名人2"); + mapJcnr.put("借阅开始时间","todo"); + mapJcnr.put("借阅结束时间","todo"); + mapJcnr.put("处置方式","todo"); + mapJcnr.put("处置原因","todo"); + mapJcnr.put("处置量","todo"); + mapJcnr.put("处置人","todo"); + mapJcnr.put("复核人","todo"); + mapJcnr.put("监督人","todo"); + mapJcnr.put("钥匙1领取人","todo"); + mapJcnr.put("钥匙2领取人","todo"); + mapJcnr.put("发放人","todo"); + mapJcnr.put("出库量","todo"); + mapJcnr.put("转移条件","todo"); + mapJcnr.put("出库毛重","todo"); + mapJcnr.put("目的","todo"); + mapJcnr.put("申请备注","todo"); + mapJcnr.put("审核备注","todo"); + mapJcnr.put("入库位置","todo"); + mapJcnr.put("入库条件","todo"); + mapJcnr.put("减少量","todo"); + mapJcnr.put("入库毛重","todo"); + mapJcnr.put("使用量","todo"); + mapJcnr.put("归还人1","todo"); + mapJcnr.put("归还人2","todo"); + mapJcnr.put("库管员1","todo"); + mapJcnr.put("库管员2","todo"); + mapJcnr.put("签名人1","todo"); + mapJcnr.put("签名人2","todo"); //endregion //region 稽查名称 - 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("申请归档","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"); 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 new file mode 100644 index 0000000..e02a17c --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/StudyFormUtil.java @@ -0,0 +1,91 @@ +package com.hxhq.business.utils; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.util.HashMap; +import java.util.LinkedHashMap; +import java.util.Map; + +/** + * @author tanfei + */ +public class StudyFormUtil { + private static final Logger logger = LoggerFactory.getLogger(StudyFormUtil.class.getName()); + private static HashMap mapJcnr=new HashMap<>(); + private static HashMap mapQmyy=new HashMap<>(); + static { + //region 稽查内容 + + mapJcnr.put("字段名","todo"); + mapJcnr.put("原值","todo"); + mapJcnr.put("新值","todo"); + mapJcnr.put("原因","todo"); + mapJcnr.put("填入值","todo"); + mapJcnr.put("填写人","todo"); + mapJcnr.put("意见回复","todo"); + mapJcnr.put("复核意见","todo"); + mapJcnr.put("生长情况","todo"); + mapJcnr.put("新归属人","todo"); + mapJcnr.put("原归属人","todo"); + + //endregion + + //region 稽查名称 + + 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"); + + //endregion + + } + + + + public static void main(String[] args) { + Map formData = new LinkedHashMap<>(); + formData.put("申请备注", "1111"); + formData.put("审核备注", "22"); + logger.info(getJcnrEn(formData)); + } + /** + * 获取签名意义英文 + * @param qmyy + * @return + */ + public static String getQmyyEn(String qmyy) { + return mapQmyy.get(qmyy); + } + + /** + * 稽查名称英文 + * @param map + * @return + */ + public static String getJcnrEn(Map map) { + Map result =new HashMap<>(); + for (Map.Entry entry : map.entrySet()) { + result.put(mapJcnr.get(entry.getKey()),entry.getValue()); + } + return JctUtil.formatStr(result); + } + +} 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 8649431..325caaa 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 @@ -26,15 +26,16 @@ - update t_study_form_fill set bdnr=#{bdnr} where id=#{id}; + update t_study_form_fill set bdnr=#{bdnr},zdxgjl=#{zdxgjl} 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}; + + update t_study_form_fill set zdgxjl=#{zdgxjl} where id=#{id}; + \ No newline at end of file