fix:[资源库]日志

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

@@ -18,6 +18,9 @@ public class GyzjFfjlJcgj extends MpBaseEntity
     /** 发放记录id */
     private Long ffjlId;
 
+    /** 发放记录编号 */
+    private String ffjlBh;
+
     /** 稽查轨迹类型:1:流程；3：编辑 */
     private Integer jcgjlx;
 
@@ -45,6 +48,14 @@ public class GyzjFfjlJcgj extends MpBaseEntity
     /** 签名人名称-英文 */
     private String qmrMcEn;
 
+    public String getFfjlBh() {
+        return ffjlBh;
+    }
+
+    public void setFfjlBh(String ffjlBh) {
+        this.ffjlBh = ffjlBh;
+    }
+
     public String getJcmcEn() {
         return jcmcEn;
     }

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

@@ -19,6 +19,9 @@ public class GyzjJcgj extends MpBaseEntity
     /** 给药制剂id */
     private Long gyzjId;
 
+    /** 给药制剂编号 */
+    private String gyzjBh;
+
     /** 稽查轨迹类型:1:流程；3：编辑 */
     private Integer jcgjlx;
 
@@ -46,6 +49,14 @@ public class GyzjJcgj extends MpBaseEntity
     /** 签名人名称-英文 */
     private String qmrMcEn;
 
+    public String getGyzjBh() {
+        return gyzjBh;
+    }
+
+    public void setGyzjBh(String gyzjBh) {
+        this.gyzjBh = gyzjBh;
+    }
+
     public String getJcmcEn() {
         return jcmcEn;
     }

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

@@ -18,6 +18,9 @@ public class MjyFfjlJcgj extends MpBaseEntity
     /** 发放记录id */
     private Long ffjlId;
 
+    /** 发放记录编号 */
+    private String ffjlBh;
+
     /** 稽查轨迹类型:1:流程；3：编辑 */
     private Integer jcgjlx;
 
@@ -45,6 +48,14 @@ public class MjyFfjlJcgj extends MpBaseEntity
     /** 签名人名称-英文 */
     private String qmrMcEn;
 
+    public String getFfjlBh() {
+        return ffjlBh;
+    }
+
+    public void setFfjlBh(String ffjlBh) {
+        this.ffjlBh = ffjlBh;
+    }
+
     public String getJcmcEn() {
         return jcmcEn;
     }

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

@@ -18,6 +18,9 @@ public class MjyJcgj extends MpBaseEntity
     /** 麻精药id */
     private Long mjyId;
 
+    /** 麻精药编号 */
+    private String mjyBh;
+
     /** 稽查轨迹类型:1:流程；3：编辑 */
     private Integer jcgjlx;
 
@@ -45,6 +48,14 @@ public class MjyJcgj extends MpBaseEntity
     /** 签名人名称-英文 */
     private String qmrMcEn;
 
+    public String getMjyBh() {
+        return mjyBh;
+    }
+
+    public void setMjyBh(String mjyBh) {
+        this.mjyBh = mjyBh;
+    }
+
     public String getJcmcEn() {
         return jcmcEn;
     }

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

@@ -26,10 +26,9 @@ public interface IGyzjFfjlJcgjService extends IService
 
     /**
      * 批量保存稽查轨迹-并保留日志
-     * @param gyzjFfjl
      * @param jcgjList
      */
-    void saveBatchWithLog(GyzjFfjl gyzjFfjl, List<GyzjFfjlJcgj> jcgjList);
+    void saveBatchWithLog(List<GyzjFfjlJcgj> jcgjList);
 
 
     /**
@@ -48,7 +47,7 @@ public interface IGyzjFfjlJcgjService extends IService
 
     /**
      * 新增稽查轨迹
-     * @param ffjlId 发放记录id
+     * @param gyzjFfjl 发放记录
      * @param jcgjlx 稽查轨迹类型:1:流程；3：编辑
      * @param jcmc 稽查名称
      * @param jcmcys 稽查名称颜色：1：蓝色；3：红色；5：绿色；7：橙色
@@ -57,5 +56,5 @@ public interface IGyzjFfjlJcgjService extends IService
      * @param remark 备注
      * @return
      */
-    public GyzjFfjlJcgj getJcgj(Long  ffjlId, Integer jcgjlx, String jcmc, Integer jcmcys, Map<String, String> jcnr, SysUser qmr, String remark);
+    public GyzjFfjlJcgj getJcgj(GyzjFfjl gyzjFfjl,Integer jcgjlx, String jcmc, Integer jcmcys, Map<String, String> jcnr, SysUser qmr, String remark);
 }

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

@@ -26,10 +26,9 @@ public interface IGyzjJcgjService extends IService
 
     /**
      * 批量保存稽查轨迹-并保留日志
-     * @param gyzj
      * @param jcgjList
      */
-    void saveBatchWithLog(Gyzj gyzj, List<GyzjJcgj> jcgjList);
+    void saveBatchWithLog(List<GyzjJcgj> jcgjList);
 
     /**
      * 新增稽查轨迹
@@ -46,7 +45,7 @@ public interface IGyzjJcgjService extends IService
 
     /**
      * 新增稽查轨迹
-     * @param mjyId 给药制剂id
+     * @param gyzj 给药制剂
      * @param jcgjlx 稽查轨迹类型:1:流程；3：编辑
      * @param jcmc 稽查名称
      * @param jcmcys 稽查名称颜色：1：蓝色；3：红色；5：绿色；7：橙色
@@ -55,11 +54,11 @@ public interface IGyzjJcgjService extends IService
      * @param remark 备注
      * @return
      */
-    public GyzjJcgj getJcgj(Long  mjyId, Integer jcgjlx, String jcmc, Integer jcmcys, Map<String, String>  jcnr, SysUser qmr, String remark);
+    public GyzjJcgj getJcgj(Gyzj gyzj, Integer jcgjlx, String jcmc, Integer jcmcys, Map<String, String>  jcnr, SysUser qmr, String remark);
 
     /**
      * 新增稽查轨迹
-     * @param mjyId 给药制剂id
+     * @param gyzj 给药制剂
      * @param jcgjlx 稽查轨迹类型:1:流程；3：编辑
      * @param jcmc 稽查名称
      * @param jcmcys 稽查名称颜色：1：蓝色；3：红色；5：绿色；7：橙色
@@ -69,6 +68,6 @@ public interface IGyzjJcgjService extends IService
      * @param remark 备注
      * @return
      */
-    public  GyzjJcgj getJcgj(Long  mjyId, Integer jcgjlx, String jcmc, Integer jcmcys, String jcnr, String jcnrEn,  SysUser qmr, String remark);
+    public  GyzjJcgj getJcgj(Gyzj gyzj, Integer jcgjlx, String jcmc, Integer jcmcys, String jcnr, String jcnrEn,  SysUser qmr, String remark);
 
 }

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

@@ -25,10 +25,9 @@ public interface IMjyFfjlJcgjService extends IService
 
     /**
      * 批量保存稽查轨迹-并保留日志
-     * @param mjyFfjl
      * @param jcgjList
      */
-    void saveBatchWithLog(MjyFfjl mjyFfjl, List<MjyFfjlJcgj> jcgjList);
+    void saveBatchWithLog(List<MjyFfjlJcgj> jcgjList);
 
     /**
      * 新增稽查轨迹
@@ -46,7 +45,7 @@ public interface IMjyFfjlJcgjService extends IService
 
     /**
      * 新增稽查轨迹
-     * @param ffjlId 发放记录id
+     * @param mjyFfjl 发放记录
      * @param jcgjlx 稽查轨迹类型:1:流程；3：编辑
      * @param jcmc 稽查名称
      * @param jcmcys 稽查名称颜色：1：蓝色；3：红色；5：绿色；7：橙色
@@ -55,5 +54,5 @@ public interface IMjyFfjlJcgjService extends IService
      * @param remark 备注
      * @return
      */
