feat:[资源库管理][试剂管理]日志记录

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

@@ -45,9 +45,6 @@ public class SjController extends BaseController
     @Autowired
     private ISjTzService sjTzService;
 
-    @Autowired
-    private IStudySubjectService studySubjectService;
-
 
     /**
      * 试验物资列表

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

@@ -1,6 +1,8 @@
 package com.hxhq.business.service;
 
 import java.util.List;
+
+import com.hxhq.business.domain.Sj;
 import com.hxhq.business.domain.SjJcgj;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.hxhq.system.api.domain.SysUser;
@@ -22,8 +24,22 @@ public interface ISjJcgjService extends IService
     public List<SjJcgj> queryList(SjJcgj sjJcgj);
 
     /**
+     * 批量保存稽查轨迹-并保留日志
+     * @param sj
+     * @param sjJcgjList
+     */
+    void saveBatchWithLog(Sj sj, List<SjJcgj> sjJcgjList);
+
+    /**
+     * 保存稽查轨迹-并保留日志
+     * @param sj
+     * @param sjJcgj
+     */
+    void saveWithLog(Sj sj, SjJcgj sjJcgj);
+
+    /**
      * 新增稽查轨迹
-     * @param sjId 试剂id
+     * @param sj 试剂
      * @param jcgjlx 稽查轨迹类型:1:流程；3：编辑
      * @param jcmc 稽查名称
      * @param jcmcEn 稽查名称-英文
@@ -31,7 +47,7 @@ public interface ISjJcgjService extends IService
      * @param jcnr 稽查内容
      * @param jcnrEn 稽查内容-英文
      */
