fix：[资源库管理][麻精药管理]优化

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/StudyFormPreController.java

@@ -103,9 +103,9 @@ public class StudyFormPreController extends BaseController
      * 填报
      */
     @PostMapping("/tb")
-    public AjaxResult tb(@RequestBody StudyFormPreAuditForm form)
+    public AjaxResult tb(@RequestBody StudyFormPre studyFormPre)
     {
-        studyFormPreService.tb(form);
+        studyFormPreService.tb(studyFormPre);
         return AjaxResult.success("操作成功");
     }
 

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

@@ -62,7 +62,7 @@ public class StudyFormPre extends MpBaseEntity
     private Long shryId;
 
     /** 审核人员名称(通知用) */
-    private Integer shryMc;
+    private String shryMc;
 
     /** 提交时间 */
     @Excel(name = "提交时间")
@@ -101,11 +101,11 @@ public class StudyFormPre extends MpBaseEntity
         this.shryId = shryId;
     }
 
-    public Integer getShryMc() {
+    public String getShryMc() {
         return shryMc;
     }
 
-    public void setShryMc(Integer shryMc) {
+    public void setShryMc(String shryMc) {
         this.shryMc = shryMc;
     }
 

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

@@ -9,8 +9,8 @@ public class StudyFormPreAuditForm {
     /** 表单id */
     private Long id;
 
-    /** 原因 */
-    private String reason;
+    /** 备注 */
+    private String remark;
 
     /** 签名人id */
     private Long qmrId;
@@ -32,12 +32,12 @@ public class StudyFormPreAuditForm {
         this.id = id;
     }
 
-    public String getReason() {
-        return reason;
+    public String getRemark() {
+        return remark;
     }
 
-    public void setReason(String reason) {
-        this.reason = reason;
+    public void setRemark(String remark) {
+        this.remark = remark;
     }
 
     public Long getQmrId() {

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

@@ -26,7 +26,8 @@ public interface IStudyFormPreQmxxService extends IService
      * @param qmyy
      * @param qmrId
      * @param qmrMc
+     * @param remark
      */
-    public  void saveQmxx(Long  formId, String qmyy, Long qmrId, String qmrMc);
+    public  void saveQmxx(Long  formId, String qmyy, Long qmrId, String qmrMc,String remark);
 
 }

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

@@ -54,6 +54,6 @@ public interface IStudyFormPreService extends IService
      * 填报
      * @param form
      */
-    public void tb(StudyFormPreAuditForm form);
+    public void tb(StudyFormPre studyFormPre);
 
 }

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

@@ -124,8 +124,6 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
         //稽查轨迹
         Map<String, String> formData = new LinkedHashMap<>();
         formData.put("备注", form.getRemark());
-        formData.put("签名意义", "申请解档");
-        formData.put("签名人", qmr.getNickName());
         gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "申请解档", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName());
     }
 
@@ -162,8 +160,6 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
         formData.put("借阅开始时间", DateUtils.dateTime(form.getStartDate()));
         formData.put("借阅结束时间", DateUtils.dateTime(form.getEndDate()));
         formData.put("备注", form.getRemark());
-        formData.put("签名意义", "申请借阅");
-        formData.put("签名人", qmr.getNickName());
         gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "申请借阅", JcmcysEnum.orange.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName());
     }
 
@@ -200,10 +196,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
                 gyzjJcgj.setJcgjlx(JcgjlxEnum.lc.getValue());
                 gyzjJcgj.setJcmc("申请归档");
                 gyzjJcgj.setJcmcys(JcmcysEnum.green.getValue());
-                String jcnr = "备注：" + form.getRemark()
-                        + ";签名意义：申请归档"
-                        + ";签名人：" + qmr.getNickName();
-                gyzjJcgj.setJcnr(jcnr);
+                gyzjJcgj.setRemark(form.getRemark());
                 gyzjJcgj.setQmrId(SecurityUtils.getUserId());
                 gyzjJcgj.setQmrMc(SecurityUtils.getLoginUser().getSysUser().getNickName());
                 gyzjJcgjList.add(gyzjJcgj);
@@ -241,8 +234,6 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
         //稽查轨迹
         Map<String, String> formData = new LinkedHashMap<>();
         formData.put("备注", form.getRemark());
-        formData.put("签名意义", "申请归档");
-        formData.put("签名人", qmr.getNickName());
         gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "申请归档", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName());
     }
 
@@ -280,9 +271,6 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
             gyzjJcgj.setJcmcys(JcmcysEnum.green.getValue());
             Map<String, String> formData = new LinkedHashMap<>();
             formData.put("备注", form.getRemark());
-            formData.put("签名意义", "锁定给药制剂");
-            formData.put("签名人", qmr.getNickName());
-
             gyzjJcgj.setJcnr(JctUtil.formatStr(formData));
             gyzjJcgj.setQmrId(SecurityUtils.getUserId());
             gyzjJcgj.setQmrMc(SecurityUtils.getLoginUser().getSysUser().getNickName());
@@ -320,8 +308,6 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
         //稽查轨迹
         Map<String, String> formData = new LinkedHashMap<>();
         formData.put("备注", form.getRemark());