-    public  MjyFfjlJcgj getJcgj(Long  ffjlId, Integer jcgjlx, String jcmc, Integer jcmcys, Map<String, String> jcnr, SysUser qmr, String remark);
+    public  MjyFfjlJcgj getJcgj(MjyFfjl mjyFfjl,Integer jcgjlx, String jcmc, Integer jcmcys, Map<String, String> jcnr, SysUser qmr, String remark);
 }

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

@@ -24,10 +24,9 @@ public interface IMjyJcgjService extends IService
 
     /**
      * 批量保存稽查轨迹-并保留日志
-     * @param mjy
      * @param jcgjList
      */
-    void saveBatchWithLog(Mjy mjy, List<MjyJcgj> jcgjList);
+    void saveBatchWithLog(List<MjyJcgj> jcgjList);
 
     /**
      * 新增稽查轨迹
@@ -44,7 +43,7 @@ public interface IMjyJcgjService extends IService
 
     /**
      * 新增稽查轨迹
-     * @param mjyId 麻精药id
+     * @param mjy 麻精药i
      * @param jcgjlx 稽查轨迹类型:1:流程；3：编辑
      * @param jcmc 稽查名称
      * @param jcmcys 稽查名称颜色：1：蓝色；3：红色；5：绿色；7：橙色
@@ -53,10 +52,10 @@ public interface IMjyJcgjService extends IService
      * @param remark 备注
      * @return
      */
-    public  MjyJcgj getJcgj(Long  mjyId, Integer jcgjlx, String jcmc, Integer jcmcys, Map<String, String>  jcnr,  SysUser qmr, String remark);
+    public  MjyJcgj getJcgj(Mjy  mjy, Integer jcgjlx, String jcmc, Integer jcmcys, Map<String, String>  jcnr,  SysUser qmr, String remark);
     /**
      * 新增稽查轨迹
-     * @param mjyId 麻精药id
+     * @param mjy 麻精药
      * @param jcgjlx 稽查轨迹类型:1:流程；3：编辑
      * @param jcmc 稽查名称
      * @param jcmcys 稽查名称颜色：1：蓝色；3：红色；5：绿色；7：橙色
@@ -66,6 +65,6 @@ public interface IMjyJcgjService extends IService
      * @param remark 备注
      * @return
      */
-    public  MjyJcgj getJcgj(Long  mjyId, Integer jcgjlx, String jcmc, Integer jcmcys, String jcnr, String jcnrEn,  SysUser qmr, String remark);
+    public  MjyJcgj getJcgj(Mjy  mjy, Integer jcgjlx, String jcmc, Integer jcmcys, String jcnr, String jcnrEn,  SysUser qmr, String remark);
 
 }

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

@@ -59,15 +59,14 @@ public class GyzjFfjlJcgjServiceImpl extends ServiceImpl
 
     /**
      * 批量保存稽查轨迹-并保留日志
-     * @param gyzjFfjl
      * @param jcgjList
      */
     @Override
     @Async
-    public void saveBatchWithLog(GyzjFfjl gyzjFfjl, List<GyzjFfjlJcgj> jcgjList) {
+    public void saveBatchWithLog(List<GyzjFfjlJcgj> jcgjList) {
         this.saveBatch(jcgjList);
         for (GyzjFfjlJcgj jcgj : jcgjList) {
-            systemLogService.saveInfo(gyzjFfjl.getBh(), gyzjFfjl.getBh(), jcgj.getJcmc(), jcgj.getJcmcEn(),
+            systemLogService.saveInfo(jcgj.getFfjlBh(), jcgj.getFfjlBh(), jcgj.getJcmc(), jcgj.getJcmcEn(),
                     jcgj.getJcnr(), jcgj.getJcnrEn(), jcgj.getQmrId(), jcgj.getQmrMc(), jcgj.getQmrMcEn(), jcgj.getRemark());
         }
     }
@@ -86,6 +85,7 @@ public class GyzjFfjlJcgjServiceImpl extends ServiceImpl
     public  void saveJcgj(GyzjFfjl gyzjFfjl,  Integer jcgjlx, String jcmc, Integer jcmcys, Map<String, String> jcnr, SysUser qmr, String remark){
         GyzjFfjlJcgj gyzjFfjlJcgj = new GyzjFfjlJcgj();
         gyzjFfjlJcgj.setFfjlId(gyzjFfjl.getId());
+        gyzjFfjlJcgj.setFfjlBh(gyzjFfjl.getBh());
         gyzjFfjlJcgj.setJcgjlx(jcgjlx);
         gyzjFfjlJcgj.setJcmc(jcmc);
         gyzjFfjlJcgj.setJcmcEn(GyzjJcnrUtil.getEn(jcmc));
@@ -105,7 +105,7 @@ public class GyzjFfjlJcgjServiceImpl extends ServiceImpl
 
     /**
      * 新增稽查轨迹
-     * @param ffjlId 发放记录id
+     * @param gyzjFfjl 发放记录
      * @param jcgjlx 稽查轨迹类型:1:流程；3：编辑
      * @param jcmc 稽查名称
      * @param jcmcys 稽查名称颜色：1：蓝色；3：红色；5：绿色；7：橙色
@@ -114,9 +114,10 @@ public class GyzjFfjlJcgjServiceImpl extends ServiceImpl
      * @param remark 备注
      */
     @Override
-    public  GyzjFfjlJcgj getJcgj(Long  ffjlId, Integer jcgjlx, String jcmc, Integer jcmcys, Map<String, String> jcnr,SysUser qmr,String remark){
+    public  GyzjFfjlJcgj getJcgj(GyzjFfjl gyzjFfjl, Integer jcgjlx, String jcmc, Integer jcmcys, Map<String, String> jcnr,SysUser qmr,String remark){
         GyzjFfjlJcgj gyzjFfjlJcgj = new GyzjFfjlJcgj();
-        gyzjFfjlJcgj.setFfjlId(ffjlId);
+        gyzjFfjlJcgj.setFfjlId(gyzjFfjl.getId());
+        gyzjFfjlJcgj.setFfjlBh(gyzjFfjl.getBh());
         gyzjFfjlJcgj.setJcgjlx(jcgjlx);
         gyzjFfjlJcgj.setJcmc(jcmc);
         gyzjFfjlJcgj.setJcmcEn(GyzjJcnrUtil.getEn(jcmc));

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

@@ -248,12 +248,12 @@ public class GyzjFfjlServiceImpl extends ServiceImpl i
                 gyzjFfjl.setGdsqrId(qmr.getUserId());
                 gyzjFfjl.setGdsqrMc(qmr.getNickName());
                 // 稽查轨迹
-                gyzjFfjlJcgjList.add(gyzjFfjlJcgjService.getJcgj(gyzjFfjl.getId(), JcgjlxEnum.lc.getValue(), "申请归档", JcmcysEnum.green.getValue(), null, qmr, form.getRemark()));
+                gyzjFfjlJcgjList.add(gyzjFfjlJcgjService.getJcgj(gyzjFfjl, JcgjlxEnum.lc.getValue(), "申请归档", JcmcysEnum.green.getValue(), null, qmr, form.getRemark()));
                 //保存日志
                 archiveLogService.saveInfo(ArchiveLogTypeEnum.gyzjlqff, gyzjFfjl.getId(), gyzjFfjl.getMc(), gyzjFfjl.getBh(), gyzjFfjl.getNd()+gyzjFfjl.getNddw(), "申请归档");
             }
             this.updateBatchById(gyzjFfjlList);
-            gyzjFfjlJcgjService.saveBatch(gyzjFfjlJcgjList);
+            gyzjFfjlJcgjService.saveBatchWithLog(gyzjFfjlJcgjList);
         }
     }
 
@@ -317,10 +317,10 @@ public class GyzjFfjlServiceImpl extends ServiceImpl i
             //锁定
             gyzjFfjl.setJlzt(JlztEnum.ysd.getValue());
             // 稽查轨迹
-            gyzjFfjlJcgjList.add(gyzjFfjlJcgjService.getJcgj(gyzjFfjl.getId(), JcgjlxEnum.lc.getValue(), "锁定发放记录", JcmcysEnum.green.getValue(), null, qmr, form.getRemark()));
+            gyzjFfjlJcgjList.add(gyzjFfjlJcgjService.getJcgj(gyzjFfjl, JcgjlxEnum.lc.getValue(), "锁定发放记录", JcmcysEnum.green.getValue(), null, qmr, form.getRemark()));
         }
         this.saveOrUpdateBatch(gyzjFfjlList);
-        gyzjFfjlJcgjService.saveBatch(gyzjFfjlJcgjList);
+        gyzjFfjlJcgjService.saveBatchWithLog(gyzjFfjlJcgjList);
 
     }
 