-    public  void saveJcgj(Long  sjId, Integer jcgjlx, String jcmc, String jcmcEn, Integer jcmcys, String jcnr, String jcnrEn);
+    public  void saveJcgj(Sj  sj, Integer jcgjlx, String jcmc, String jcmcEn, Integer jcmcys, String jcnr, String jcnrEn);
 
     /**
      * 生成稽查轨迹

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

@@ -3,10 +3,13 @@ package com.hxhq.business.service.impl;
 import java.util.List;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.hxhq.business.domain.Sj;
+import com.hxhq.business.service.ISystemLogService;
 import com.hxhq.common.core.domain.MpBaseEntity;
 import com.hxhq.common.core.utils.StringUtils;
 import com.hxhq.common.security.utils.SecurityUtils;
 import com.hxhq.system.api.domain.SysUser;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 import com.hxhq.business.mapper.SjkcJcgjMapper;
@@ -22,6 +25,10 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
  */
 @Service
 public class SjJcgjServiceImpl extends ServiceImpl<SjkcJcgjMapper, SjJcgj> implements ISjJcgjService {
+
+    @Autowired
+    private ISystemLogService systemLogService;
+
     /**
      * 查询试剂库存-稽查轨迹列表
      *
@@ -48,10 +55,28 @@ public class SjJcgjServiceImpl extends ServiceImpl imple
 
     @Override
     @Async
-    public void saveJcgj(Long  sjId, Integer jcgjlx, String jcmc, String jcmcEn, Integer jcmcys, String jcnr, String jcnrEn) {
+    public void saveBatchWithLog(Sj sj, List<SjJcgj> sjJcgjList) {
+        this.saveBatch(sjJcgjList);
+        for (SjJcgj sjJcgj : sjJcgjList) {
+            systemLogService.saveInfo(sj.getBh(), sj.getBh(), sjJcgj.getJcmc(), sjJcgj.getJcmcEn(),
+                    sjJcgj.getJcnr(), sjJcgj.getJcnrEn(), sjJcgj.getQmrId(), sjJcgj.getQmrMc(), sjJcgj.getQmrMcEn(), sjJcgj.getRemark());
+        }
+    }
+
+    @Override
+    @Async
+    public void saveWithLog(Sj sj, SjJcgj sjJcgj) {
+        this.save(sjJcgj);
+        systemLogService.saveInfo(sj.getBh(), sj.getBh(), sjJcgj.getJcmc(), sjJcgj.getJcmcEn(),
+                sjJcgj.getJcnr(), sjJcgj.getJcnrEn(), sjJcgj.getQmrId(), sjJcgj.getQmrMc(), sjJcgj.getQmrMcEn(), sjJcgj.getRemark());
+    }
+
+    @Override
+    @Async
+    public void saveJcgj(Sj  sj, Integer jcgjlx, String jcmc, String jcmcEn, Integer jcmcys, String jcnr, String jcnrEn) {
         SysUser sysUser = SecurityUtils.getLoginUser().getSysUser();
         SjJcgj sjJcgj = new SjJcgj();
-        sjJcgj.setSjId(sjId);
+        sjJcgj.setSjId(sj.getId());
         sjJcgj.setJcgjlx(jcgjlx);
         sjJcgj.setJcmc(jcmc);
         sjJcgj.setJcmcEn(jcmcEn);
@@ -62,6 +87,9 @@ public class SjJcgjServiceImpl extends ServiceImpl imple
         sjJcgj.setQmrMc(sysUser.getNickName());
         sjJcgj.setQmrMcEn(sysUser.getUserName());
         this.save(sjJcgj);
+
+        systemLogService.saveInfo(sj.getBh(), sj.getBh(), sjJcgj.getJcmc(), sjJcgj.getJcmcEn(),
+                sjJcgj.getJcnr(), sjJcgj.getJcnrEn(), sjJcgj.getQmrId(), sjJcgj.getQmrMc(), sjJcgj.getQmrMcEn(), sjJcgj.getRemark());
     }
 
     @Override

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

@@ -186,7 +186,7 @@ public class SjServiceImpl extends ServiceImpl implements ISjServi
             jcgj.setRemark(form.getKcbjbz());
             sjJcgjList.add(jcgj);
         }
-        sjJcgjService.saveBatch(sjJcgjList);
+        sjJcgjService.saveBatchWithLog(sjOld, sjJcgjList);
         //endregion
 
         // 台账
@@ -242,7 +242,8 @@ public class SjServiceImpl extends ServiceImpl implements ISjServi
         sjJcgj.setQmrId(qmr.getUserId());
         sjJcgj.setQmrMc(qmr.getNickName());
         sjJcgj.setQmrMcEn(qmr.getUserName());
-        sjJcgjService.save(sjJcgj);
+        sjJcgjService.saveWithLog(sjOld, sjJcgj);
+
 
         // 台账
         sjTzService.saveTz(sjOld.getId(), qmr.getUserId(), qmr.getNickName(), qmr.getUserName(),
@@ -285,7 +286,6 @@ public class SjServiceImpl extends ServiceImpl implements ISjServi
         }
         updateBatchById(sjList);
 
-        List<SjJcgj> sjJcgjList = new ArrayList<>();
         List<SjTz> sjTzList = new ArrayList<>();
         for (PlczSjItemForm itemForm : form.getList()) {
             Sj sj = map.get(itemForm.getId());
@@ -309,7 +309,8 @@ public class SjServiceImpl extends ServiceImpl implements ISjServi
             sjJcgj.setQmrId(qmr.getUserId());
             sjJcgj.setQmrMc(qmr.getNickName());
             sjJcgj.setQmrMcEn(qmr.getUserName());
-            sjJcgjList.add(sjJcgj);
+            sjJcgjService.saveWithLog(sj, sjJcgj);
+
 
             // 台账
             SjTz sjTz = new SjTz();
@@ -324,7 +325,6 @@ public class SjServiceImpl extends ServiceImpl implements ISjServi
             sjTz.setRemark(itemForm.getRemark());
             sjTzList.add(sjTz);
         }
-        sjJcgjService.saveBatch(sjJcgjList);
         sjTzService.saveBatch(sjTzList);
 
     }
@@ -352,7 +352,7 @@ public class SjServiceImpl extends ServiceImpl implements ISjServi
 
         Map<String, String> formDataEn = new LinkedHashMap<>();
         formDataEn.put("Comment", form.getRemark());
-        sjJcgjService.saveJcgj(sj.getId(), JcgjlxEnum.lc.getValue(), "锁定试剂", "Lock Reagent", JcmcysEnum.green.getValue(),
+        sjJcgjService.saveJcgj(sj, JcgjlxEnum.lc.getValue(), "锁定试剂", "Lock Reagent", JcmcysEnum.green.getValue(),
                 JctUtil.formatStr(formData), JctUtil.formatStr(formDataEn));
     }
 
@@ -386,7 +386,7 @@ public class SjServiceImpl extends ServiceImpl implements ISjServi
 
             Map<String, String> formDataEn = new LinkedHashMap<>();
             formDataEn.put("Comment", form.getRemark());
-            sjJcgjService.saveJcgj(sj.getId(), JcgjlxEnum.lc.getValue(), "锁定试剂", "Lock Reagent", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData),
+            sjJcgjService.saveJcgj(sj, JcgjlxEnum.lc.getValue(), "锁定试剂", "Lock Reagent", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData),
                     JctUtil.formatStr(formDataEn));
         }
 
@@ -415,7 +415,7 @@ public class SjServiceImpl extends ServiceImpl implements ISjServi
 
         Map<String, String> formDataEn = new LinkedHashMap<>();
         formDataEn.put("Comment", form.getRemark());
-        sjJcgjService.saveJcgj(sjOld.getId(), JcgjlxEnum.lc.getValue(), "解锁试剂", "Unlock Reagent",
+        sjJcgjService.saveJcgj(sjOld, JcgjlxEnum.lc.getValue(), "解锁试剂", "Unlock Reagent",
                 JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(formDataEn));
     }
 
@@ -455,7 +455,7 @@ public class SjServiceImpl extends ServiceImpl implements ISjServi
         formDataEn.put("Start Date", DateUtils.dateTime(form.getStartDate()));
         formDataEn.put("End Date", DateUtils.dateTime(form.getEndDate()));
         formDataEn.put("Comment", form.getRemark());
-        sjJcgjService.saveJcgj(sjOld.getId(), JcgjlxEnum.lc.getValue(), "申请借阅", "Apply for Check-out",
+        sjJcgjService.saveJcgj(sjOld, JcgjlxEnum.lc.getValue(), "申请借阅", "Apply for Check-out",
                 JcmcysEnum.orange.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(formDataEn));
 
         archiveLogService.saveInfo(ArchiveLogTypeEnum.sj, sjOld.getId(), sjOld.getMc(), sjOld.getBh(), sjOld.getNd() + sjOld.getNddw(), "申请借阅");
@@ -489,7 +489,7 @@ public class SjServiceImpl extends ServiceImpl implements ISjServi
 
         Map<String, String> formDataEn = new LinkedHashMap<>();
         formDataEn.put("Comment", form.getRemark());
-        sjJcgjService.saveJcgj(sjOld.getId(), JcgjlxEnum.lc.getValue(), "申请解档", "Apply for De-archiving",
+        sjJcgjService.saveJcgj(sjOld, JcgjlxEnum.lc.getValue(), "申请解档", "Apply for De-archiving",
                 JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(formDataEn));
 
         archiveLogService.saveInfo(ArchiveLogTypeEnum.sj, sjOld.getId(), sjOld.getMc(), sjOld.getBh(), sjOld.getNd() + sjOld.getNddw(), "申请解档");
@@ -522,7 +522,7 @@ public class SjServiceImpl extends ServiceImpl implements ISjServi
 
         Map<String, String> formDataEn = new LinkedHashMap<>();
         formDataEn.put("Comment", form.getRemark());
-        sjJcgjService.saveJcgj(sjOld.getId(), JcgjlxEnum.lc.getValue(), "申请归档", "Apply for Archiving",
+        sjJcgjService.saveJcgj(sjOld, JcgjlxEnum.lc.getValue(), "申请归档", "Apply for Archiving",
                 JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(formDataEn));
 
         archiveLogService.saveInfo(ArchiveLogTypeEnum.sj, sjOld.getId(), sjOld.getMc(), sjOld.getBh(), sjOld.getNd() + sjOld.getNddw(), "申请归档");
@@ -562,7 +562,7 @@ public class SjServiceImpl extends ServiceImpl implements ISjServi
 
             Map<String, String> formDataEn = new LinkedHashMap<>();
             formDataEn.put("Comment", form.getRemark());
-            sjJcgjService.saveJcgj(sj.getId(), JcgjlxEnum.lc.getValue(), "申请归档", "Apply for Archiving",
+            sjJcgjService.saveJcgj(sj, JcgjlxEnum.lc.getValue(), "申请归档", "Apply for Archiving",
                     JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(formDataEn));
 
             archiveLogService.saveInfo(ArchiveLogTypeEnum.sj, sj.getId(), sj.getMc(), sj.getBh(), sj.getNd() + sj.getNddw(), "申请归档");
@@ -607,7 +607,7 @@ public class SjServiceImpl extends ServiceImpl implements ISjServi
             sjJcgj.setRemark(form.getQmbz());
             gspJcgjList.add(sjJcgj);
         }
-        sjJcgjService.saveBatch(gspJcgjList);
+        sjJcgjService.saveBatchWithLog(sjOld, gspJcgjList);
     }
 
     @Override
@@ -770,6 +770,7 @@ public class SjServiceImpl extends ServiceImpl implements ISjServi
             sj.setDeptId(studySubject.getDeptId());
             this.updateById(sj);
         }
+        sjJcgjService.saveJcgj(sj, JcgjlxEnum.lc.getValue(), "开始配置", "Start Configuration", JcmcysEnum.blue.getValue(), null, null);
     }
 
 
@@ -810,6 +811,8 @@ public class SjServiceImpl extends ServiceImpl implements ISjServi
             sj.setJyzt(JyztEnum.wjy.getValue());
             this.updateById(sj);
         }
+        sjJcgjService.saveJcgj(sj, JcgjlxEnum.lc.getValue(), "配置完成", "Configuration Completed", JcmcysEnum.blue.getValue(), null, null);
+
 
     }
 
@@ -866,7 +869,7 @@ public class SjServiceImpl extends ServiceImpl implements ISjServi
         jcnrMap.put("分装后编号及体积", String.join(",", fz));
         jcnrMap.put("分装人", SecurityUtils.getNickName());
         jcgj.setJcnr(JctUtil.formatStr(jcnrMap));
-        sjJcgjService.save(jcgj);
+        sjJcgjService.saveWithLog(sj, jcgj);
     }
 
     private void cc(StudyFormFill studyFormFill, Map<String, Sj> sjMap, List<SjJcgj> jcgjList, List<SjTz> tzList, SysUser qmr) {
@@ -974,7 +977,7 @@ public class SjServiceImpl extends ServiceImpl implements ISjServi
 
         Map<String, String> formDataEn = new LinkedHashMap<>();
         formDataEn.put("Comment", form.getRemark());
-        sjJcgjService.saveJcgj(sj.getId(), JcgjlxEnum.lc.getValue(), "同意归档", "Approve Archiving",
+        sjJcgjService.saveJcgj(sj, JcgjlxEnum.lc.getValue(), "同意归档", "Approve Archiving",
                 JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(formDataEn));
 
         archiveLogService.saveInfo(ArchiveLogTypeEnum.sj, sj.getId(), sj.getMc(), sj.getBh(), sj.getNd() + sj.getNddw(), "同意归档");
@@ -1005,7 +1008,7 @@ public class SjServiceImpl extends ServiceImpl implements ISjServi
 
         Map<String, String> formDataEn = new LinkedHashMap<>();
         formDataEn.put("Comment", form.getRemark());
-        sjJcgjService.saveJcgj(sj.getId(), JcgjlxEnum.lc.getValue(), "拒绝归档", "Reject Archiving",
+        sjJcgjService.saveJcgj(sj, JcgjlxEnum.lc.getValue(), "拒绝归档", "Reject Archiving",
                 JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(formDataEn));
 
         archiveLogService.saveInfo(ArchiveLogTypeEnum.sj, sj.getId(), sj.getMc(), sj.getBh(), sj.getNd() + sj.getNddw(), "拒绝归档");
@@ -1036,7 +1039,7 @@ public class SjServiceImpl extends ServiceImpl implements ISjServi
 
         Map<String, String> formDataEn = new LinkedHashMap<>();
         formDataEn.put("Comment", form.getRemark());
-        sjJcgjService.saveJcgj(sj.getId(), JcgjlxEnum.lc.getValue(), "同意解档", "Approve De-archiving",
+        sjJcgjService.saveJcgj(sj, JcgjlxEnum.lc.getValue(), "同意解档", "Approve De-archiving",
                 JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(formDataEn));
 
         archiveLogService.saveInfo(ArchiveLogTypeEnum.sj, sj.getId(), sj.getMc(), sj.getBh(), sj.getNd() + sj.getNddw(), "同意解档");
@@ -1067,7 +1070,7 @@ public class SjServiceImpl extends ServiceImpl implements ISjServi
 
         Map<String, String> formDataEn = new LinkedHashMap<>();
         formDataEn.put("Comment", form.getRemark());
-        sjJcgjService.saveJcgj(sj.getId(), JcgjlxEnum.lc.getValue(), "拒绝解档", "Reject De-archiving",
+        sjJcgjService.saveJcgj(sj, JcgjlxEnum.lc.getValue(), "拒绝解档", "Reject De-archiving",
                 JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(formDataEn));
 
         archiveLogService.saveInfo(ArchiveLogTypeEnum.sj, sj.getId(), sj.getMc(), sj.getBh(), sj.getNd() + sj.getNddw(), "拒绝解档");
@@ -1100,7 +1103,7 @@ public class SjServiceImpl extends ServiceImpl implements ISjServi
 
         Map<String, String> formDataEn = new LinkedHashMap<>();
         formDataEn.put("Comment", form.getRemark());
-        sjJcgjService.saveJcgj(sj.getId(), JcgjlxEnum.lc.getValue(), "同意借阅", "Approve Check-out",
+        sjJcgjService.saveJcgj(sj, JcgjlxEnum.lc.getValue(), "同意借阅", "Approve Check-out",
                 JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(formDataEn));
 
         archiveLogService.saveInfo(ArchiveLogTypeEnum.sj, sj.getId(), sj.getMc(), sj.getBh(), sj.getNd() + sj.getNddw(), "同意借阅");
@@ -1131,7 +1134,7 @@ public class SjServiceImpl extends ServiceImpl implements ISjServi
 
         Map<String, String> formDataEn = new LinkedHashMap<>();
         formDataEn.put("Comment", form.getRemark());
-        sjJcgjService.saveJcgj(sj.getId(), JcgjlxEnum.lc.getValue(), "拒绝借阅", "Reject Check-out",
+        sjJcgjService.saveJcgj(sj, JcgjlxEnum.lc.getValue(), "拒绝借阅", "Reject Check-out",
                 JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(formDataEn));
 
         archiveLogService.saveInfo(ArchiveLogTypeEnum.sj, sj.getId(), sj.getMc(), sj.getBh(), sj.getNd() + sj.getNddw(), "拒绝借阅");
@@ -1162,7 +1165,7 @@ public class SjServiceImpl extends ServiceImpl implements ISjServi
 
         Map<String, String> formDataEn = new LinkedHashMap<>();
         formDataEn.put("Comment", form.getRemark());
-        sjJcgjService.saveJcgj(sj.getId(), JcgjlxEnum.lc.getValue(), "确认归还", "Check-out End Confirmation",
+        sjJcgjService.saveJcgj(sj, JcgjlxEnum.lc.getValue(), "确认归还", "Check-out End Confirmation",
                 JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(formDataEn));
 
         archiveLogService.saveInfo(ArchiveLogTypeEnum.sj, sj.getId(), sj.getMc(), sj.getBh(), sj.getNd() + sj.getNddw(), "确认归还");
@@ -1181,12 +1184,9 @@ public class SjServiceImpl extends ServiceImpl implements ISjServi
             //稽查轨迹
             SjJcgj jcgj = sjJcgjService.genJcgj(sj.getId(), JcgjlxEnum.lc.getValue(), "到期自动归还", "Check-out End on Time",
                     JcmcysEnum.green.getValue(), null, null, null);
-            jcgjList.add(jcgj);
+            sjJcgjService.saveWithLog(sj, jcgj);
         }
         this.updateBatchById(sjList);
-        if (jcgjList.size() > 0) {
-            sjJcgjService.saveBatch(jcgjList);
-        }
     }
 
     /**