-        formData.put("签名意义", "锁定给药制剂");
-        formData.put("签名人", qmr.getNickName());
         gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "锁定给药制剂", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName());
     }
 
@@ -352,8 +338,6 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
         //稽查轨迹
         Map<String, String> formData = new LinkedHashMap<>();
         formData.put("备注", form.getRemark());
-        formData.put("签名意义", "解锁给药制剂");
-        formData.put("签名人", qmr.getNickName());
         gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "解锁给药制剂", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName());
     }
 
@@ -1153,7 +1137,6 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
         formData.put("库管员1", jsr1.getNickName());
         formData.put("库管员2", jsr2.getNickName());
         formData.put("备注", form.getRemark());
-        formData.put("签名意义", "确认归还");
         gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "确认归还", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName());
         //endregion
         gyzjOld.setKc(leftKc.toString());

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

@@ -124,8 +124,6 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
         //稽查轨迹
         Map<String, String> formData = new LinkedHashMap<>();
         formData.put("备注", form.getRemark());
-        formData.put("签名意义", "申请解档");
-        formData.put("签名人", qmr.getNickName());
         mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "申请解档", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName());
     }
 
@@ -162,8 +160,6 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
         formData.put("借阅开始时间", DateUtils.dateTime(form.getStartDate()));
         formData.put("借阅结束时间", DateUtils.dateTime(form.getEndDate()));
         formData.put("备注", form.getRemark());
-        formData.put("签名意义", "申请借阅");
-        formData.put("签名人", qmr.getNickName());
         mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "申请借阅", JcmcysEnum.orange.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName());
     }
 
@@ -200,11 +196,8 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
                 mjyJcgj.setJcgjlx(JcgjlxEnum.lc.getValue());
                 mjyJcgj.setJcmc("申请归档");
                 mjyJcgj.setJcmcys(JcmcysEnum.green.getValue());
-                String jcnr = "备注：" + form.getRemark()
-                        + ";签名意义：申请归档"
-                        + ";签名人：" + qmr.getNickName();
-                mjyJcgj.setJcnr(jcnr);
                 mjyJcgj.setQmrId(SecurityUtils.getUserId());
+                mjyJcgj.setRemark(form.getRemark());
                 mjyJcgj.setQmrMc(SecurityUtils.getLoginUser().getSysUser().getNickName());
                 mjyJcgjList.add(mjyJcgj);
                 //endregion
@@ -241,8 +234,6 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
         //稽查轨迹
         Map<String, String> formData = new LinkedHashMap<>();
         formData.put("备注", form.getRemark());
-        formData.put("签名意义", "申请归档");
-        formData.put("签名人", qmr.getNickName());
         mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "申请归档", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName());
     }
 
@@ -280,9 +271,6 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
             mjyJcgj.setJcmcys(JcmcysEnum.green.getValue());
             Map<String, String> formData = new LinkedHashMap<>();
             formData.put("备注", form.getRemark());
-            formData.put("签名意义", "锁定麻精药");
-            formData.put("签名人", qmr.getNickName());
-
             mjyJcgj.setJcnr(JctUtil.formatStr(formData));
             mjyJcgj.setQmrId(SecurityUtils.getUserId());
             mjyJcgj.setQmrMc(SecurityUtils.getLoginUser().getSysUser().getNickName());
@@ -320,8 +308,6 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
         //稽查轨迹
         Map<String, String> formData = new LinkedHashMap<>();
         formData.put("备注", form.getRemark());
-        formData.put("签名意义", "锁定麻精药");
-        formData.put("签名人", qmr.getNickName());
         mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "锁定麻精药", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName());
     }
 
@@ -352,8 +338,6 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
         //稽查轨迹
         Map<String, String> formData = new LinkedHashMap<>();
         formData.put("备注", form.getRemark());
-        formData.put("签名意义", "解锁麻精药");
-        formData.put("签名人", qmr.getNickName());
         mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "解锁麻精药", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName());
     }
 
@@ -1167,7 +1151,6 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
         formData.put("库管员1", jsr1.getNickName());
         formData.put("库管员2", jsr2.getNickName());
         formData.put("备注", form.getRemark());
-        formData.put("签名意义", "归还");
         mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "归还", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName());
         //endregion
         mjyOld.setKc(leftKc.toString());

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

@@ -46,14 +46,16 @@ public class StudyFormPreQmxxServiceImpl extends ServiceImpl
      * @param qmyy
      * @param qmrId
      * @param qmrMc
+     * @param remark
      */
     @Override