@@ -780,11 +780,11 @@ public class GyzjFfjlServiceImpl extends ServiceImpl i
         for(GyzjFfjl gyzjFfjl:gyzjFfjlList){
             gyzjFfjl.setJlzt(JyztEnum.wjy.getValue());
             //稽查轨迹
-            gyzjFfjlJcgjList.add(gyzjFfjlJcgjService.getJcgj(gyzjFfjl.getId(), JcgjlxEnum.lc.getValue(), "到期自动归还", JcmcysEnum.green.getValue(), null, null, null));
+            gyzjFfjlJcgjList.add(gyzjFfjlJcgjService.getJcgj(gyzjFfjl, JcgjlxEnum.lc.getValue(), "到期自动归还", JcmcysEnum.green.getValue(), null, null, null));
         }
         this.updateBatchById(gyzjFfjlList);
         if(gyzjFfjlJcgjList.size()>0){
-            gyzjFfjlJcgjService.saveBatch(gyzjFfjlJcgjList);
+            gyzjFfjlJcgjService.saveBatchWithLog(gyzjFfjlJcgjList);
         }
     }
 

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

@@ -60,15 +60,14 @@ public class GyzjJcgjServiceImpl extends ServiceImpl i
 
     /**
      * 批量保存稽查轨迹-并保留日志
-     * @param gyzj
      * @param jcgjList
      */
     @Override
     @Async
-    public void saveBatchWithLog(Gyzj gyzj, List<GyzjJcgj> jcgjList) {
+    public void saveBatchWithLog(List<GyzjJcgj> jcgjList) {
         this.saveBatch(jcgjList);
         for (GyzjJcgj jcgj : jcgjList) {
-            systemLogService.saveInfo(gyzj.getBh(), gyzj.getBh(), jcgj.getJcmc(), jcgj.getJcmcEn(),
+            systemLogService.saveInfo(jcgj.getGyzjBh(), jcgj.getGyzjBh(), jcgj.getJcmc(), jcgj.getJcmcEn(),
                     jcgj.getJcnr(), jcgj.getJcnrEn(), jcgj.getQmrId(), jcgj.getQmrMc(), jcgj.getQmrMcEn(), jcgj.getRemark());
         }
     }
@@ -87,6 +86,7 @@ public class GyzjJcgjServiceImpl extends ServiceImpl i
     public  void saveJcgj(Gyzj gyzj, Integer jcgjlx, String jcmc, Integer jcmcys, Map<String, String> jcnr, SysUser qmr, String remark){
         GyzjJcgj gyzjJcgj = new GyzjJcgj();
         gyzjJcgj.setGyzjId(gyzj.getId());
+        gyzjJcgj.setGyzjBh(gyzj.getBh());
         gyzjJcgj.setJcgjlx(jcgjlx);
         gyzjJcgj.setJcmc(jcmc);
         gyzjJcgj.setJcmcEn(GyzjJcnrUtil.getEn(jcmc));
@@ -109,7 +109,7 @@ public class GyzjJcgjServiceImpl extends ServiceImpl i
 
     /**
      * 新增稽查轨迹
-     * @param gyzjId 麻精药id
+     * @param gyzj 给药制剂
      * @param jcgjlx 稽查轨迹类型:1:流程；3：编辑
      * @param jcmc 稽查名称
      * @param jcmcys 稽查名称颜色：1：蓝色；3：红色；5：绿色；7：橙色
@@ -118,9 +118,10 @@ public class GyzjJcgjServiceImpl extends ServiceImpl i
      * @param remark 备注
      */
     @Override
-    public  GyzjJcgj getJcgj(Long  gyzjId, Integer jcgjlx, String jcmc, Integer jcmcys, Map<String, String> jcnr, SysUser qmr, String remark){
+    public  GyzjJcgj getJcgj(Gyzj gyzj, Integer jcgjlx, String jcmc, Integer jcmcys, Map<String, String> jcnr, SysUser qmr, String remark){
         GyzjJcgj gyzjJcgj = new GyzjJcgj();
-        gyzjJcgj.setGyzjId(gyzjId);
+        gyzjJcgj.setGyzjId(gyzj.getId());
+        gyzjJcgj.setGyzjBh(gyzj.getBh());
         gyzjJcgj.setJcgjlx(jcgjlx);
         gyzjJcgj.setJcmc(jcmc);
         gyzjJcgj.setJcmcEn(GyzjJcnrUtil.getEn(jcmc));
@@ -140,7 +141,7 @@ public class GyzjJcgjServiceImpl extends ServiceImpl i
 
     /**
      * 新增稽查轨迹
-     * @param gyzjId 麻精药id
+     * @param gyzj 给药制剂
      * @param jcgjlx 稽查轨迹类型:1:流程；3：编辑
      * @param jcmc 稽查名称
      * @param jcmcys 稽查名称颜色：1：蓝色；3：红色；5：绿色；7：橙色
@@ -150,9 +151,10 @@ public class GyzjJcgjServiceImpl extends ServiceImpl i
      * @param remark 备注
      */
     @Override
-    public  GyzjJcgj getJcgj(Long  gyzjId, Integer jcgjlx, String jcmc, Integer jcmcys, String jcnr,String jcnrEn, SysUser qmr, String remark){
+    public  GyzjJcgj getJcgj(Gyzj gyzj,Integer jcgjlx, String jcmc, Integer jcmcys, String jcnr,String jcnrEn, SysUser qmr, String remark){
         GyzjJcgj gyzjJcgj = new GyzjJcgj();
-        gyzjJcgj.setGyzjId(gyzjId);
+        gyzjJcgj.setGyzjId(gyzj.getId());
+        gyzjJcgj.setGyzjBh(gyzj.getBh());
         gyzjJcgj.setJcgjlx(jcgjlx);
         gyzjJcgj.setJcmc(jcmc);
         gyzjJcgj.setJcmcEn(GyzjJcnrUtil.getEn(jcmc));

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

@@ -388,12 +388,12 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
                 gyzj.setGdsqrId(qmr.getUserId());
                 gyzj.setGdsqrMc(qmr.getNickName());
                 //稽查轨迹
-                gyzjJcgjList.add(gyzjJcgjService.getJcgj(gyzj.getId(), JcgjlxEnum.lc.getValue(), "申请归档", JcmcysEnum.orange.getValue(), null, qmr, form.getRemark()));
+                gyzjJcgjList.add(gyzjJcgjService.getJcgj(gyzj, JcgjlxEnum.lc.getValue(), "申请归档", JcmcysEnum.orange.getValue(), null, qmr, form.getRemark()));
                 //保存日志
                 archiveLogService.saveInfo(ArchiveLogTypeEnum.gyzj, gyzj.getId(), gyzj.getMc(), gyzj.getBh(), gyzj.getNd() + gyzj.getNddw(), "申请归档");
             }
             this.updateBatchById(gyzjList);
-            gyzjJcgjService.saveBatch(gyzjJcgjList);
+            gyzjJcgjService.saveBatchWithLog(gyzjJcgjList);
         }
     }
 
@@ -457,10 +457,10 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
             //锁定
             gyzj.setZjzt(ZjztEnum.ysd.getValue());
             //region 稽查轨迹
-            gyzjJcgjList.add(gyzjJcgjService.getJcgj(gyzj.getId(), JcgjlxEnum.lc.getValue(), "锁定给药制剂", JcmcysEnum.orange.getValue(), null, qmr, form.getRemark()));
+            gyzjJcgjList.add(gyzjJcgjService.getJcgj(gyzj, JcgjlxEnum.lc.getValue(), "锁定给药制剂", JcmcysEnum.orange.getValue(), null, qmr, form.getRemark()));
         }
         this.updateBatchById(gyzjList);
-        gyzjJcgjService.saveBatch(gyzjJcgjList);
+        gyzjJcgjService.saveBatchWithLog(gyzjJcgjList);
 
     }
 
@@ -566,7 +566,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
                 formData.put("处置原因", gyzjPlffItemFilter.get(0).getCzyy());
                 formData.put("处置量", gyzjPlffItemFilter.get(0).getCzl() + gyzj.getKcdw());
                 formData.put("处置人", clr.getNickName());
-                gyzjJcgjList.add(gyzjJcgjService.getJcgj(gyzj.getId(), JcgjlxEnum.lc.getValue(), "处置药剂", JcmcysEnum.orange.getValue(), formData, clr, null));
+                gyzjJcgjList.add(gyzjJcgjService.getJcgj(gyzj, JcgjlxEnum.lc.getValue(), "处置药剂", JcmcysEnum.orange.getValue(), formData, clr, null));
                 //台账
                 gyzjTzList.add(gyzjTzService.getTz(gyzj.getId(), null, null, null, null, null, null, null, null, clr, "处置药剂", gyzjPlffItemFilter.get(0).getCzl(), gyzj.getKcdw(), gyzjPlffItemFilter.get(0).getCzyy()));
 
@@ -575,7 +575,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
             }
         }
         this.updateBatchById(gyzjList);
-        gyzjJcgjService.saveBatch(gyzjJcgjList);
+        gyzjJcgjService.saveBatchWithLog(gyzjJcgjList);
         gyzjTzService.saveBatch(gyzjTzList);
     }
 
@@ -677,7 +677,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
                 formData.put("处置人", clr.getNickName());
                 formData.put("复核人", fhr.getNickName());
                 formData.put("监督人", jdr.getNickName());
-                gyzjJcgjList.add(gyzjJcgjService.getJcgj(gyzj.getId(), JcgjlxEnum.lc.getValue(), "处置容器", JcmcysEnum.green.getValue(), formData, clr, null));
+                gyzjJcgjList.add(gyzjJcgjService.getJcgj(gyzj, JcgjlxEnum.lc.getValue(), "处置容器", JcmcysEnum.green.getValue(), formData, clr, null));
                 //台账
                 gyzjTzList.add(gyzjTzService.getTz(gyzj.getId(), null, null, null, null, null, null, null, null, clr, "处置容器", null, null, gyzjPlffItemFilter.get(0).getCzyy()));
                 gyzj.setRqzt(RqztEnum.ycz.getValue());
@@ -686,7 +686,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
             }
         }
         this.updateBatchById(gyzjList);
-        gyzjJcgjService.saveBatch(gyzjJcgjList);
+        gyzjJcgjService.saveBatchWithLog(gyzjJcgjList);
         gyzjTzService.saveBatch(gyzjTzList);
     }
 
@@ -784,7 +784,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
             formData.put("钥匙1领取人", lqr1.getNickName());
             formData.put("钥匙2领取人", lqr2.getNickName());
             formData.put("发放人", ffr1.getNickName());
-            gyzjJcgjList.add(gyzjJcgjService.getJcgj(gyzj.getId(), JcgjlxEnum.lc.getValue(), "钥匙发放", JcmcysEnum.green.getValue(), formData, null, null));
+            gyzjJcgjList.add(gyzjJcgjService.getJcgj(gyzj, JcgjlxEnum.lc.getValue(), "钥匙发放", JcmcysEnum.green.getValue(), formData, null, null));
         }
         if (StringUtils.isBlank(zcg.getGlyj())) {
             zcg.setGlyj(glyj);
@@ -798,7 +798,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
         zcg.setZt(zcgJyztEnum.jyz.getValue());
         zcgService.updateById(zcg);
         this.updateBatchById(gyzjList);
-        gyzjJcgjService.saveBatch(gyzjJcgjList);
+        gyzjJcgjService.saveBatchWithLog(gyzjJcgjList);
         if (gyzjFfjlList.size() > 0) {
             gyzjFfjlService.updateBatchById(gyzjFfjlList);
         }
@@ -921,7 +921,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
                 formData.put("领取人2", lqr2.getNickName());
                 formData.put("发放人", ffr1.getNickName());
                 formData.put("发放人2", ffr2.getNickName());
-                gyzjJcgjList.add(gyzjJcgjService.getJcgj(gyzj.getId(), JcgjlxEnum.lc.getValue(), "领取发放", JcmcysEnum.green.getValue(), formData, ffr1, plffItemFilter.get(0).getRemark()));
+                gyzjJcgjList.add(gyzjJcgjService.getJcgj(gyzj, JcgjlxEnum.lc.getValue(), "领取发放", JcmcysEnum.green.getValue(), formData, ffr1, plffItemFilter.get(0).getRemark()));
                 //台账
                 gyzjTzList.add(gyzjTzService.getTz(gyzj.getId(), lqr1, lqr2, null, null, ffr1, ffr2, null, null, null, "领取发放", gyzj.getKc(), gyzj.getKcdw(), plffItemFilter.get(0).getRemark()));
                 //region 更新发放信息
@@ -938,7 +938,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
                 throw new ServiceException("给药制剂【" + gyzj.getMc() + "】不存在或已删除");
             }
         }
-        gyzjJcgjService.saveBatch(gyzjJcgjList);
+        gyzjJcgjService.saveBatchWithLog(gyzjJcgjList);
         gyzjTzService.saveBatch(gyzjTzList);
         this.saveOrUpdateBatch(gyzjList);
     }
@@ -974,7 +974,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
             throw new ServiceException("你没有修改任何内容");
         }
         for (ObjectCompareUtil.FieldChange fieldChange : fieldChanges) {
-            gyzjJcgjList.add(gyzjJcgjService.getJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "申请编辑", JcmcysEnum.green.getValue(), fieldChange.toString(), fieldChange.toEnString(), qmr, null));
+            gyzjJcgjList.add(gyzjJcgjService.getJcgj(gyzjOld, JcgjlxEnum.lc.getValue(), "申请编辑", JcmcysEnum.green.getValue(), fieldChange.toString(), fieldChange.toEnString(), qmr, null));
         }
         gyzjOld.setMcbj(form.getMc());
         gyzjOld.setNdbj(form.getNd());
@@ -988,7 +988,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
         gyzjOld.setBjrMc(SecurityUtils.getNickName());
         gyzjOld.setBjzt(BjEnum.shz.getValue());
         this.updateById(gyzjOld);