-    public  void saveQmxx(Long  formId, String qmyy, Long qmrId, String qmrMc){
+    public  void saveQmxx(Long  formId, String qmyy, Long qmrId, String qmrMc,String remark){
         StudyFormPreQmxx studyFormPreQmxx=new StudyFormPreQmxx();
         studyFormPreQmxx.setFormId(formId);
         studyFormPreQmxx.setQmyy(qmyy);
         studyFormPreQmxx.setQmrId(qmrId);
         studyFormPreQmxx.setQmrMc(qmrMc);
+        studyFormPreQmxx.setRemark(remark);
         this.save(studyFormPreQmxx);
     }
 

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

@@ -110,7 +110,7 @@ public class StudyFormPreServiceImpl extends ServiceImpl
         Map<String, String> formData = new LinkedHashMap<>();
         studyFormPreJcgjService.saveJcgj(studyFormPre.getId(), JcgjlxEnum.bj.getValue(), "制作保存预制表单", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName());
         //签名信息
-        studyFormPreQmxxService.saveQmxx(studyFormPre.getId(),"制作保存预制表单",SecurityUtils.getUserId(),SecurityUtils.getLoginUser().getSysUser().getNickName());
+        studyFormPreQmxxService.saveQmxx(studyFormPre.getId(),"制作保存预制表单",SecurityUtils.getUserId(),SecurityUtils.getLoginUser().getSysUser().getNickName(),studyFormPre.getRemark());
 
     }
 
@@ -143,7 +143,7 @@ public class StudyFormPreServiceImpl extends ServiceImpl
         formData.put("备注", studyFormPre.getRemark());
         studyFormPreJcgjService.saveJcgj(studyFormPre.getId(), JcgjlxEnum.lc.getValue(), "制作提交预制表单", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName());
         //签名信息
-        studyFormPreQmxxService.saveQmxx(studyFormPre.getId(),"制作提交预制表单",SecurityUtils.getUserId(),SecurityUtils.getLoginUser().getSysUser().getNickName());
+        studyFormPreQmxxService.saveQmxx(studyFormPre.getId(),"制作提交预制表单",SecurityUtils.getUserId(),SecurityUtils.getLoginUser().getSysUser().getNickName(),studyFormPre.getRemark());
     }
 
     /**
@@ -176,10 +176,10 @@ public class StudyFormPreServiceImpl extends ServiceImpl
         this.updateById(studyFormPreOld);
         //稽查轨迹
         Map<String, String> formData = new LinkedHashMap<>();
-        formData.put("备注", form.getReason());
+        formData.put("备注", form.getRemark());
         studyFormPreJcgjService.saveJcgj(studyFormPreOld.getId(), JcgjlxEnum.lc.getValue(), "审核通过", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName());
         //签名信息
-        studyFormPreQmxxService.saveQmxx(studyFormPreOld.getId(),"审核通过",SecurityUtils.getUserId(),SecurityUtils.getLoginUser().getSysUser().getNickName());
+        studyFormPreQmxxService.saveQmxx(studyFormPreOld.getId(),"审核通过",SecurityUtils.getUserId(),SecurityUtils.getLoginUser().getSysUser().getNickName(),form.getRemark());
     }
 
     /**
@@ -199,19 +199,19 @@ public class StudyFormPreServiceImpl extends ServiceImpl
         this.updateById(studyFormPreOld);
         //稽查轨迹
         Map<String, String> formData = new LinkedHashMap<>();
-        formData.put("原因", form.getReason());
+        formData.put("原因", form.getRemark());
         studyFormPreJcgjService.saveJcgj(studyFormPreOld.getId(), JcgjlxEnum.lc.getValue(), "审核拒绝", JcmcysEnum.red.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName());
         //签名信息
-        studyFormPreQmxxService.saveQmxx(studyFormPreOld.getId(),"审核拒绝",SecurityUtils.getUserId(),SecurityUtils.getLoginUser().getSysUser().getNickName());
+        studyFormPreQmxxService.saveQmxx(studyFormPreOld.getId(),"审核拒绝",SecurityUtils.getUserId(),SecurityUtils.getLoginUser().getSysUser().getNickName(),form.getRemark());
     }
 
     /**
      * 填报
-     * @param form
+     * @param studyFormPre
      */
     @Override
-    public void tb(StudyFormPreAuditForm form){
-        StudyFormPre studyFormPreOld=this.getById(form.getId());
+    public void tb(StudyFormPre studyFormPre){
+        StudyFormPre studyFormPreOld=this.getById(studyFormPre.getId());
         if(studyFormPreOld==null){
             throw  new ServiceException("信息不存在或已删除");
         }
@@ -226,10 +226,10 @@ public class StudyFormPreServiceImpl extends ServiceImpl
         this.updateById(studyFormPreOld);
         //稽查轨迹
         Map<String, String> formData = new LinkedHashMap<>();
-        formData.put("备注", form.getReason());
+        formData.put("备注", studyFormPre.getRemark());
         studyFormPreJcgjService.saveJcgj(studyFormPreOld.getId(), JcgjlxEnum.lc.getValue(), "创建记录", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName());
         //签名信息
-        studyFormPreQmxxService.saveQmxx(studyFormPreOld.getId(),"创建记录",SecurityUtils.getUserId(),SecurityUtils.getLoginUser().getSysUser().getNickName());
+        studyFormPreQmxxService.saveQmxx(studyFormPreOld.getId(),"创建记录",SecurityUtils.getUserId(),SecurityUtils.getLoginUser().getSysUser().getNickName(),studyFormPre.getRemark());
     }
 
 }