-        gyzjJcgjService.saveBatch(gyzjJcgjList);
+        gyzjJcgjService.saveBatchWithLog(gyzjJcgjList);
     }
 
     /**
@@ -1082,7 +1082,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
 
         //region 稽查轨迹
         for (ObjectCompareUtil.FieldChange fieldChange : fieldChanges) {
-            gyzjJcgjList.add(gyzjJcgjService.getJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "修改库存申请", JcmcysEnum.green.getValue(), fieldChange.toString(), fieldChange.toEnString(), qmr, null));
+            gyzjJcgjList.add(gyzjJcgjService.getJcgj(gyzjOld, JcgjlxEnum.lc.getValue(), "修改库存申请", JcmcysEnum.green.getValue(), fieldChange.toString(), fieldChange.toEnString(), qmr, null));
         }
         //endregion
 
@@ -1093,7 +1093,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
         gyzjOld.setKcbjzt(KcbjEnum.shz.getValue());
         gyzjOld.setKcbjbz(form.getKcbjbz());
         this.updateById(gyzjOld);
-        gyzjJcgjService.saveBatch(gyzjJcgjList);
+        gyzjJcgjService.saveBatchWithLog(gyzjJcgjList);
 
     }
 
@@ -1495,7 +1495,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
                                 gyzj.setKc(studyFormFillResource.getKc());
                                 gyzj.setSxrq(DateUtils.parseDate(studyFormFillResource.getSxrq()));
                                 this.saveOrUpdate(gyzj);if(isAdd){gyzjList.add(gyzj);}gyzjMap.put(gyzj.getBh(), gyzj);
-                                jcgjList.add(gyzjJcgjService.getJcgj(gyzj.getId(), JcgjlxEnum.lc.getValue(), "配制完成", JcmcysEnum.green.getValue(), null, null, qmr, remark));
+                                jcgjList.add(gyzjJcgjService.getJcgj(gyzj, JcgjlxEnum.lc.getValue(), "配制完成", JcmcysEnum.green.getValue(), null, null, qmr, remark));
                                 tzList.add(gyzjTzService.getTzGen(gyzj.getId(), null, null, null, null, null, null, null, null, qmr, "配制完成", gyzj.getKc(), gyzj.getKcdw(), remark, studyFormFill.getId()));
                             }
                             studyFormFillResource.setType(StudyFormFillResourceTypeEnum.gyzj.getValue());
@@ -1511,7 +1511,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
                             baseMapper.updateKc(gyzj.getId(), kc);
                             HashMap<String, String> formData = new LinkedHashMap<>();
                             formData.put("使用量", syl + studyFormFillResource.getSyldw());
-                            jcgjList.add(gyzjJcgjService.getJcgj(gyzj.getId(), JcgjlxEnum.lc.getValue(), "使用", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(GyzjJcnrUtil.getMapEn(formData)), qmr, remark));
+                            jcgjList.add(gyzjJcgjService.getJcgj(gyzj, JcgjlxEnum.lc.getValue(), "使用", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(GyzjJcnrUtil.getMapEn(formData)), qmr, remark));
                             tzList.add(gyzjTzService.getTzGen(gyzj.getId(), null, null, null, null, null, null, null, null, qmr, "使用", syl, studyFormFillResource.getSyldw(), remark, studyFormFill.getId()));
                         }
                         gyzjMap.put(gyzj.getBh(), gyzj);
@@ -1524,7 +1524,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
             cc(studyFormFill, gyzjMap, jcgjList, tzList, remark, qmr);cz(studyFormFill, gyzjMap, jcgjList, tzList, remark, qmr);
         }
         if (jcgjList.size() > 0) {
-            gyzjJcgjService.saveBatch(jcgjList);
+            gyzjJcgjService.saveBatchWithLog(jcgjList);
         }
         if (tzList.size() > 0) {
             gyzjTzService.saveBatch(tzList);
@@ -1570,7 +1570,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
             }
         }
         if (jcgjList.size() > 0) {
-            gyzjJcgjService.saveBatch(jcgjList);
+            gyzjJcgjService.saveBatchWithLog(jcgjList);
         }
         if (tzList.size() > 0) {
             gyzjTzService.saveBatch(tzList);
@@ -1606,7 +1606,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
                             HashMap<String, String> formData = new HashMap<>(2);
                             formData.put("存储位置", studyFormFillCc.getCcwz());
                             formData.put("存储条件", studyFormFillCc.getCctj());
-                            jcgjList.add(gyzjJcgjService.getJcgj(gyzj.getId(), JcgjlxEnum.lc.getValue(), "存储", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(GyzjJcnrUtil.getMapEn(formData)), qmr, remark));
+                            jcgjList.add(gyzjJcgjService.getJcgj(gyzj, JcgjlxEnum.lc.getValue(), "存储", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(GyzjJcnrUtil.getMapEn(formData)), qmr, remark));
                             // 台账
                             tzList.add(gyzjTzService.getTzGen(gyzj.getId(), null, null, null, null, null, null, null, null, qmr, "存储", gyzj.getKc(), gyzj.getKcdw(), remark, studyFormFill.getId()));
                         }
@@ -1647,7 +1647,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
                             HashMap<String, String> formData = new HashMap<>(2);
                             formData.put("处置方式", studyFormFillCz.getCzfs());
                             formData.put("处置量", gyzj.getKc() + gyzj.getKcdw());
-                            jcgjList.add(gyzjJcgjService.getJcgj(gyzj.getId(), JcgjlxEnum.lc.getValue(), "处置", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(GyzjJcnrUtil.getMapEn(formData)), qmr, remark));
+                            jcgjList.add(gyzjJcgjService.getJcgj(gyzj, JcgjlxEnum.lc.getValue(), "处置", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(GyzjJcnrUtil.getMapEn(formData)), qmr, remark));
 
                             // 台账
                             tzList.add(gyzjTzService.getTzGen(gyzj.getId(), null, null, null, null, null, null, null, null, qmr, "处置", gyzj.getKc(), gyzj.getKcdw(), remark, studyFormFill.getId()));
@@ -1927,11 +1927,11 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
         for (Gyzj gyzj : gyzjList) {
             gyzj.setJyzt(JyztEnum.wjy.getValue());
             //稽查轨迹
-            gyzjFfjlJcgjList.add(gyzjJcgjService.getJcgj(gyzj.getId(), JcgjlxEnum.lc.getValue(), "到期自动归还", JcmcysEnum.green.getValue(), null, null, null));
+            gyzjFfjlJcgjList.add(gyzjJcgjService.getJcgj(gyzj, JcgjlxEnum.lc.getValue(), "到期自动归还", JcmcysEnum.green.getValue(), null, null, null));
         }
         this.updateBatchById(gyzjList);
         if (gyzjFfjlJcgjList.size() > 0) {
-            gyzjJcgjService.saveBatch(gyzjFfjlJcgjList);
+            gyzjJcgjService.saveBatchWithLog(gyzjFfjlJcgjList);
         }
     }
 

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

@@ -59,15 +59,14 @@ public class MjyFfjlJcgjServiceImpl extends ServiceImpl
 
     /**
      * 批量保存稽查轨迹-并保留日志
-     * @param mjyFfjl
      * @param jcgjList
      */
     @Override
     @Async
-    public void saveBatchWithLog(MjyFfjl mjyFfjl, List<MjyFfjlJcgj> jcgjList) {
+    public void saveBatchWithLog(List<MjyFfjlJcgj> jcgjList) {
         this.saveBatch(jcgjList);
         for (MjyFfjlJcgj jcgj : jcgjList) {
-            systemLogService.saveInfo(mjyFfjl.getBh(), mjyFfjl.getBh(), jcgj.getJcmc(), jcgj.getJcmcEn(),
+            systemLogService.saveInfo(jcgj.getFfjlBh(), jcgj.getFfjlBh(), jcgj.getJcmc(), jcgj.getJcmcEn(),
                     jcgj.getJcnr(), jcgj.getJcnrEn(), jcgj.getQmrId(), jcgj.getQmrMc(), jcgj.getQmrMcEn(), jcgj.getRemark());
         }
     }
@@ -86,6 +85,7 @@ public class MjyFfjlJcgjServiceImpl extends ServiceImpl
     public  void saveJcgj(MjyFfjl mjyFfjl, Integer jcgjlx, String jcmc, Integer jcmcys, Map<String, String> jcnr,SysUser qmr,String remark){
         MjyFfjlJcgj mjyFfjlJcgj = new MjyFfjlJcgj();
         mjyFfjlJcgj.setFfjlId(mjyFfjl.getId());
+        mjyFfjlJcgj.setFfjlBh(mjyFfjl.getBh());
         mjyFfjlJcgj.setJcgjlx(jcgjlx);
         mjyFfjlJcgj.setJcmc(jcmc);
         mjyFfjlJcgj.setJcmcEn(MjyJcnrUtil.getEn(jcmc));
@@ -106,7 +106,7 @@ public class MjyFfjlJcgjServiceImpl extends ServiceImpl
 
     /**
      * 新增稽查轨迹
-     * @param ffjlId 发放记录id
+     * @param mjyFfjl 发放记录
      * @param jcgjlx 稽查轨迹类型:1:流程；3：编辑
      * @param jcmc 稽查名称
      * @param jcmcys 稽查名称颜色：1：蓝色；3：红色；5：绿色；7：橙色
@@ -115,9 +115,10 @@ public class MjyFfjlJcgjServiceImpl extends ServiceImpl
      * @param remark 备注
      */
     @Override
-    public  MjyFfjlJcgj getJcgj(Long  ffjlId, Integer jcgjlx, String jcmc, Integer jcmcys, Map<String, String> jcnr,SysUser qmr,String remark){
+    public  MjyFfjlJcgj getJcgj(MjyFfjl mjyFfjl,Integer jcgjlx, String jcmc, Integer jcmcys, Map<String, String> jcnr,SysUser qmr,String remark){
         MjyFfjlJcgj mjyFfjlJcgj = new MjyFfjlJcgj();
-        mjyFfjlJcgj.setFfjlId(ffjlId);
+        mjyFfjlJcgj.setFfjlId(mjyFfjl.getId());
+        mjyFfjlJcgj.setFfjlBh(mjyFfjl.getBh());
         mjyFfjlJcgj.setJcgjlx(jcgjlx);
         mjyFfjlJcgj.setJcmc(jcmc);
         mjyFfjlJcgj.setJcmcEn(MjyJcnrUtil.getEn(jcmc));

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

@@ -244,12 +244,12 @@ public class MjyFfjlServiceImpl extends ServiceImpl impl
                 mjyFfjl.setGdsqrId(qmr.getUserId());
                 mjyFfjl.setGdsqrMc(qmr.getNickName());
                 // 稽查轨迹
-                mjyFfjlJcgjList.add(mjyFfjlJcgjService.getJcgj(mjyFfjl.getId(), JcgjlxEnum.lc.getValue(), "申请归档", JcmcysEnum.green.getValue(), null, qmr,form.getRemark()));
+                mjyFfjlJcgjList.add(mjyFfjlJcgjService.getJcgj(mjyFfjl, JcgjlxEnum.lc.getValue(), "申请归档", JcmcysEnum.green.getValue(), null, qmr,form.getRemark()));
                 //保存日志
                 archiveLogService.saveInfo(ArchiveLogTypeEnum.mjylqff, mjyFfjl.getId(), mjyFfjl.getMc(), mjyFfjl.getBh(), mjyFfjl.getNd()+mjyFfjl.getNddw(), "申请解档");
             }
             this.updateBatchById(mjyFfjlList);
-            mjyFfjlJcgjService.saveBatch(mjyFfjlJcgjList);
+            mjyFfjlJcgjService.saveBatchWithLog(mjyFfjlJcgjList);
         }
     }
 
@@ -311,10 +311,10 @@ public class MjyFfjlServiceImpl extends ServiceImpl impl
             //锁定
             mjyFfjl.setJlzt(JlztEnum.ysd.getValue());
             // 稽查轨迹
-            mjyFfjlJcgjList.add(mjyFfjlJcgjService.getJcgj(mjyFfjl.getId(), JcgjlxEnum.lc.getValue(), "锁定发放记录", JcmcysEnum.green.getValue(), null, qmr,form.getRemark()));
+            mjyFfjlJcgjList.add(mjyFfjlJcgjService.getJcgj(mjyFfjl, JcgjlxEnum.lc.getValue(), "锁定发放记录", JcmcysEnum.green.getValue(), null, qmr,form.getRemark()));
         }
         this.updateBatchById(mjyFfjlList);
-        mjyFfjlJcgjService.saveBatch(mjyFfjlJcgjList);
+        mjyFfjlJcgjService.saveBatchWithLog(mjyFfjlJcgjList);
 
     }
 
@@ -776,11 +776,11 @@ public class MjyFfjlServiceImpl extends ServiceImpl impl
         for(MjyFfjl mjyFfjl:mjyFfjlList){
             mjyFfjl.setJlzt(JyztEnum.wjy.getValue());
             //稽查轨迹
-            mjyFfjlJcgjList.add(mjyFfjlJcgjService.getJcgj(mjyFfjl.getId(), JcgjlxEnum.lc.getValue(), "到期自动归还", JcmcysEnum.green.getValue(), null, null, null));
+            mjyFfjlJcgjList.add(mjyFfjlJcgjService.getJcgj(mjyFfjl, JcgjlxEnum.lc.getValue(), "到期自动归还", JcmcysEnum.green.getValue(), null, null, null));
         }
         this.updateBatchById(mjyFfjlList);
         if(mjyFfjlJcgjList.size()>0){
-            mjyFfjlJcgjService.saveBatch(mjyFfjlJcgjList);
+            mjyFfjlJcgjService.saveBatchWithLog(mjyFfjlJcgjList);
         }
     }
 

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

@@ -59,15 +59,14 @@ public class MjyJcgjServiceImpl extends ServiceImpl impl
 
     /**
      * 批量保存稽查轨迹-并保留日志
-     * @param mjy
      * @param jcgjList
      */
     @Override
     @Async
-    public void saveBatchWithLog(Mjy mjy, List<MjyJcgj> jcgjList) {
+    public void saveBatchWithLog( List<MjyJcgj> jcgjList) {
         this.saveBatch(jcgjList);
         for (MjyJcgj jcgj : jcgjList) {
-            systemLogService.saveInfo(mjy.getBh(), mjy.getBh(), jcgj.getJcmc(), jcgj.getJcmcEn(),
+            systemLogService.saveInfo(jcgj.getMjyBh(), jcgj.getMjyBh(), jcgj.getJcmc(), jcgj.getJcmcEn(),
                     jcgj.getJcnr(), jcgj.getJcnrEn(), jcgj.getQmrId(), jcgj.getQmrMc(), jcgj.getQmrMcEn(), jcgj.getRemark());
         }
     }
@@ -86,6 +85,7 @@ public class MjyJcgjServiceImpl extends ServiceImpl impl
     public  void saveJcgj(Mjy  mjy, Integer jcgjlx, String jcmc, Integer jcmcys, Map<String, String> jcnr, SysUser qmr, String remark){
         MjyJcgj mjyJcgj = new MjyJcgj();
         mjyJcgj.setMjyId(mjy.getId());
+        mjyJcgj.setMjyBh(mjy.getBh());
         mjyJcgj.setJcgjlx(jcgjlx);
         mjyJcgj.setJcmc(jcmc);
         mjyJcgj.setJcmcEn(MjyJcnrUtil.getEn(jcmc));
@@ -107,7 +107,7 @@ public class MjyJcgjServiceImpl extends ServiceImpl impl
 
     /**
      * 新增稽查轨迹
-     * @param mjyId 麻精药id
+     * @param mjy 麻精药
      * @param jcgjlx 稽查轨迹类型:1:流程；3：编辑
      * @param jcmc 稽查名称
      * @param jcmcys 稽查名称颜色：1：蓝色；3：红色；5：绿色；7：橙色
@@ -116,9 +116,10 @@ public class MjyJcgjServiceImpl extends ServiceImpl impl
      * @param remark 备注
      */
     @Override
-    public  MjyJcgj getJcgj(Long  mjyId, Integer jcgjlx, String jcmc, Integer jcmcys, Map<String, String> jcnr, SysUser qmr, String remark){
+    public  MjyJcgj getJcgj(Mjy  mjy, Integer jcgjlx, String jcmc, Integer jcmcys, Map<String, String> jcnr, SysUser qmr, String remark){
         MjyJcgj mjyJcgj = new MjyJcgj();
-        mjyJcgj.setMjyId(mjyId);
+        mjyJcgj.setMjyId(mjy.getId());
+        mjyJcgj.setMjyBh(mjy.getBh());
         mjyJcgj.setJcgjlx(jcgjlx);
         mjyJcgj.setJcmc(jcmc);
         mjyJcgj.setJcmcEn(MjyJcnrUtil.getEn(jcmc));
@@ -138,7 +139,7 @@ public class MjyJcgjServiceImpl extends ServiceImpl impl
 
     /**
      * 新增稽查轨迹
-     * @param mjyId 麻精药id
+     * @param mjy 麻精药
      * @param jcgjlx 稽查轨迹类型:1:流程；3：编辑
      * @param jcmc 稽查名称
      * @param jcmcys 稽查名称颜色：1：蓝色；3：红色；5：绿色；7：橙色
@@ -148,9 +149,10 @@ public class MjyJcgjServiceImpl extends ServiceImpl impl
      * @param remark 备注
      */
     @Override
-    public  MjyJcgj getJcgj(Long  mjyId, Integer jcgjlx, String jcmc, Integer jcmcys, String jcnr,String jcnrEn, SysUser qmr, String remark){
+    public  MjyJcgj getJcgj(Mjy  mjy,  Integer jcgjlx, String jcmc, Integer jcmcys, String jcnr,String jcnrEn, SysUser qmr, String remark){
         MjyJcgj mjyJcgj = new MjyJcgj();
-        mjyJcgj.setMjyId(mjyId);
+        mjyJcgj.setMjyId(mjy.getId());
+        mjyJcgj.setMjyBh(mjy.getBh());
         mjyJcgj.setJcgjlx(jcgjlx);
         mjyJcgj.setJcmc(jcmc);
         mjyJcgj.setJcmcEn(MjyJcnrUtil.getEn(jcmc));

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

@@ -256,12 +256,12 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
                 mjy.setGdsqrId(qmr.getUserId());
                 mjy.setGdsqrMc(qmr.getNickName());
                 //稽查轨迹
-                mjyJcgjList.add(mjyJcgjService.getJcgj(mjy.getId(), JcgjlxEnum.lc.getValue(), "申请归档", JcmcysEnum.orange.getValue(), null, qmr, form.getRemark()));
+                mjyJcgjList.add(mjyJcgjService.getJcgj(mjy, JcgjlxEnum.lc.getValue(), "申请归档", JcmcysEnum.orange.getValue(), null, qmr, form.getRemark()));
                 //保存日志
                 archiveLogService.saveInfo(ArchiveLogTypeEnum.mjy, mjy.getId(), mjy.getMc(), mjy.getBh(), mjy.getNd() + mjy.getNddw(), "申请归档");
             }
             this.updateBatchById(mjyList);
-            mjyJcgjService.saveBatch(mjyJcgjList);
+            mjyJcgjService.saveBatchWithLog(mjyJcgjList);
         }
     }
 
@@ -325,10 +325,10 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
             //锁定
             mjy.setZjzt(ZjztEnum.ysd.getValue());
             //稽查轨迹
-            mjyJcgjList.add(mjyJcgjService.getJcgj(mjy.getId(), JcgjlxEnum.lc.getValue(), "锁定麻精药", JcmcysEnum.orange.getValue(), null, qmr, form.getRemark()));
+            mjyJcgjList.add(mjyJcgjService.getJcgj(mjy, JcgjlxEnum.lc.getValue(), "锁定麻精药", JcmcysEnum.orange.getValue(), null, qmr, form.getRemark()));
         }
         this.updateBatchById(mjyList);
-        mjyJcgjService.saveBatch(mjyJcgjList);
+        mjyJcgjService.saveBatchWithLog(mjyJcgjList);
 
     }
 
@@ -439,7 +439,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
                 formData.put("处置人", clr.getNickName());
                 formData.put("复核人", fhr.getNickName());
                 formData.put("监督人", jdr.getNickName());
-                mjyJcgjList.add(mjyJcgjService.getJcgj(mjy.getId(), JcgjlxEnum.lc.getValue(), "处置药剂", JcmcysEnum.orange.getValue(), formData, null, null));
+                mjyJcgjList.add(mjyJcgjService.getJcgj(mjy, JcgjlxEnum.lc.getValue(), "处置药剂", JcmcysEnum.orange.getValue(), formData, null, null));
                 //台账
                 mjyTzList.add(mjyTzService.getTz(mjy.getId(), null, null, null, null, null, null, null, null, clr, "处置药剂", mjyPlffItemFilter.get(0).getCzl(), mjy.getKcdw(), mjyPlffItemFilter.get(0).getCzyy()));
             } else {
@@ -447,7 +447,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
             }
         }
         this.updateBatchById(mjyList);
-        mjyJcgjService.saveBatch(mjyJcgjList);
+        mjyJcgjService.saveBatchWithLog(mjyJcgjList);
         mjyTzService.saveBatch(mjyTzList);
     }
 
@@ -546,7 +546,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
                 formData.put("处置人", clr.getNickName());
                 formData.put("复核人", fhr.getNickName());
                 formData.put("监督人", jdr.getNickName());
-                mjyJcgjList.add(mjyJcgjService.getJcgj(mjy.getId(), JcgjlxEnum.lc.getValue(), "处置容器", JcmcysEnum.green.getValue(), formData, null, null));
+                mjyJcgjList.add(mjyJcgjService.getJcgj(mjy, JcgjlxEnum.lc.getValue(), "处置容器", JcmcysEnum.green.getValue(), formData, null, null));
                 //台账
                 mjyTzList.add(mjyTzService.getTz(mjy.getId(), null, null, null, null, null, null, null, null, clr, "处置容器", null, null, mjyPlffItemFilter.get(0).getCzyy()));
                 mjy.setRqzt(RqztEnum.ycz.getValue());
@@ -556,7 +556,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
             }
         }
         this.updateBatchById(mjyList);
-        mjyJcgjService.saveBatch(mjyJcgjList);
+        mjyJcgjService.saveBatchWithLog(mjyJcgjList);
         mjyTzService.saveBatch(mjyTzList);
     }
 
@@ -657,7 +657,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
             formData.put("钥匙1领取人", lqr1.getNickName());
             formData.put("钥匙2领取人", lqr2.getNickName());
             formData.put("发放人", ffr1.getNickName());
-            mjyJcgjList.add(mjyJcgjService.getJcgj(mjy.getId(), JcgjlxEnum.lc.getValue(), "钥匙发放", JcmcysEnum.green.getValue(), formData, null, null));
+            mjyJcgjList.add(mjyJcgjService.getJcgj(mjy, JcgjlxEnum.lc.getValue(), "钥匙发放", JcmcysEnum.green.getValue(), formData, null, null));
         }
         if (StringUtils.isBlank(zcg.getGlyj())) {
             zcg.setGlyj(glyj);
@@ -671,7 +671,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
         zcg.setZt(zcgJyztEnum.jyz.getValue());
         zcgService.updateById(zcg);
         this.updateBatchById(mjyList);
-        mjyJcgjService.saveBatch(mjyJcgjList);
+        mjyJcgjService.saveBatchWithLog(mjyJcgjList);
         if (mjyFfjlList.size() > 0) {
             mjyFfjlService.updateBatchById(mjyFfjlList);
         }
@@ -804,7 +804,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
                 formData.put("领取人2", lqr2.getNickName());
                 formData.put("发放人", ffr1.getNickName());
                 formData.put("发放人2", ffr2.getNickName());
-                mjyJcgjList.add(mjyJcgjService.getJcgj(mjy.getId(), JcgjlxEnum.lc.getValue(), "领取发放", JcmcysEnum.green.getValue(), formData, ffr1, plffItemFilter.get(0).getRemark()));
+                mjyJcgjList.add(mjyJcgjService.getJcgj(mjy, JcgjlxEnum.lc.getValue(), "领取发放", JcmcysEnum.green.getValue(), formData, ffr1, plffItemFilter.get(0).getRemark()));
                 //台账
                 mjyTzList.add(mjyTzService.getTz(mjy.getId(), lqr1, lqr2, null, null, ffr1, ffr2, null, null, null, "领取发放", mjy.getKc(), mjy.getKcdw(), plffItemFilter.get(0).getRemark()));
                 //更新发放信息
@@ -830,7 +830,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
                 throw new ServiceException("麻精药【" + mjy.getMc() + "】不存在或已删除");
             }
         }
-        mjyJcgjService.saveBatch(mjyJcgjList);
+        mjyJcgjService.saveBatchWithLog(mjyJcgjList);
         mjyTzService.saveBatch(mjyTzList);
         this.updateBatchById(mjyList);
     }
@@ -866,7 +866,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
             throw new ServiceException("你没有修改任何内容");
         }
         for (ObjectCompareUtil.FieldChange fieldChange : fieldChanges) {
-            mjyJcgjList.add(mjyJcgjService.getJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "申请编辑", JcmcysEnum.green.getValue(), fieldChange.toString(), fieldChange.toEnString(), qmr, null));
+            mjyJcgjList.add(mjyJcgjService.getJcgj(mjyOld, JcgjlxEnum.lc.getValue(), "申请编辑", JcmcysEnum.green.getValue(), fieldChange.toString(), fieldChange.toEnString(), qmr, null));
         }
         mjyOld.setMcbj(form.getMc());
         mjyOld.setNdbj(form.getNd());
@@ -879,7 +879,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
         mjyOld.setBjrMc(SecurityUtils.getNickName());
         mjyOld.setBjzt(BjEnum.shz.getValue());
         this.updateById(mjyOld);
-        mjyJcgjService.saveBatch(mjyJcgjList);
+        mjyJcgjService.saveBatchWithLog(mjyJcgjList);
     }
 
     /**
@@ -971,7 +971,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
         List<MjyJcgj> mjyJcgjList = new ArrayList<>();
         //region 稽查轨迹
         for (ObjectCompareUtil.FieldChange fieldChange : fieldChanges) {
-            mjyJcgjList.add(mjyJcgjService.getJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "修改库存申请", JcmcysEnum.green.getValue(), fieldChange.toString(), fieldChange.toEnString(), qmr, null));
+            mjyJcgjList.add(mjyJcgjService.getJcgj(mjyOld, JcgjlxEnum.lc.getValue(), "修改库存申请", JcmcysEnum.green.getValue(), fieldChange.toString(), fieldChange.toEnString(), qmr, null));
         }
         //endregion
 
@@ -982,7 +982,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
         mjyOld.setKcbjzt(KcbjEnum.shz.getValue());
         mjyOld.setKcbjbz(form.getKcbjbz());
         this.updateById(mjyOld);
-        mjyJcgjService.saveBatch(mjyJcgjList);
+        mjyJcgjService.saveBatchWithLog(mjyJcgjList);
 
     }
 
@@ -1270,7 +1270,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
                                 mjy.setKcdw(studyFormFillResource.getKcdw());
                                 mjy.setSxrq(DateUtils.parseDate(studyFormFillResource.getSxrq()));
                                 this.saveOrUpdate(mjy);if(isAdd){mjyList.add(mjy);}mjyMap.put(mjy.getBh(), mjy);
-                                jcgjList.add(mjyJcgjService.getJcgj(mjy.getId(), JcgjlxEnum.lc.getValue(), "配制完成", JcmcysEnum.green.getValue(), null, null, qmr, remark));
+                                jcgjList.add(mjyJcgjService.getJcgj(mjy, JcgjlxEnum.lc.getValue(), "配制完成", JcmcysEnum.green.getValue(), null, null, qmr, remark));
                                 tzList.add(mjyTzService.getTzGen(mjy.getId(), null, null, null, null, null, null, null, null, qmr, "配制完成", mjy.getKc(), mjy.getKcdw(), remark, studyFormFill.getId()));
                             }
                             studyFormFillResource.setType(StudyFormFillResourceTypeEnum.mjy.getValue());
@@ -1286,7 +1286,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
                             baseMapper.updateKc(mjy.getId(), kc);
                             HashMap<String, String> formData = new LinkedHashMap<>();
                             formData.put("使用量", syl + studyFormFillResource.getSyldw());
-                            jcgjList.add(mjyJcgjService.getJcgj(mjy.getId(), JcgjlxEnum.lc.getValue(), "使用", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(MjyJcnrUtil.getMapEn(formData)), qmr, remark));
+                            jcgjList.add(mjyJcgjService.getJcgj(mjy, JcgjlxEnum.lc.getValue(), "使用", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(MjyJcnrUtil.getMapEn(formData)), qmr, remark));
                             tzList.add(mjyTzService.getTzGen(mjy.getId(), null, null, null, null, null, null, null, null, qmr, "使用", syl, studyFormFillResource.getSyldw(), remark, studyFormFill.getId()));
                         }
                         mjyMap.put(mjy.getBh(), mjy);
@@ -1299,7 +1299,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
             cc(studyFormFill, mjyMap, jcgjList, tzList, remark, qmr); cz(studyFormFill, mjyMap, jcgjList, tzList, remark, qmr);
         }
         if (jcgjList.size() > 0) {
-            mjyJcgjService.saveBatch(jcgjList);
+            mjyJcgjService.saveBatchWithLog(jcgjList);
         }
         if (tzList.size() > 0) {
             mjyTzService.saveBatch(tzList);
@@ -1345,7 +1345,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
             }
         }
         if (jcgjList.size() > 0) {
-            mjyJcgjService.saveBatch(jcgjList);
+            mjyJcgjService.saveBatchWithLog(jcgjList);
         }
         if (tzList.size() > 0) {
             mjyTzService.saveBatch(tzList);
@@ -1383,7 +1383,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
                             HashMap<String, String> formData = new HashMap<>(2);
                             formData.put("处置方式", studyFormFillCz.getCzfs());
                             formData.put("处置量", mjy.getKc() + mjy.getKcdw());
-                            jcgjList.add(mjyJcgjService.getJcgj(mjy.getId(), JcgjlxEnum.lc.getValue(), "处置", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(MjyJcnrUtil.getMapEn(formData)), qmr, remark));
+                            jcgjList.add(mjyJcgjService.getJcgj(mjy, JcgjlxEnum.lc.getValue(), "处置", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(MjyJcnrUtil.getMapEn(formData)), qmr, remark));
 
                             // 台账
                             tzList.add(mjyTzService.getTzGen(mjy.getId(), null, null, null, null, null, null, null, null, qmr, "处置", mjy.getKc(), mjy.getKcdw(), remark, studyFormFill.getId()));
@@ -1423,7 +1423,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
                             HashMap<String, String> formData = new HashMap<>(2);
                             formData.put("存储位置", studyFormFillCc.getCcwz());
                             formData.put("存储条件", studyFormFillCc.getCctj());
-                            jcgjList.add(mjyJcgjService.getJcgj(mjy.getId(), JcgjlxEnum.lc.getValue(), "存储", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(MjyJcnrUtil.getMapEn(formData)), qmr, remark));
+                            jcgjList.add(mjyJcgjService.getJcgj(mjy, JcgjlxEnum.lc.getValue(), "存储", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(MjyJcnrUtil.getMapEn(formData)), qmr, remark));
                             // 台账
                             tzList.add(mjyTzService.getTzGen(mjy.getId(), null, null, null, null, null, null, null, null, qmr, "存储", mjy.getKc(), mjy.getKcdw(), remark, studyFormFill.getId()));
                         }
@@ -1701,11 +1701,11 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
         for (Mjy mjy : mjyList) {
             mjy.setJyzt(JyztEnum.wjy.getValue());
             //稽查轨迹
-            mjyFfjlJcgjList.add(mjyJcgjService.getJcgj(mjy.getId(), JcgjlxEnum.lc.getValue(), "到期自动归还", JcmcysEnum.green.getValue(), null, null, null));
+            mjyFfjlJcgjList.add(mjyJcgjService.getJcgj(mjy, JcgjlxEnum.lc.getValue(), "到期自动归还", JcmcysEnum.green.getValue(), null, null, null));
         }
         this.updateBatchById(mjyList);
         if (mjyFfjlJcgjList.size() > 0) {
-            mjyJcgjService.saveBatch(mjyFfjlJcgjList);
+            mjyJcgjService.saveBatchWithLog(mjyFfjlJcgjList);
         }
     }