fix:[操作日期]全部都是稽查轨迹

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

@@ -34,7 +34,7 @@ public interface IGyzjFfjlJcgjService extends IService
 
     /**
      * 新增稽查轨迹
-     * @param ffjlId 发放记录id
+     * @param gyzjFfjl 发放记录
      * @param jcgjlx 稽查轨迹类型:1:流程；3：编辑
      * @param jcmc 稽查名称
      * @param jcmcys 稽查名称颜色：1：蓝色；3：红色；5：绿色；7：橙色
@@ -43,7 +43,7 @@ public interface IGyzjFfjlJcgjService extends IService
      * @param remark 备注
      * @return
      */
-    public  void saveJcgj(Long  ffjlId, Integer jcgjlx, String jcmc, Integer jcmcys, Map<String, String> jcnr, SysUser qmr, String remark);
+    public  void saveJcgj(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

@@ -33,7 +33,7 @@ public interface IGyzjJcgjService extends IService
 
     /**
      * 新增稽查轨迹
-     * @param mjyId 给药制剂id
+     * @param gyzj 给药制剂
      * @param jcgjlx 稽查轨迹类型:1:流程；3：编辑
      * @param jcmc 稽查名称
      * @param jcmcys 稽查名称颜色：1：蓝色；3：红色；5：绿色；7：橙色
@@ -42,7 +42,7 @@ public interface IGyzjJcgjService extends IService
      * @param remark 备注
      * @return
      */
-    public  void saveJcgj(Long  mjyId, Integer jcgjlx, String jcmc, Integer jcmcys, Map<String, String> jcnr, SysUser qmr, String remark);
+    public  void saveJcgj(Gyzj gyzj, 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/IMjyFfjlJcgjService.java

@@ -32,7 +32,7 @@ public interface IMjyFfjlJcgjService extends IService
 
     /**
      * 新增稽查轨迹
-     * @param ffjlId 发放记录id
+     * @param mjyFfjl 发放记录
      * @param jcgjlx 稽查轨迹类型:1:流程；3：编辑
      * @param jcmc 稽查名称
      * @param jcmcys 稽查名称颜色：1：蓝色；3：红色；5：绿色；7：橙色
@@ -41,7 +41,7 @@ public interface IMjyFfjlJcgjService extends IService
      * @param remark 备注
      * @return
      */
-    public  void saveJcgj(Long  ffjlId, Integer jcgjlx, String jcmc, Integer jcmcys, Map<String, String> jcnr, SysUser qmr, String remark);
+    public  void saveJcgj(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

@@ -31,7 +31,7 @@ public interface IMjyJcgjService extends IService
 
     /**
      * 新增稽查轨迹
-     * @param mjyId 麻精药id
+     * @param mjy 麻精药id
      * @param jcgjlx 稽查轨迹类型:1:流程；3：编辑
      * @param jcmc 稽查名称
      * @param jcmcys 稽查名称颜色：1：蓝色；3：红色；5：绿色；7：橙色
@@ -40,7 +40,7 @@ public interface IMjyJcgjService extends IService
      * @param remark 备注
      * @return
      */
-    public  void saveJcgj(Long  mjyId, Integer jcgjlx, String jcmc, Integer jcmcys, Map<String, String>  jcnr,  SysUser qmr, String remark);
+    public  void saveJcgj(Mjy  mjy, 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/IStudyFormApplyJcgjService.java

@@ -38,7 +38,7 @@ public interface IStudyFormApplyJcgjService extends IService
 
     /**
      * 新增稽查轨迹
-     * @param formId 表单id
+     * @param studyFormApply 表单
      * @param jcgjlx 稽查轨迹类型:1:流程；3：编辑
      * @param jcmc 稽查名称
      * @param jcmcys 稽查名称颜色：1：蓝色；3：红色；5：绿色；7：橙色
@@ -48,7 +48,7 @@ public interface IStudyFormApplyJcgjService extends IService
      * @param time 时间
      * @return
      */
-    public  void saveJcgj(Long  formId, Integer jcgjlx, String jcmc, Integer jcmcys, Map<String, String> jcnr, SysUser qmr, String remark, Date time);
+    public  void saveJcgj(StudyFormApply studyFormApply, Integer jcgjlx, String jcmc, Integer jcmcys, Map<String, String> jcnr, SysUser qmr, String remark, Date time);
 
     /**
      * 新增稽查轨迹

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

@@ -35,7 +35,7 @@ public interface IStudyFormFillJcgjService extends IService
 
     /**
      * 新增稽查轨迹
-     * @param formId 表单id
+     * @param studyFormFill 表单
      * @param jcgjlx 稽查轨迹类型:1:流程；3：编辑
      * @param jcmc 稽查名称
      * @param jcmcys 稽查名称颜色：1：蓝色；3：红色；5：绿色；7：橙色
@@ -45,7 +45,7 @@ public interface IStudyFormFillJcgjService extends IService
      * @param time 时间
      * @return
      */
-    public  void saveJcgj(Long  formId, Integer jcgjlx, String jcmc, Integer jcmcys, Map<String, String> jcnr, SysUser qmr, String remark, Date time);
+    public  void saveJcgj(StudyFormFill studyFormFill, Integer jcgjlx, String jcmc, Integer jcmcys, Map<String, String> jcnr, SysUser qmr, String remark, Date time);
 
     /**
      * 新增稽查轨迹

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

@@ -35,7 +35,7 @@ public interface IStudyFormPlanJcgjService extends IService
 
     /**
      * 新增稽查轨迹
-     * @param formId 表单id
+     * @param studyFormPlan 表单
      * @param jcgjlx 稽查轨迹类型:1:流程；3：编辑
      * @param jcmc 稽查名称
      * @param jcmcys 稽查名称颜色：1：蓝色；3：红色；5：绿色；7：橙色
@@ -45,7 +45,7 @@ public interface IStudyFormPlanJcgjService extends IService
      * @param time 时间
      * @return
      */
-    public  void saveJcgj(Long  formId, Integer jcgjlx, String jcmc, Integer jcmcys, Map<String, String> jcnr, SysUser qmr, String remark, Date time);
+    public  void saveJcgj(StudyFormPlan studyFormPlan, Integer jcgjlx, String jcmc, Integer jcmcys, Map<String, String> jcnr, SysUser qmr, String remark, Date time);
 
     /**
      * 新增稽查轨迹

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

@@ -34,7 +34,7 @@ public interface IStudyFormPreJcgjService extends IService
 
     /**
      * 新增稽查轨迹
-     * @param formId 表单id
+     * @param studyFormPre 表单
      * @param jcgjlx 稽查轨迹类型:1:流程；3：编辑
      * @param jcmc 稽查名称
      * @param jcmcys 稽查名称颜色：1：蓝色；3：红色；5：绿色；7：橙色
@@ -44,7 +44,7 @@ public interface IStudyFormPreJcgjService extends IService
      * @param time 时间
      * @return
      */
-    public  void saveJcgj(Long  formId, Integer jcgjlx, String jcmc, Integer jcmcys, Map<String, String> jcnr, SysUser qmr, String remark, Date time);
+    public  void saveJcgj(StudyFormPre studyFormPre, Integer jcgjlx, String jcmc, Integer jcmcys, Map<String, String> jcnr, SysUser qmr, String remark, Date time);
 
     /**
      * 新增稽查轨迹

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

@@ -74,7 +74,7 @@ public class GyzjFfjlJcgjServiceImpl extends ServiceImpl
 
     /**
      * 新增稽查轨迹
-     * @param ffjlId 发放记录id
+     * @param gyzjFfjl 发放记录
      * @param jcgjlx 稽查轨迹类型:1:流程；3：编辑
      * @param jcmc 稽查名称
      * @param jcmcys 稽查名称颜色：1：蓝色；3：红色；5：绿色；7：橙色
@@ -83,9 +83,9 @@ public class GyzjFfjlJcgjServiceImpl extends ServiceImpl
      * @param remark 备注
      */
     @Override
-    public  void saveJcgj(Long  ffjlId, Integer jcgjlx, String jcmc, Integer jcmcys, Map<String, String> jcnr, SysUser qmr, String remark){
+    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(ffjlId);
+        gyzjFfjlJcgj.setFfjlId(gyzjFfjl.getId());
         gyzjFfjlJcgj.setJcgjlx(jcgjlx);
         gyzjFfjlJcgj.setJcmc(jcmc);
         gyzjFfjlJcgj.setJcmcEn(GyzjJcnrUtil.getEn(jcmc));
@@ -99,6 +99,8 @@ public class GyzjFfjlJcgjServiceImpl extends ServiceImpl
         gyzjFfjlJcgj.setQmrMcEn(qmr.getUserName());
         gyzjFfjlJcgj.setRemark(remark);
         this.save(gyzjFfjlJcgj);
+        systemLogService.saveInfo(gyzjFfjl.getBh(), gyzjFfjl.getBh(), gyzjFfjlJcgj.getJcmc(), gyzjFfjlJcgj.getJcmcEn(),
+                gyzjFfjlJcgj.getJcnr(), gyzjFfjlJcgj.getJcnrEn(), gyzjFfjlJcgj.getQmrId(), gyzjFfjlJcgj.getQmrMc(), gyzjFfjlJcgj.getQmrMcEn(), gyzjFfjlJcgj.getRemark());
     }
 
     /**

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

@@ -131,7 +131,7 @@ public class GyzjFfjlServiceImpl extends ServiceImpl i
             throw new ServiceException("发放回收记录【" + gyzjFfjlOld.getMc() + "】不是未锁定状态，不能加签");
         }
         //稽查轨迹
-        gyzjFfjlJcgjService.saveJcgj(gyzjFfjlOld.getId(), JcgjlxEnum.bcsm.getValue(), "补充说明", JcmcysEnum.orange.getValue(), null,qmr, form.getRemark());
+        gyzjFfjlJcgjService.saveJcgj(gyzjFfjlOld, JcgjlxEnum.bcsm.getValue(), "补充说明", JcmcysEnum.orange.getValue(), null,qmr, form.getRemark());
     }
 
     /**
@@ -167,7 +167,7 @@ public class GyzjFfjlServiceImpl extends ServiceImpl i
         Map<String, String> formData = new LinkedHashMap<>();
         formData.put("借阅开始时间", DateUtils.dateTime(form.getStartDate()));
         formData.put("借阅结束时间", DateUtils.dateTime(form.getEndDate()));
-        gyzjFfjlJcgjService.saveJcgj(gyzjFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "申请借阅", JcmcysEnum.orange.getValue(), formData, qmr, form.getRemark());
+        gyzjFfjlJcgjService.saveJcgj(gyzjFfjlOld, JcgjlxEnum.lc.getValue(), "申请借阅", JcmcysEnum.orange.getValue(), formData, qmr, form.getRemark());
         //保存日志
         archiveLogService.saveInfo(ArchiveLogTypeEnum.gyzjlqff, gyzjFfjlOld.getId(), gyzjFfjlOld.getMc(), gyzjFfjlOld.getBh(), gyzjFfjlOld.getNd()+gyzjFfjlOld.getNddw(), "申请借阅");
 
@@ -212,7 +212,7 @@ public class GyzjFfjlServiceImpl extends ServiceImpl i
         gyzjFfjlOld.setJlzt(JlztEnum.djd.getValue());
         this.updateById(gyzjFfjlOld);
         //稽查轨迹
-        gyzjFfjlJcgjService.saveJcgj(gyzjFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "申请解档", JcmcysEnum.green.getValue(), null, qmr, form.getRemark());
+        gyzjFfjlJcgjService.saveJcgj(gyzjFfjlOld, JcgjlxEnum.lc.getValue(), "申请解档", JcmcysEnum.green.getValue(), null, qmr, form.getRemark());
         //保存日志
         archiveLogService.saveInfo(ArchiveLogTypeEnum.gyzjlqff, gyzjFfjlOld.getId(), gyzjFfjlOld.getMc(), gyzjFfjlOld.getBh(), gyzjFfjlOld.getNd()+gyzjFfjlOld.getNddw(), "申请解档");
     }
@@ -285,7 +285,7 @@ public class GyzjFfjlServiceImpl extends ServiceImpl i
         gyzjFfjlOld.setGdsqrMc(qmr.getNickName());
         this.updateById(gyzjFfjlOld);
         //稽查轨迹
-        gyzjFfjlJcgjService.saveJcgj(gyzjFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "申请归档", JcmcysEnum.green.getValue(), null, qmr, form.getRemark());
+        gyzjFfjlJcgjService.saveJcgj(gyzjFfjlOld, JcgjlxEnum.lc.getValue(), "申请归档", JcmcysEnum.green.getValue(), null, qmr, form.getRemark());
         //保存日志
         archiveLogService.saveInfo(ArchiveLogTypeEnum.gyzjlqff, gyzjFfjlOld.getId(), gyzjFfjlOld.getMc(), gyzjFfjlOld.getBh(), gyzjFfjlOld.getNd()+gyzjFfjlOld.getNddw(), "申请归档");
     }
@@ -348,7 +348,7 @@ public class GyzjFfjlServiceImpl extends ServiceImpl i
         gyzjFfjlOld.setJlzt(JlztEnum.ysd.getValue());
         this.updateById(gyzjFfjlOld);
         //稽查轨迹
-        gyzjFfjlJcgjService.saveJcgj(gyzjFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "锁定发放记录", JcmcysEnum.green.getValue(), null, qmr, form.getRemark());
+        gyzjFfjlJcgjService.saveJcgj(gyzjFfjlOld, JcgjlxEnum.lc.getValue(), "锁定发放记录", JcmcysEnum.green.getValue(), null, qmr, form.getRemark());
 
     }
 
@@ -378,7 +378,7 @@ public class GyzjFfjlServiceImpl extends ServiceImpl i
         gyzjFfjlOld.setJlzt(JlztEnum.wsd.getValue());
         this.updateById(gyzjFfjlOld);
         //稽查轨迹
-        gyzjFfjlJcgjService.saveJcgj(gyzjFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "解锁发放记录", JcmcysEnum.green.getValue(), null, qmr, form.getRemark());
+        gyzjFfjlJcgjService.saveJcgj(gyzjFfjlOld, JcgjlxEnum.lc.getValue(), "解锁发放记录", JcmcysEnum.green.getValue(), null, qmr, form.getRemark());
 
     }
 
@@ -428,7 +428,7 @@ public class GyzjFfjlServiceImpl extends ServiceImpl i
         formData.put("库管员2", jsr2.getNickName());
         formData.put("备注", form.getRemark());
         formData.put("签名意义", "归还");
-        gyzjFfjlJcgjService.saveJcgj(gyzjFfjl.getId(), JcgjlxEnum.lc.getValue(), "确认归还", JcmcysEnum.green.getValue(), formData, SecurityUtils.getLoginUser().getSysUser(), form.getRemark());
+        gyzjFfjlJcgjService.saveJcgj(gyzjFfjl, JcgjlxEnum.lc.getValue(), "确认归还", JcmcysEnum.green.getValue(), formData, SecurityUtils.getLoginUser().getSysUser(), form.getRemark());
 
     }
 
@@ -500,7 +500,7 @@ public class GyzjFfjlServiceImpl extends ServiceImpl i
         formData.put("转移条件", form.getZytj());
         formData.put("出库净重", gyzj.getKc() + gyzj.getKcdw());
         formData.put("目的", form.getMdMcs());
-        gyzjFfjlJcgjService.saveJcgj(gyzjFfjl.getId(), JcgjlxEnum.lc.getValue(), "领取发放", JcmcysEnum.green.getValue(), formData, SecurityUtils.getLoginUser().getSysUser(), form.getRemark());
+        gyzjFfjlJcgjService.saveJcgj(gyzjFfjl, JcgjlxEnum.lc.getValue(), "领取发放", JcmcysEnum.green.getValue(), formData, SecurityUtils.getLoginUser().getSysUser(), form.getRemark());
 
     }
 
@@ -574,7 +574,7 @@ public class GyzjFfjlServiceImpl extends ServiceImpl i
         gyzjFfjlOld.setJlzt(JlztEnum.gd.getValue());
         this.updateById(gyzjFfjlOld);
         //稽查轨迹
-        gyzjFfjlJcgjService.saveJcgj(gyzjFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "同意归档", JcmcysEnum.green.getValue(), null, qmr, form.getRemark());
+        gyzjFfjlJcgjService.saveJcgj(gyzjFfjlOld, JcgjlxEnum.lc.getValue(), "同意归档", JcmcysEnum.green.getValue(), null, qmr, form.getRemark());
         //保存日志
         archiveLogService.saveInfo(ArchiveLogTypeEnum.gyzjlqff, gyzjFfjlOld.getId(), gyzjFfjlOld.getMc(), gyzjFfjlOld.getBh(), gyzjFfjlOld.getNd()+gyzjFfjlOld.getNddw(), "同意归档");
         //通知
@@ -605,7 +605,7 @@ public class GyzjFfjlServiceImpl extends ServiceImpl i
         //稽查轨迹
         Map<String, String> formData = new LinkedHashMap<>();
         formData.put("原因", form.getRemark());
-        gyzjFfjlJcgjService.saveJcgj(gyzjFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "拒绝归档", JcmcysEnum.green.getValue(), formData, qmr, null);
+        gyzjFfjlJcgjService.saveJcgj(gyzjFfjlOld, JcgjlxEnum.lc.getValue(), "拒绝归档", JcmcysEnum.green.getValue(), formData, qmr, null);
         //保存日志
         archiveLogService.saveInfo(ArchiveLogTypeEnum.gyzjlqff, gyzjFfjlOld.getId(), gyzjFfjlOld.getMc(), gyzjFfjlOld.getBh(), gyzjFfjlOld.getNd()+gyzjFfjlOld.getNddw(), "拒绝归档");
         //通知
@@ -634,7 +634,7 @@ public class GyzjFfjlServiceImpl extends ServiceImpl i
         gyzjFfjlOld.setDazt(DaztEnum.wgd.getValue());
         this.updateById(gyzjFfjlOld);
         //稽查轨迹
-        gyzjFfjlJcgjService.saveJcgj(gyzjFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "同意解档", JcmcysEnum.green.getValue(), null, qmr, form.getRemark());
+        gyzjFfjlJcgjService.saveJcgj(gyzjFfjlOld, JcgjlxEnum.lc.getValue(), "同意解档", JcmcysEnum.green.getValue(), null, qmr, form.getRemark());
         //保存日志
         archiveLogService.saveInfo(ArchiveLogTypeEnum.gyzjlqff, gyzjFfjlOld.getId(), gyzjFfjlOld.getMc(), gyzjFfjlOld.getBh(), gyzjFfjlOld.getNd()+gyzjFfjlOld.getNddw(), "同意解档");
         //通知
@@ -664,7 +664,7 @@ public class GyzjFfjlServiceImpl extends ServiceImpl i
         //稽查轨迹
         Map<String, String> formData = new LinkedHashMap<>();
         formData.put("原因", form.getRemark());
-        gyzjFfjlJcgjService.saveJcgj(gyzjFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "拒绝解档", JcmcysEnum.green.getValue(), formData, qmr, null);
+        gyzjFfjlJcgjService.saveJcgj(gyzjFfjlOld, JcgjlxEnum.lc.getValue(), "拒绝解档", JcmcysEnum.green.getValue(), formData, qmr, null);
         //保存日志
         archiveLogService.saveInfo(ArchiveLogTypeEnum.gyzjlqff, gyzjFfjlOld.getId(), gyzjFfjlOld.getMc(), gyzjFfjlOld.getBh(), gyzjFfjlOld.getNd()+gyzjFfjlOld.getNddw(), "拒绝解档");
         //通知
@@ -697,7 +697,7 @@ public class GyzjFfjlServiceImpl extends ServiceImpl i
         Map<String, String> formData = new LinkedHashMap<>();
         formData.put("借阅开始时间", DateUtils.dateTime(form.getJyksrq()));
         formData.put("借阅结束时间", DateUtils.dateTime(form.getJyjsrq()));
-        gyzjFfjlJcgjService.saveJcgj(gyzjFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "同意借阅", JcmcysEnum.green.getValue(), formData, qmr, form.getRemark());
+        gyzjFfjlJcgjService.saveJcgj(gyzjFfjlOld, JcgjlxEnum.lc.getValue(), "同意借阅", JcmcysEnum.green.getValue(), formData, qmr, form.getRemark());
         //保存日志
         archiveLogService.saveInfo(ArchiveLogTypeEnum.gyzjlqff, gyzjFfjlOld.getId(), gyzjFfjlOld.getMc(), gyzjFfjlOld.getBh(), gyzjFfjlOld.getNd()+gyzjFfjlOld.getNddw(), "同意借阅");
         //通知
@@ -731,7 +731,7 @@ public class GyzjFfjlServiceImpl extends ServiceImpl i
         formData.put("借阅开始时间", DateUtils.dateTime(form.getJyksrq()));
         formData.put("借阅结束时间", DateUtils.dateTime(form.getJyjsrq()));
         formData.put("原因", form.getRemark());
-        gyzjFfjlJcgjService.saveJcgj(gyzjFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "拒绝借阅", JcmcysEnum.green.getValue(), formData, qmr, null);
+        gyzjFfjlJcgjService.saveJcgj(gyzjFfjlOld, JcgjlxEnum.lc.getValue(), "拒绝借阅", JcmcysEnum.green.getValue(), formData, qmr, null);
         //保存日志
         archiveLogService.saveInfo(ArchiveLogTypeEnum.gyzjlqff, gyzjFfjlOld.getId(), gyzjFfjlOld.getMc(), gyzjFfjlOld.getBh(), gyzjFfjlOld.getNd()+gyzjFfjlOld.getNddw(), "拒绝借阅");
         //通知
@@ -759,7 +759,7 @@ public class GyzjFfjlServiceImpl extends ServiceImpl i
         gyzjFfjlOld.setJyzt(JyztEnum.wjy.getValue());
         this.updateById(gyzjFfjlOld);
         //稽查轨迹
-        gyzjFfjlJcgjService.saveJcgj(gyzjFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "确认归还", JcmcysEnum.green.getValue(), null, qmr, form.getRemark());
+        gyzjFfjlJcgjService.saveJcgj(gyzjFfjlOld, JcgjlxEnum.lc.getValue(), "确认归还", JcmcysEnum.green.getValue(), null, qmr, form.getRemark());
         //保存日志
         archiveLogService.saveInfo(ArchiveLogTypeEnum.gyzjlqff, gyzjFfjlOld.getId(), gyzjFfjlOld.getMc(), gyzjFfjlOld.getBh(), gyzjFfjlOld.getNd()+gyzjFfjlOld.getNddw(), "确认归还");
         //通知

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

@@ -75,7 +75,7 @@ public class GyzjJcgjServiceImpl extends ServiceImpl i
 
     /**
      * 新增稽查轨迹
-     * @param gyzjId 麻精药id
+     * @param gyzj 给药制剂
      * @param jcgjlx 稽查轨迹类型:1:流程；3：编辑
      * @param jcmc 稽查名称
      * @param jcmcys 稽查名称颜色：1：蓝色；3：红色；5：绿色；7：橙色
@@ -84,10 +84,9 @@ public class GyzjJcgjServiceImpl extends ServiceImpl i
      * @param remark 备注
      */
     @Override
-    @Async
-    public  void saveJcgj(Long  gyzjId, Integer jcgjlx, String jcmc, Integer jcmcys, Map<String, String> jcnr, SysUser qmr, String remark){
+    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(gyzjId);
+        gyzjJcgj.setGyzjId(gyzj.getId());
         gyzjJcgj.setJcgjlx(jcgjlx);
         gyzjJcgj.setJcmc(jcmc);
         gyzjJcgj.setJcmcEn(GyzjJcnrUtil.getEn(jcmc));
@@ -103,6 +102,9 @@ public class GyzjJcgjServiceImpl extends ServiceImpl i
         }
         gyzjJcgj.setRemark(remark);
         this.save(gyzjJcgj);
+        systemLogService.saveInfo(gyzj.getBh(), gyzj.getBh(), gyzjJcgj.getJcmc(), gyzjJcgj.getJcmcEn(),
+                gyzjJcgj.getJcnr(), gyzjJcgj.getJcnrEn(), gyzjJcgj.getQmrId(), gyzjJcgj.getQmrMc(), gyzjJcgj.getQmrMcEn(), gyzjJcgj.getRemark());
+
     }
 
     /**

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

@@ -176,7 +176,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
         formData.put("分装个数", String.valueOf(form.getList().size()));
         formData.put("分装后编号及体积", String.join(",", fz));
         formData.put("分装人", SecurityUtils.getNickName());
-        gyzjJcgjService.saveJcgj(gyzj.getId(), JcgjlxEnum.lc.getValue(), "分装", JcmcysEnum.orange.getValue(), formData, SecurityUtils.getLoginUser().getSysUser(), null);
+        gyzjJcgjService.saveJcgj(gyzj, JcgjlxEnum.lc.getValue(), "分装", JcmcysEnum.orange.getValue(), formData, SecurityUtils.getLoginUser().getSysUser(), null);
     }
 
 
@@ -311,7 +311,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
         gyzjOld.setZjzt(ZjztEnum.djd.getValue());
         this.updateById(gyzjOld);
         //稽查轨迹
-        gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "申请解档", JcmcysEnum.green.getValue(), null, qmr, form.getRemark());
+        gyzjJcgjService.saveJcgj(gyzjOld, JcgjlxEnum.lc.getValue(), "申请解档", JcmcysEnum.green.getValue(), null, qmr, form.getRemark());
         //保存日志
         archiveLogService.saveInfo(ArchiveLogTypeEnum.gyzj, gyzjOld.getId(), gyzjOld.getMc(), gyzjOld.getBh(), gyzjOld.getNd() + gyzjOld.getNddw(), "申请解档");
     }
@@ -352,7 +352,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
         Map<String, String> formData = new LinkedHashMap<>();
         formData.put("借阅开始时间", DateUtils.dateTime(form.getStartDate()));
         formData.put("借阅结束时间", DateUtils.dateTime(form.getEndDate()));
-        gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "申请借阅", JcmcysEnum.orange.getValue(), formData, qmr, form.getRemark());
+        gyzjJcgjService.saveJcgj(gyzjOld, JcgjlxEnum.lc.getValue(), "申请借阅", JcmcysEnum.orange.getValue(), formData, qmr, form.getRemark());
         //保存日志
         archiveLogService.saveInfo(ArchiveLogTypeEnum.gyzj, gyzjOld.getId(), gyzjOld.getMc(), gyzjOld.getBh(), gyzjOld.getNd() + gyzjOld.getNddw(), "申请借阅");
     }
@@ -425,7 +425,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
         gyzjOld.setGdsqrMc(qmr.getNickName());
         this.updateById(gyzjOld);
         //稽查轨迹
-        gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "申请归档", JcmcysEnum.orange.getValue(), null, qmr, form.getRemark());
+        gyzjJcgjService.saveJcgj(gyzjOld, JcgjlxEnum.lc.getValue(), "申请归档", JcmcysEnum.orange.getValue(), null, qmr, form.getRemark());
         //保存日志
         archiveLogService.saveInfo(ArchiveLogTypeEnum.gyzj, gyzjOld.getId(), gyzjOld.getMc(), gyzjOld.getBh(), gyzjOld.getNd() + gyzjOld.getNddw(), "申请归档");
     }
@@ -488,7 +488,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
         gyzjOld.setZjzt(ZjztEnum.ysd.getValue());
         this.updateById(gyzjOld);
         //稽查轨迹
-        gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "锁定给药制剂", JcmcysEnum.orange.getValue(), null, qmr, form.getRemark());
+        gyzjJcgjService.saveJcgj(gyzjOld, JcgjlxEnum.lc.getValue(), "锁定给药制剂", JcmcysEnum.orange.getValue(), null, qmr, form.getRemark());
     }
 
 
@@ -517,7 +517,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
         gyzjOld.setZjzt(ZjztEnum.rk.getValue());
         this.updateById(gyzjOld);
         //稽查轨迹
-        gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "解锁给药制剂", JcmcysEnum.green.getValue(), null, qmr, form.getRemark());
+        gyzjJcgjService.saveJcgj(gyzjOld, JcgjlxEnum.lc.getValue(), "解锁给药制剂", JcmcysEnum.green.getValue(), null, qmr, form.getRemark());
     }
 
     /**
@@ -627,7 +627,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
         formData.put("处置原因", form.getCzyy());
         formData.put("处置量", form.getCzl() + gyzjOld.getKcdw());
         formData.put("处置人", clr.getNickName());
-        gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "处置药剂", JcmcysEnum.green.getValue(), formData, clr, null);
+        gyzjJcgjService.saveJcgj(gyzjOld, JcgjlxEnum.lc.getValue(), "处置药剂", JcmcysEnum.green.getValue(), formData, clr, null);
         //台账
         gyzjTzService.saveTz(gyzjOld.getId(), null, null, null, null, null, null, null, null, clr, "处置药剂", form.getCzl(), gyzjOld.getKcdw(), form.getCzyy());
         this.updateById(gyzjOld);
@@ -727,7 +727,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
         formData.put("处置人", clr.getNickName());
         formData.put("复核人", fhr.getNickName());
         formData.put("监督人", jdr.getNickName());
-        gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "处置容器", JcmcysEnum.green.getValue(), formData, clr, null);
+        gyzjJcgjService.saveJcgj(gyzjOld, JcgjlxEnum.lc.getValue(), "处置容器", JcmcysEnum.green.getValue(), formData, clr, null);
         //台账
         gyzjTzService.saveTz(gyzjOld.getId(), null, null, null, null, null, null, null, null, clr, "处置容器", null, null, form.getCzyy());
         gyzjOld.setRqzt(RqztEnum.ycz.getValue());
@@ -851,7 +851,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
         formData.put("领取人2", lqr2.getNickName());
         formData.put("发放人", ffr1.getNickName());
         formData.put("发放人2", ffr2.getNickName());
-        gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "领取发放", JcmcysEnum.green.getValue(), formData, ffr1, form.getRemark());
+        gyzjJcgjService.saveJcgj(gyzjOld, JcgjlxEnum.lc.getValue(), "领取发放", JcmcysEnum.green.getValue(), formData, ffr1, form.getRemark());
         //台账
         gyzjTzService.saveTz(gyzjOld.getId(), lqr1, lqr2, null, null, ffr1, ffr2, null, null, null, "领取发放", gyzjOld.getKc(), gyzjOld.getKcdw(), form.getRemark());
 
@@ -1026,11 +1026,11 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
             gyzjOld.setNddw(gyzjOld.getNddwbj());
             gyzjOld.setNd(gyzjOld.getNdbj());
             gyzjOld.setMc(gyzjOld.getMcbj());
-            gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "同意编辑", JcmcysEnum.green.getValue(), formData, qmr, null);
+            gyzjJcgjService.saveJcgj(gyzjOld, JcgjlxEnum.lc.getValue(), "同意编辑", JcmcysEnum.green.getValue(), formData, qmr, null);
             //通知
             noticeService.save("给药制剂【" + gyzjOld.getMc() + "】同意编辑", gyzjOld.getBjrId(), getUrlQz("gyzjList"));
         } else {
-            gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "拒绝编辑", JcmcysEnum.red.getValue(), formData, qmr, null);
+            gyzjJcgjService.saveJcgj(gyzjOld, JcgjlxEnum.lc.getValue(), "拒绝编辑", JcmcysEnum.red.getValue(), formData, qmr, null);
             //通知
             noticeService.save("给药制剂【" + gyzjOld.getMc() + "】拒绝编辑", gyzjOld.getBjrId(), getUrlQz("gyzjList"));
         }
@@ -1127,13 +1127,13 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
         formData.put("申请备注", gyzjOld.getKcbjbz());
         formData.put("审核备注", form.getRemark());
         if (form.getQmyy().equals(ShXgkcEnum.ty.getValue())) {
-            gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "同意修改库存", JcmcysEnum.green.getValue(), formData, qmr, null);
+            gyzjJcgjService.saveJcgj(gyzjOld, JcgjlxEnum.lc.getValue(), "同意修改库存", JcmcysEnum.green.getValue(), formData, qmr, null);
             gyzjOld.setKcdw(gyzjOld.getKcdwbj());
             gyzjOld.setKc(gyzjOld.getKcbj());
             //通知
             noticeService.save("给药制剂【" + gyzjOld.getMc() + "】同意修改库存", gyzjOld.getKcbjrId(), getUrlQz("gyzjList"));
         } else {
-            gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "拒绝修改库存", JcmcysEnum.red.getValue(), formData, qmr, null);
+            gyzjJcgjService.saveJcgj(gyzjOld, JcgjlxEnum.lc.getValue(), "拒绝修改库存", JcmcysEnum.red.getValue(), formData, qmr, null);
             //通知
             noticeService.save("给药制剂【" + gyzjOld.getMc() + "】拒绝修改库存", gyzjOld.getKcbjrId(), getUrlQz("gyzjList"));
         }
@@ -1186,7 +1186,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
         formData.put("转移条件", form.getGhzytj());
         formData.put("归还人1", SecurityUtils.getNickName());
         formData.put("归还人2", ghr2.getNickName());
-        gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "归还", JcmcysEnum.green.getValue(), formData, ghr1, form.getRemark());
+        gyzjJcgjService.saveJcgj(gyzjOld, JcgjlxEnum.lc.getValue(), "归还", JcmcysEnum.green.getValue(), formData, ghr1, form.getRemark());
         //endregion
 
         gyzjOld.setGhzytj(form.getGhzytj());
@@ -1250,7 +1250,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
         formData.put("入库毛重", form.getRkmz() + gyzjOld.getKcdw());
         formData.put("库管员1", jsr1.getNickName());
         formData.put("库管员2", jsr2.getNickName());
-        gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "确认归还", JcmcysEnum.green.getValue(), formData, jsr1, SecurityUtils.getNickName());
+        gyzjJcgjService.saveJcgj(gyzjOld, JcgjlxEnum.lc.getValue(), "确认归还", JcmcysEnum.green.getValue(), formData, jsr1, SecurityUtils.getNickName());
         //通知
         noticeService.save("给药制剂【" + gyzjOld.getMc() + "】确认归还", ghr1.getUserId(), getUrlQz("gyzjList"));
         noticeService.save("给药制剂【" + gyzjOld.getMc() + "】确认归还", ghr2.getUserId(), getUrlQz("gyzjList"));
@@ -1300,7 +1300,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
         formData.put("转移条件", form.getRkzytj());
         formData.put("签名人1", qmr1.getNickName());
         formData.put("签名人2", qmr2.getNickName());
-        gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "给药制剂入库", JcmcysEnum.green.getValue(), formData, qmr1, form.getRemark());
+        gyzjJcgjService.saveJcgj(gyzjOld, JcgjlxEnum.lc.getValue(), "给药制剂入库", JcmcysEnum.green.getValue(), formData, qmr1, form.getRemark());
         //endregion
 
         gyzjOld.setRkzytj(form.getRkzytj());
@@ -1350,13 +1350,13 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
         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, jsr1, null);
+            gyzjJcgjService.saveJcgj(gyzjOld, JcgjlxEnum.lc.getValue(), "同意入库", JcmcysEnum.green.getValue(), formData, jsr1, 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, jsr1, null);
+            gyzjJcgjService.saveJcgj(gyzjOld, JcgjlxEnum.lc.getValue(), "拒绝入库", JcmcysEnum.red.getValue(), formData, jsr1, null);
         }
         // 更新
         gyzjOld.setRkzytj(null);
@@ -1404,7 +1404,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
         formData.put("存储条件", form.getCctj());
         formData.put("签名人1", qmr.getNickName());
         formData.put("签名人2", qmr.getNickName());
-        gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "存储", JcmcysEnum.green.getValue(), formData, null, form.getRemark());
+        gyzjJcgjService.saveJcgj(gyzjOld, JcgjlxEnum.lc.getValue(), "存储", JcmcysEnum.green.getValue(), formData, null, form.getRemark());
         //台账
         gyzjTzService.saveTz(gyzjOld.getId(), null, null, qmr, qmr2, null, null, null, null, null, "存储", gyzjOld.getKc(), gyzjOld.getKcdw(), form.getRemark());
 
@@ -1438,7 +1438,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
         Map<String, String> formData = new LinkedHashMap<>();
         formData.put("签名人1", qmr.getNickName());
         formData.put("签名人2", qmr.getNickName());
-        gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "取出", JcmcysEnum.green.getValue(), formData, null, form.getRemark());
+        gyzjJcgjService.saveJcgj(gyzjOld, JcgjlxEnum.lc.getValue(), "取出", JcmcysEnum.green.getValue(), formData, null, form.getRemark());
         //台账
         gyzjTzService.saveTz(gyzjOld.getId(), null, null, qmr, qmr2, null, null, null, null, null, "取出", gyzjOld.getKc(), gyzjOld.getKcdw(), form.getRemark());
     }
@@ -1718,7 +1718,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
         gyzjOld.setZjzt(ZjztEnum.gd.getValue());
         this.updateById(gyzjOld);
         //稽查轨迹
-        gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "同意归档", JcmcysEnum.green.getValue(), null, qmr, form.getRemark());
+        gyzjJcgjService.saveJcgj(gyzjOld, JcgjlxEnum.lc.getValue(), "同意归档", JcmcysEnum.green.getValue(), null, qmr, form.getRemark());
         //保存日志
         archiveLogService.saveInfo(ArchiveLogTypeEnum.gyzj, gyzjOld.getId(), gyzjOld.getMc(), gyzjOld.getBh(), gyzjOld.getNd() + gyzjOld.getNddw(), "同意归档");
         //通知
@@ -1749,7 +1749,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
         //稽查轨迹
         Map<String, String> formData = new LinkedHashMap<>();
         formData.put("原因", form.getRemark());
-        gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "拒绝归档", JcmcysEnum.green.getValue(), formData, qmr, null);
+        gyzjJcgjService.saveJcgj(gyzjOld, JcgjlxEnum.lc.getValue(), "拒绝归档", JcmcysEnum.green.getValue(), formData, qmr, null);
         //保存日志
         archiveLogService.saveInfo(ArchiveLogTypeEnum.gyzj, gyzjOld.getId(), gyzjOld.getMc(), gyzjOld.getBh(), gyzjOld.getNd() + gyzjOld.getNddw(), "拒绝归档");
         //通知
@@ -1778,7 +1778,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
         gyzjOld.setDazt(DaztEnum.wgd.getValue());
         this.updateById(gyzjOld);
         //稽查轨迹
-        gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "同意解档", JcmcysEnum.green.getValue(), null, qmr, form.getRemark());
+        gyzjJcgjService.saveJcgj(gyzjOld, JcgjlxEnum.lc.getValue(), "同意解档", JcmcysEnum.green.getValue(), null, qmr, form.getRemark());
         //保存日志
         archiveLogService.saveInfo(ArchiveLogTypeEnum.gyzj, gyzjOld.getId(), gyzjOld.getMc(), gyzjOld.getBh(), gyzjOld.getNd() + gyzjOld.getNddw(), "同意解档");
         //通知
@@ -1808,7 +1808,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
         //稽查轨迹
         Map<String, String> formData = new LinkedHashMap<>();
         formData.put("原因", form.getRemark());
-        gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "拒绝解档", JcmcysEnum.green.getValue(), formData, qmr, null);
+        gyzjJcgjService.saveJcgj(gyzjOld, JcgjlxEnum.lc.getValue(), "拒绝解档", JcmcysEnum.green.getValue(), formData, qmr, null);
         //保存日志
         archiveLogService.saveInfo(ArchiveLogTypeEnum.gyzj, gyzjOld.getId(), gyzjOld.getMc(), gyzjOld.getBh(), gyzjOld.getNd() + gyzjOld.getNddw(), "拒绝解档");
         //通知
@@ -1842,7 +1842,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
         Map<String, String> formData = new LinkedHashMap<>();
         formData.put("借阅开始时间", DateUtils.dateTime(form.getJyksrq()));
         formData.put("借阅结束时间", DateUtils.dateTime(form.getJyjsrq()));
-        gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "同意借阅", JcmcysEnum.green.getValue(), formData, qmr, form.getRemark());
+        gyzjJcgjService.saveJcgj(gyzjOld, JcgjlxEnum.lc.getValue(), "同意借阅", JcmcysEnum.green.getValue(), formData, qmr, form.getRemark());
         //保存日志
         archiveLogService.saveInfo(ArchiveLogTypeEnum.gyzj, gyzjOld.getId(), gyzjOld.getMc(), gyzjOld.getBh(), gyzjOld.getNd() + gyzjOld.getNddw(), "同意借阅");
         //通知
@@ -1876,7 +1876,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
         formData.put("借阅开始时间", DateUtils.dateTime(form.getJyksrq()));
         formData.put("借阅结束时间", DateUtils.dateTime(form.getJyjsrq()));
         formData.put("原因", form.getRemark());
-        gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "拒绝借阅", JcmcysEnum.green.getValue(), formData, qmr, null);
+        gyzjJcgjService.saveJcgj(gyzjOld, JcgjlxEnum.lc.getValue(), "拒绝借阅", JcmcysEnum.green.getValue(), formData, qmr, null);
         //保存日志
         archiveLogService.saveInfo(ArchiveLogTypeEnum.gyzj, gyzjOld.getId(), gyzjOld.getMc(), gyzjOld.getBh(), gyzjOld.getNd() + gyzjOld.getNddw(), "拒绝借阅");
         //通知
@@ -1904,7 +1904,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
         gyzjOld.setJyzt(JyztEnum.wjy.getValue());
         this.updateById(gyzjOld);
         //稽查轨迹
-        gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "确认归还", JcmcysEnum.green.getValue(), null, qmr, form.getRemark());
+        gyzjJcgjService.saveJcgj(gyzjOld, JcgjlxEnum.lc.getValue(), "确认归还", JcmcysEnum.green.getValue(), null, qmr, form.getRemark());
         //保存日志
         archiveLogService.saveInfo(ArchiveLogTypeEnum.gyzj, gyzjOld.getId(), gyzjOld.getMc(), gyzjOld.getBh(), gyzjOld.getNd() + gyzjOld.getNddw(), "确认归还");
         //通知

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

@@ -74,7 +74,7 @@ public class MjyFfjlJcgjServiceImpl extends ServiceImpl
 
     /**
      * 新增稽查轨迹
-     * @param ffjlId 发放记录id
+     * @param mjyFfjl 发放记录
      * @param jcgjlx 稽查轨迹类型:1:流程；3：编辑
      * @param jcmc 稽查名称
      * @param jcmcys 稽查名称颜色：1：蓝色；3：红色；5：绿色；7：橙色
@@ -83,9 +83,9 @@ public class MjyFfjlJcgjServiceImpl extends ServiceImpl
      * @param remark 备注
      */
     @Override
-    public  void saveJcgj(Long  ffjlId, Integer jcgjlx, String jcmc, Integer jcmcys, Map<String, String> jcnr,SysUser qmr,String remark){
+    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(ffjlId);
+        mjyFfjlJcgj.setFfjlId(mjyFfjl.getId());
         mjyFfjlJcgj.setJcgjlx(jcgjlx);
         mjyFfjlJcgj.setJcmc(jcmc);
         mjyFfjlJcgj.setJcmcEn(MjyJcnrUtil.getEn(jcmc));
@@ -99,6 +99,9 @@ public class MjyFfjlJcgjServiceImpl extends ServiceImpl
         mjyFfjlJcgj.setQmrMcEn(qmr.getUserName());
         mjyFfjlJcgj.setRemark(remark);
         this.save(mjyFfjlJcgj);
+        systemLogService.saveInfo(mjyFfjl.getBh(), mjyFfjl.getBh(), mjyFfjlJcgj.getJcmc(), mjyFfjlJcgj.getJcmcEn(),
+                mjyFfjlJcgj.getJcnr(), mjyFfjlJcgj.getJcnrEn(), mjyFfjlJcgj.getQmrId(), mjyFfjlJcgj.getQmrMc(), mjyFfjlJcgj.getQmrMcEn(), mjyFfjlJcgj.getRemark());
+
     }
 
     /**

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

@@ -128,7 +128,7 @@ public class MjyFfjlServiceImpl extends ServiceImpl impl
             throw new ServiceException("发放回收记录【" + mjyFfjlOld.getMc() + "】不是未锁定状态，不能加签");
         }
         //稽查轨迹
-        mjyFfjlJcgjService.saveJcgj(mjyFfjlOld.getId(), JcgjlxEnum.bcsm.getValue(), "补充说明", JcmcysEnum.orange.getValue(), null, qmr,form.getRemark());
+        mjyFfjlJcgjService.saveJcgj(mjyFfjlOld, JcgjlxEnum.bcsm.getValue(), "补充说明", JcmcysEnum.orange.getValue(), null, qmr,form.getRemark());
     }
 
     /**
@@ -164,7 +164,7 @@ public class MjyFfjlServiceImpl extends ServiceImpl impl
         Map<String, String> formData = new LinkedHashMap<>();
         formData.put("借阅开始时间", DateUtils.dateTime(form.getStartDate()));
         formData.put("借阅结束时间", DateUtils.dateTime(form.getEndDate()));
-        mjyFfjlJcgjService.saveJcgj(mjyFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "申请借阅", JcmcysEnum.orange.getValue(), formData, qmr,form.getRemark());
+        mjyFfjlJcgjService.saveJcgj(mjyFfjlOld, JcgjlxEnum.lc.getValue(), "申请借阅", JcmcysEnum.orange.getValue(), formData, qmr,form.getRemark());
         //保存日志
         archiveLogService.saveInfo(ArchiveLogTypeEnum.mjylqff, mjyFfjlOld.getId(), mjyFfjlOld.getMc(), mjyFfjlOld.getBh(), mjyFfjlOld.getNd()+mjyFfjlOld.getNddw(), "申请借阅");
     }
@@ -208,7 +208,7 @@ public class MjyFfjlServiceImpl extends ServiceImpl impl
         mjyFfjlOld.setJlzt(JlztEnum.djd.getValue());
         this.updateById(mjyFfjlOld);
         //稽查轨迹
-        mjyFfjlJcgjService.saveJcgj(mjyFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "申请解档", JcmcysEnum.green.getValue(), null, qmr,form.getRemark());
+        mjyFfjlJcgjService.saveJcgj(mjyFfjlOld, JcgjlxEnum.lc.getValue(), "申请解档", JcmcysEnum.green.getValue(), null, qmr,form.getRemark());
         //保存日志
         archiveLogService.saveInfo(ArchiveLogTypeEnum.mjylqff, mjyFfjlOld.getId(), mjyFfjlOld.getMc(), mjyFfjlOld.getBh(), mjyFfjlOld.getNd()+mjyFfjlOld.getNddw(), "申请解档");
     }
@@ -281,7 +281,7 @@ public class MjyFfjlServiceImpl extends ServiceImpl impl
         mjyFfjlOld.setGdsqrMc(qmr.getNickName());
         this.updateById(mjyFfjlOld);
         //稽查轨迹
-        mjyFfjlJcgjService.saveJcgj(mjyFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "申请归档", JcmcysEnum.green.getValue(), null, qmr,form.getRemark());
+        mjyFfjlJcgjService.saveJcgj(mjyFfjlOld, JcgjlxEnum.lc.getValue(), "申请归档", JcmcysEnum.green.getValue(), null, qmr,form.getRemark());
     }
 
 
@@ -342,7 +342,7 @@ public class MjyFfjlServiceImpl extends ServiceImpl impl
         mjyFfjlOld.setJlzt(JlztEnum.ysd.getValue());
         this.updateById(mjyFfjlOld);
         //稽查轨迹
-        mjyFfjlJcgjService.saveJcgj(mjyFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "锁定发放记录", JcmcysEnum.green.getValue(), null, qmr,form.getRemark());
+        mjyFfjlJcgjService.saveJcgj(mjyFfjlOld, JcgjlxEnum.lc.getValue(), "锁定发放记录", JcmcysEnum.green.getValue(), null, qmr,form.getRemark());
 
     }
 
@@ -372,7 +372,7 @@ public class MjyFfjlServiceImpl extends ServiceImpl impl
         mjyFfjlOld.setJlzt(JlztEnum.wsd.getValue());
         this.updateById(mjyFfjlOld);
         //稽查轨迹
-        mjyFfjlJcgjService.saveJcgj(mjyFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "解锁发放记录", JcmcysEnum.green.getValue(), null, qmr,form.getRemark());
+        mjyFfjlJcgjService.saveJcgj(mjyFfjlOld, JcgjlxEnum.lc.getValue(), "解锁发放记录", JcmcysEnum.green.getValue(), null, qmr,form.getRemark());
 
     }
 
@@ -424,7 +424,7 @@ public class MjyFfjlServiceImpl extends ServiceImpl impl
         formData.put("归还人2", ghr2.getNickName());
         formData.put("库管员1", jsr1.getNickName());
         formData.put("库管员2", jsr2.getNickName());
-        mjyFfjlJcgjService.saveJcgj(mjyFfjl.getId(), JcgjlxEnum.lc.getValue(), "归还", JcmcysEnum.green.getValue(), formData, SecurityUtils.getLoginUser().getSysUser(),form.getRemark());
+        mjyFfjlJcgjService.saveJcgj(mjyFfjl, JcgjlxEnum.lc.getValue(), "归还", JcmcysEnum.green.getValue(), formData, SecurityUtils.getLoginUser().getSysUser(),form.getRemark());
 
     }
 
@@ -497,7 +497,7 @@ public class MjyFfjlServiceImpl extends ServiceImpl impl
         formData.put("目的", form.getMdMcs());
 
         this.save(mjyFfjl);
-        mjyFfjlJcgjService.saveJcgj(mjyFfjl.getId(), JcgjlxEnum.lc.getValue(), "领取发放", JcmcysEnum.green.getValue(), formData, SecurityUtils.getLoginUser().getSysUser(),form.getRemark());
+        mjyFfjlJcgjService.saveJcgj(mjyFfjl, JcgjlxEnum.lc.getValue(), "领取发放", JcmcysEnum.green.getValue(), formData, SecurityUtils.getLoginUser().getSysUser(),form.getRemark());
 
     }
 
@@ -570,7 +570,7 @@ public class MjyFfjlServiceImpl extends ServiceImpl impl
         mjyFfjlOld.setJlzt(JlztEnum.gd.getValue());
         this.updateById(mjyFfjlOld);
         //稽查轨迹
-        mjyFfjlJcgjService.saveJcgj(mjyFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "同意归档", JcmcysEnum.green.getValue(), null, qmr, form.getRemark());
+        mjyFfjlJcgjService.saveJcgj(mjyFfjlOld, JcgjlxEnum.lc.getValue(), "同意归档", JcmcysEnum.green.getValue(), null, qmr, form.getRemark());
         //保存日志
         archiveLogService.saveInfo(ArchiveLogTypeEnum.mjylqff, mjyFfjlOld.getId(), mjyFfjlOld.getMc(), mjyFfjlOld.getBh(), mjyFfjlOld.getNd()+mjyFfjlOld.getNddw(), "同意归档");
         //通知
@@ -601,7 +601,7 @@ public class MjyFfjlServiceImpl extends ServiceImpl impl
         //稽查轨迹
         Map<String, String> formData = new LinkedHashMap<>();
         formData.put("原因", form.getRemark());
-        mjyFfjlJcgjService.saveJcgj(mjyFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "拒绝归档", JcmcysEnum.green.getValue(), formData, qmr, null);
+        mjyFfjlJcgjService.saveJcgj(mjyFfjlOld, JcgjlxEnum.lc.getValue(), "拒绝归档", JcmcysEnum.green.getValue(), formData, qmr, null);
         //保存日志
         archiveLogService.saveInfo(ArchiveLogTypeEnum.mjylqff, mjyFfjlOld.getId(), mjyFfjlOld.getMc(), mjyFfjlOld.getBh(), mjyFfjlOld.getNd()+mjyFfjlOld.getNddw(), "拒绝归档");
         //通知
@@ -630,7 +630,7 @@ public class MjyFfjlServiceImpl extends ServiceImpl impl
         mjyFfjlOld.setDazt(DaztEnum.wgd.getValue());
         this.updateById(mjyFfjlOld);
         //稽查轨迹
-        mjyFfjlJcgjService.saveJcgj(mjyFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "同意解档", JcmcysEnum.green.getValue(), null, qmr, form.getRemark());
+        mjyFfjlJcgjService.saveJcgj(mjyFfjlOld, JcgjlxEnum.lc.getValue(), "同意解档", JcmcysEnum.green.getValue(), null, qmr, form.getRemark());
         //保存日志
         archiveLogService.saveInfo(ArchiveLogTypeEnum.mjylqff, mjyFfjlOld.getId(), mjyFfjlOld.getMc(), mjyFfjlOld.getBh(), mjyFfjlOld.getNd()+mjyFfjlOld.getNddw(), "同意解档");
         //通知
@@ -660,7 +660,7 @@ public class MjyFfjlServiceImpl extends ServiceImpl impl
         //稽查轨迹
         Map<String, String> formData = new LinkedHashMap<>();
         formData.put("原因", form.getRemark());
-        mjyFfjlJcgjService.saveJcgj(mjyFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "拒绝解档", JcmcysEnum.green.getValue(), formData, qmr, null);
+        mjyFfjlJcgjService.saveJcgj(mjyFfjlOld, JcgjlxEnum.lc.getValue(), "拒绝解档", JcmcysEnum.green.getValue(), formData, qmr, null);
         //保存日志
         archiveLogService.saveInfo(ArchiveLogTypeEnum.mjylqff, mjyFfjlOld.getId(), mjyFfjlOld.getMc(), mjyFfjlOld.getBh(), mjyFfjlOld.getNd()+mjyFfjlOld.getNddw(), "拒绝解档");
         //通知
@@ -693,7 +693,7 @@ public class MjyFfjlServiceImpl extends ServiceImpl impl
         Map<String, String> formData = new LinkedHashMap<>();
         formData.put("借阅开始时间", DateUtils.dateTime(form.getJyksrq()));
         formData.put("借阅结束时间", DateUtils.dateTime(form.getJyjsrq()));
-        mjyFfjlJcgjService.saveJcgj(mjyFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "同意借阅", JcmcysEnum.green.getValue(), formData, qmr, form.getRemark());
+        mjyFfjlJcgjService.saveJcgj(mjyFfjlOld, JcgjlxEnum.lc.getValue(), "同意借阅", JcmcysEnum.green.getValue(), formData, qmr, form.getRemark());
         //保存日志
         archiveLogService.saveInfo(ArchiveLogTypeEnum.mjylqff, mjyFfjlOld.getId(), mjyFfjlOld.getMc(), mjyFfjlOld.getBh(), mjyFfjlOld.getNd()+mjyFfjlOld.getNddw(), "同意借阅");
         //通知
@@ -727,7 +727,7 @@ public class MjyFfjlServiceImpl extends ServiceImpl impl
         formData.put("借阅开始时间", DateUtils.dateTime(form.getJyksrq()));
         formData.put("借阅结束时间", DateUtils.dateTime(form.getJyjsrq()));
         formData.put("原因", form.getRemark());
-        mjyFfjlJcgjService.saveJcgj(mjyFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "拒绝借阅", JcmcysEnum.green.getValue(), formData, qmr, null);
+        mjyFfjlJcgjService.saveJcgj(mjyFfjlOld, JcgjlxEnum.lc.getValue(), "拒绝借阅", JcmcysEnum.green.getValue(), formData, qmr, null);
         //保存日志
         archiveLogService.saveInfo(ArchiveLogTypeEnum.mjylqff, mjyFfjlOld.getId(), mjyFfjlOld.getMc(), mjyFfjlOld.getBh(), mjyFfjlOld.getNd()+mjyFfjlOld.getNddw(), "拒绝借阅");
         //通知
@@ -755,7 +755,7 @@ public class MjyFfjlServiceImpl extends ServiceImpl impl
         mjyFfjlOld.setJyzt(JyztEnum.wjy.getValue());
         this.updateById(mjyFfjlOld);
         //稽查轨迹
-        mjyFfjlJcgjService.saveJcgj(mjyFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "确认归还", JcmcysEnum.green.getValue(), null, qmr, form.getRemark());
+        mjyFfjlJcgjService.saveJcgj(mjyFfjlOld, JcgjlxEnum.lc.getValue(), "确认归还", JcmcysEnum.green.getValue(), null, qmr, form.getRemark());
         //保存日志
         archiveLogService.saveInfo(ArchiveLogTypeEnum.mjylqff, mjyFfjlOld.getId(), mjyFfjlOld.getMc(), mjyFfjlOld.getBh(), mjyFfjlOld.getNd()+mjyFfjlOld.getNddw(), "确认归还");
         //通知

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

@@ -74,7 +74,7 @@ public class MjyJcgjServiceImpl extends ServiceImpl impl
 
     /**
      * 新增稽查轨迹
-     * @param mjyId 麻精药id
+     * @param mjy 麻精药
      * @param jcgjlx 稽查轨迹类型:1:流程；3：编辑
      * @param jcmc 稽查名称
      * @param jcmcys 稽查名称颜色：1：蓝色；3：红色；5：绿色；7：橙色
@@ -83,10 +83,9 @@ public class MjyJcgjServiceImpl extends ServiceImpl impl
      * @param remark 备注
      */
     @Override
-    @Async
-    public  void saveJcgj(Long  mjyId, Integer jcgjlx, String jcmc, Integer jcmcys, Map<String, String> jcnr, SysUser qmr, String remark){
+    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(mjyId);
+        mjyJcgj.setMjyId(mjy.getId());
         mjyJcgj.setJcgjlx(jcgjlx);
         mjyJcgj.setJcmc(jcmc);
         mjyJcgj.setJcmcEn(MjyJcnrUtil.getEn(jcmc));
@@ -102,6 +101,8 @@ public class MjyJcgjServiceImpl extends ServiceImpl impl
         }
         mjyJcgj.setRemark(remark);
         this.save(mjyJcgj);
+        systemLogService.saveInfo(mjy.getBh(), mjy.getBh(), mjyJcgj.getJcmc(), mjyJcgj.getJcmcEn(),
+                mjyJcgj.getJcnr(), mjyJcgj.getJcnrEn(), mjyJcgj.getQmrId(), mjyJcgj.getQmrMc(), mjyJcgj.getQmrMcEn(), mjyJcgj.getRemark());
     }
 
     /**

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

@@ -179,7 +179,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
         mjyOld.setZjzt(ZjztEnum.djd.getValue());
         this.updateById(mjyOld);
         //稽查轨迹
-        mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "申请解档", JcmcysEnum.green.getValue(), null, qmr, form.getRemark());
+        mjyJcgjService.saveJcgj(mjyOld, JcgjlxEnum.lc.getValue(), "申请解档", JcmcysEnum.green.getValue(), null, qmr, form.getRemark());
         //保存日志
         archiveLogService.saveInfo(ArchiveLogTypeEnum.mjy, mjyOld.getId(), mjyOld.getMc(), mjyOld.getBh(), mjyOld.getNd() + mjyOld.getNddw(), "申请解档");
     }
@@ -220,7 +220,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
         Map<String, String> formData = new LinkedHashMap<>();
         formData.put("借阅开始时间", DateUtils.dateTime(form.getStartDate()));
         formData.put("借阅结束时间", DateUtils.dateTime(form.getEndDate()));
-        mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "申请借阅", JcmcysEnum.orange.getValue(), formData, qmr, form.getRemark());
+        mjyJcgjService.saveJcgj(mjyOld, JcgjlxEnum.lc.getValue(), "申请借阅", JcmcysEnum.orange.getValue(), formData, qmr, form.getRemark());
         //保存日志
         archiveLogService.saveInfo(ArchiveLogTypeEnum.mjy, mjyOld.getId(), mjyOld.getMc(), mjyOld.getBh(), mjyOld.getNd() + mjyOld.getNddw(), "申请借阅");
     }
@@ -293,7 +293,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
         mjyOld.setGdsqrMc(qmr.getNickName());
         this.updateById(mjyOld);
         //稽查轨迹
-        mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "申请归档", JcmcysEnum.orange.getValue(), null, qmr, form.getRemark());
+        mjyJcgjService.saveJcgj(mjyOld, JcgjlxEnum.lc.getValue(), "申请归档", JcmcysEnum.orange.getValue(), null, qmr, form.getRemark());
         //保存日志
         archiveLogService.saveInfo(ArchiveLogTypeEnum.mjy, mjyOld.getId(), mjyOld.getMc(), mjyOld.getBh(), mjyOld.getNd() + mjyOld.getNddw(), "申请归档");
     }
@@ -356,7 +356,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
         mjyOld.setZjzt(ZjztEnum.ysd.getValue());
         this.updateById(mjyOld);
         //稽查轨迹
-        mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "锁定麻精药", JcmcysEnum.orange.getValue(), null, qmr, form.getRemark());
+        mjyJcgjService.saveJcgj(mjyOld, JcgjlxEnum.lc.getValue(), "锁定麻精药", JcmcysEnum.orange.getValue(), null, qmr, form.getRemark());
     }
 
 
@@ -385,7 +385,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
         mjyOld.setZjzt(ZjztEnum.rk.getValue());
         this.updateById(mjyOld);
         //稽查轨迹
-        mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "解锁麻精药", JcmcysEnum.orange.getValue(), null, qmr, form.getRemark());
+        mjyJcgjService.saveJcgj(mjyOld, JcgjlxEnum.lc.getValue(), "解锁麻精药", JcmcysEnum.orange.getValue(), null, qmr, form.getRemark());
     }
 
     /**
@@ -495,7 +495,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
         formData.put("处置人", clr.getNickName());
         formData.put("复核人", fhr.getNickName());
         formData.put("监督人", jdr.getNickName());
-        mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "处置药剂", JcmcysEnum.green.getValue(), formData, null, null);
+        mjyJcgjService.saveJcgj(mjyOld, JcgjlxEnum.lc.getValue(), "处置药剂", JcmcysEnum.green.getValue(), formData, null, null);
 
         //台账
         mjyTzService.saveTz(mjyOld.getId(), null, null, null, null, null, null, null, null, clr, "处置药剂", form.getCzl(), mjyOld.getKcdw(), form.getCzyy());
@@ -600,7 +600,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
         formData.put("处置人", clr.getNickName());
         formData.put("复核人", fhr.getNickName());
         formData.put("监督人", jdr.getNickName());
-        mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "处置容器", JcmcysEnum.green.getValue(), formData, null, null);
+        mjyJcgjService.saveJcgj(mjyOld, JcgjlxEnum.lc.getValue(), "处置容器", JcmcysEnum.green.getValue(), formData, null, null);
 
         //台账
         mjyTzService.saveTz(mjyOld.getId(), null, null, null, null, null, null, null, null, clr, "处置容器", null, null, form.getCzyy());
@@ -725,7 +725,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
         formData.put("领取人2", lqr2.getNickName());
         formData.put("发放人", ffr1.getNickName());
         formData.put("发放人2", ffr2.getNickName());
-        mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "领取发放", JcmcysEnum.green.getValue(), formData, ffr1, form.getRemark());
+        mjyJcgjService.saveJcgj(mjyOld, JcgjlxEnum.lc.getValue(), "领取发放", JcmcysEnum.green.getValue(), formData, ffr1, form.getRemark());
         //台账
         mjyTzService.saveTz(mjyOld.getId(), lqr1, lqr2, null, null, ffr1, ffr2, null, null, null, "领取发放", mjyOld.getKc(), mjyOld.getKcdw(), form.getRemark());
 
@@ -917,11 +917,11 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
             mjyOld.setNddw(mjyOld.getNddwbj());
             mjyOld.setNd(mjyOld.getNdbj());
             mjyOld.setMc(mjyOld.getMcbj());
-            mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "同意编辑", JcmcysEnum.green.getValue(), formData, qmr, null);
+            mjyJcgjService.saveJcgj(mjyOld, JcgjlxEnum.lc.getValue(), "同意编辑", JcmcysEnum.green.getValue(), formData, qmr, null);
             //通知
             noticeService.save("麻精药【" + mjyOld.getMc() + "】同意编辑", mjyOld.getBjrId(), getUrlQz("mjyList"));
         } else {
-            mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "拒绝编辑", JcmcysEnum.red.getValue(), formData, qmr, null);
+            mjyJcgjService.saveJcgj(mjyOld, JcgjlxEnum.lc.getValue(), "拒绝编辑", JcmcysEnum.red.getValue(), formData, qmr, null);
             //通知
             noticeService.save("麻精药【" + mjyOld.getMc() + "】拒绝编辑", mjyOld.getBjrId(), getUrlQz("mjyList"));
         }
@@ -1016,13 +1016,13 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
         formData.put("申请备注", mjyOld.getKcbjbz());
         formData.put("审核备注", form.getRemark());
         if (form.getQmyy().equals(ShXgkcEnum.ty.getValue())) {
-            mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "同意修改库存", JcmcysEnum.green.getValue(), formData, qmr, null);
+            mjyJcgjService.saveJcgj(mjyOld, JcgjlxEnum.lc.getValue(), "同意修改库存", JcmcysEnum.green.getValue(), formData, qmr, null);
             mjyOld.setKcdw(mjyOld.getKcdwbj());
             mjyOld.setKc(mjyOld.getKcbj());
             //通知
             noticeService.save("麻精药【" + mjyOld.getMc() + "】拒绝修改库存", mjyOld.getKcbjrId(), getUrlQz("mjyList"));
         } else {
-            mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "拒绝修改库存", JcmcysEnum.red.getValue(), formData, qmr, null);
+            mjyJcgjService.saveJcgj(mjyOld, JcgjlxEnum.lc.getValue(), "拒绝修改库存", JcmcysEnum.red.getValue(), formData, qmr, null);
             //通知
             noticeService.save("麻精药【" + mjyOld.getMc() + "】拒绝编辑", mjyOld.getKcbjrId(), getUrlQz("mjyList"));
         }
@@ -1086,7 +1086,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
         formData.put("归还人2", ghr2.getNickName());
         formData.put("库管员1", jsr1.getNickName());
         formData.put("库管员2", jsr2.getNickName());
-        mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "归还", JcmcysEnum.green.getValue(), formData, null, null);
+        mjyJcgjService.saveJcgj(mjyOld, JcgjlxEnum.lc.getValue(), "归还", JcmcysEnum.green.getValue(), formData, null, null);
         //通知
         noticeService.save("麻精药【" + mjyOld.getMc() + "】归还", mjyOld.getKcbjrId(), getUrlQz("mjyList"));
         noticeService.save("麻精药【" + mjyOld.getMc() + "】归还", mjyOld.getKcbjrId(), getUrlQz("mjyList"));
@@ -1140,7 +1140,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
         formData.put("签名人2", qmr2.getNickName());
         formData.put("库管员1", jsr1.getNickName());
         formData.put("库管员2", jsr2.getNickName());
-        mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "麻精药入库", JcmcysEnum.green.getValue(), formData, null, null);
+        mjyJcgjService.saveJcgj(mjyOld, JcgjlxEnum.lc.getValue(), "麻精药入库", JcmcysEnum.green.getValue(), formData, null, null);
         // 更新
         mjyOld.setCctj(form.getRktj());
         mjyOld.setCcwz(form.getRkwz());
@@ -1182,7 +1182,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
         formData.put("存储条件", form.getCctj());
         formData.put("签名人1", qmr.getNickName());
         formData.put("签名人2", qmr.getNickName());
-        mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "存储", JcmcysEnum.green.getValue(), formData, null, form.getRemark());
+        mjyJcgjService.saveJcgj(mjyOld, JcgjlxEnum.lc.getValue(), "存储", JcmcysEnum.green.getValue(), formData, null, form.getRemark());
         //台账
         mjyTzService.saveTz(mjyOld.getId(), null, null, qmr, qmr2, null, null, null, null, null, "存储", mjyOld.getKc(), mjyOld.getKcdw(), form.getRemark());
     }
@@ -1215,7 +1215,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
         Map<String, String> formData = new LinkedHashMap<>();
         formData.put("签名人1", qmr.getNickName());
         formData.put("签名人2", qmr.getNickName());
-        mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "取出", JcmcysEnum.green.getValue(), formData, null, form.getRemark());
+        mjyJcgjService.saveJcgj(mjyOld, JcgjlxEnum.lc.getValue(), "取出", JcmcysEnum.green.getValue(), formData, null, form.getRemark());
         //台账
         mjyTzService.saveTz(mjyOld.getId(), null, null, qmr, qmr2, null, null, null, null, null, "取出", mjyOld.getKc(), mjyOld.getKcdw(), form.getRemark());
     }
@@ -1495,7 +1495,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
         mjyOld.setZjzt(ZjztEnum.gd.getValue());
         this.updateById(mjyOld);
         //稽查轨迹
-        mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "同意归档", JcmcysEnum.green.getValue(), null, qmr, form.getRemark());
+        mjyJcgjService.saveJcgj(mjyOld, JcgjlxEnum.lc.getValue(), "同意归档", JcmcysEnum.green.getValue(), null, qmr, form.getRemark());
         //保存日志
         archiveLogService.saveInfo(ArchiveLogTypeEnum.mjy, mjyOld.getId(), mjyOld.getMc(), mjyOld.getBh(), mjyOld.getNd() + mjyOld.getNddw(), "同意归档");
         //通知
@@ -1526,7 +1526,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
         //稽查轨迹
         Map<String, String> formData = new LinkedHashMap<>();
         formData.put("原因", form.getRemark());
-        mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "拒绝归档", JcmcysEnum.green.getValue(), formData, qmr, null);
+        mjyJcgjService.saveJcgj(mjyOld, JcgjlxEnum.lc.getValue(), "拒绝归档", JcmcysEnum.green.getValue(), formData, qmr, null);
         //保存日志
         archiveLogService.saveInfo(ArchiveLogTypeEnum.mjy, mjyOld.getId(), mjyOld.getMc(), mjyOld.getBh(), mjyOld.getNd() + mjyOld.getNddw(), "拒绝归档");
         //通知
@@ -1555,7 +1555,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
         mjyOld.setDazt(DaztEnum.wgd.getValue());
         this.updateById(mjyOld);
         //稽查轨迹
-        mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "同意解档", JcmcysEnum.green.getValue(), null, qmr, form.getRemark());
+        mjyJcgjService.saveJcgj(mjyOld, JcgjlxEnum.lc.getValue(), "同意解档", JcmcysEnum.green.getValue(), null, qmr, form.getRemark());
         //保存日志
         archiveLogService.saveInfo(ArchiveLogTypeEnum.mjy, mjyOld.getId(), mjyOld.getMc(), mjyOld.getBh(), mjyOld.getNd() + mjyOld.getNddw(), "同意解档");
         //通知
@@ -1585,7 +1585,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
         //稽查轨迹
         Map<String, String> formData = new LinkedHashMap<>();
         formData.put("原因", form.getRemark());
-        mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "拒绝解档", JcmcysEnum.green.getValue(), formData, qmr, null);
+        mjyJcgjService.saveJcgj(mjyOld, JcgjlxEnum.lc.getValue(), "拒绝解档", JcmcysEnum.green.getValue(), formData, qmr, null);
         //保存日志
         archiveLogService.saveInfo(ArchiveLogTypeEnum.mjy, mjyOld.getId(), mjyOld.getMc(), mjyOld.getBh(), mjyOld.getNd() + mjyOld.getNddw(), "拒绝解档");
         //通知
@@ -1618,7 +1618,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
         Map<String, String> formData = new LinkedHashMap<>();
         formData.put("借阅开始时间", DateUtils.dateTime(form.getJyksrq()));
         formData.put("借阅结束时间", DateUtils.dateTime(form.getJyjsrq()));
-        mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "同意借阅", JcmcysEnum.green.getValue(), formData, qmr, form.getRemark());
+        mjyJcgjService.saveJcgj(mjyOld, JcgjlxEnum.lc.getValue(), "同意借阅", JcmcysEnum.green.getValue(), formData, qmr, form.getRemark());
         //保存日志
         archiveLogService.saveInfo(ArchiveLogTypeEnum.mjy, mjyOld.getId(), mjyOld.getMc(), mjyOld.getBh(), mjyOld.getNd() + mjyOld.getNddw(), "同意借阅");
         //通知
@@ -1652,7 +1652,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
         formData.put("借阅开始时间", DateUtils.dateTime(form.getJyksrq()));
         formData.put("借阅结束时间", DateUtils.dateTime(form.getJyjsrq()));
         formData.put("原因", form.getRemark());
-        mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "拒绝借阅", JcmcysEnum.green.getValue(), formData, qmr, null);
+        mjyJcgjService.saveJcgj(mjyOld, JcgjlxEnum.lc.getValue(), "拒绝借阅", JcmcysEnum.green.getValue(), formData, qmr, null);
         //保存日志
         archiveLogService.saveInfo(ArchiveLogTypeEnum.mjy, mjyOld.getId(), mjyOld.getMc(), mjyOld.getBh(), mjyOld.getNd() + mjyOld.getNddw(), "拒绝借阅");
         //通知
@@ -1680,7 +1680,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
         mjyOld.setJyzt(JyztEnum.wjy.getValue());
         this.updateById(mjyOld);
         //稽查轨迹
-        mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "确认归还", JcmcysEnum.green.getValue(), null, qmr, form.getRemark());
+        mjyJcgjService.saveJcgj(mjyOld, JcgjlxEnum.lc.getValue(), "确认归还", JcmcysEnum.green.getValue(), null, qmr, form.getRemark());
         //保存日志
         archiveLogService.saveInfo(ArchiveLogTypeEnum.mjy, mjyOld.getId(), mjyOld.getMc(), mjyOld.getBh(), mjyOld.getNd() + mjyOld.getNddw(), "确认归还");
         //通知

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

@@ -76,7 +76,7 @@ public class StudyFormApplyJcgjServiceImpl extends ServiceImpl
 
     /**
      * 新增稽查轨迹
-     * @param formId 表单id
+     * @param studyFormApply 表单
      * @param jcgjlx 稽查轨迹类型:1:流程；3：编辑
      * @param jcmc 稽查名称
      * @param jcmcys 稽查名称颜色：1：蓝色；3：红色；5：绿色；7：橙色
@@ -86,10 +86,9 @@ public class StudyFormApplyJcgjServiceImpl extends ServiceImpl
      * @param time 时间
      */
     @Override
-    @Async
-    public  void saveJcgj(Long  formId, Integer jcgjlx, String jcmc, Integer jcmcys, Map<String, String> jcnr, SysUser qmr, String remark, Date time){
+    public  void saveJcgj(StudyFormApply studyFormApply, Integer jcgjlx, String jcmc, Integer jcmcys, Map<String, String> jcnr, SysUser qmr, String remark, Date time){
         StudyFormApplyJcgj formJcgj = new StudyFormApplyJcgj();
-        formJcgj.setFormId(formId);
+        formJcgj.setFormId(studyFormApply.getId());
         formJcgj.setJcgjlx(jcgjlx);
         formJcgj.setJcmc(jcmc);
         formJcgj.setJcmcEn(StudyFormUtil.getEn(jcmc));
@@ -108,6 +107,8 @@ public class StudyFormApplyJcgjServiceImpl extends ServiceImpl
         }
         formJcgj.setRemark(remark);
         this.save(formJcgj);
+        systemLogService.saveInfo(studyFormApply.getBdbh(), studyFormApply.getBdbh(), formJcgj.getJcmc(), formJcgj.getJcmcEn(),
+                formJcgj.getJcnr(), formJcgj.getJcnrEn(), formJcgj.getQmrId(), formJcgj.getQmrMc(), formJcgj.getQmrMcEn(), formJcgj.getRemark());
     }
 
 

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

@@ -140,7 +140,7 @@ public class StudyFormApplyServiceImpl extends ServiceImpl
             throw new ServiceException("表单不是申请状态，不能加签");
         }
         //稽查轨迹
-        studyFormApplyJcgjService.saveJcgj(studyFormApplyOld.getId(), JcgjlxEnum.bj.getValue(), studyFormApply.getQmyy(), JcmcysEnum.orange.getValue(), null, qmr, studyFormApply.getRemark(), null);
+        studyFormApplyJcgjService.saveJcgj(studyFormApplyOld, JcgjlxEnum.bj.getValue(), studyFormApply.getQmyy(), JcmcysEnum.orange.getValue(), null, qmr, studyFormApply.getRemark(), null);
         //签名信息
         studyFormApplyQmxxService.saveQmxx(studyFormApply.getId(), studyFormApply.getQmyy(), qmr, studyFormApply.getRemark());
 
@@ -169,7 +169,7 @@ public class StudyFormApplyServiceImpl extends ServiceImpl
         studyFormApplyOld.setBdzt(StudyFormApplyBdztEnum.dfz.getValue());
         this.updateById(studyFormApplyOld);
         //稽查轨迹
-        studyFormApplyJcgjService.saveJcgj(studyFormApplyOld.getId(), JcgjlxEnum.lc.getValue(), "申请废止", JcmcysEnum.orange.getValue(), null, qmr, studyFormApply.getRemark(), null);
+        studyFormApplyJcgjService.saveJcgj(studyFormApplyOld, JcgjlxEnum.lc.getValue(), "申请废止", JcmcysEnum.orange.getValue(), null, qmr, studyFormApply.getRemark(), null);
         //签名信息
         studyFormApplyQmxxService.saveQmxx(studyFormApply.getId(), "申请废止", qmr, studyFormApply.getRemark());
 
@@ -200,7 +200,7 @@ public class StudyFormApplyServiceImpl extends ServiceImpl
             studyFormApplyOld.setBdzt(StudyFormApplyBdztEnum.yfz.getValue());
             this.updateById(studyFormApplyOld);
             //稽查轨迹
-            studyFormApplyJcgjService.saveJcgj(studyFormApplyOld.getId(), JcgjlxEnum.lc.getValue(), "废止通过", JcmcysEnum.green.getValue(), null, qmr, form.getRemark(), null);
+            studyFormApplyJcgjService.saveJcgj(studyFormApplyOld, JcgjlxEnum.lc.getValue(), "废止通过", JcmcysEnum.green.getValue(), null, qmr, form.getRemark(), null);
             //签名信息
             studyFormApplyQmxxService.saveQmxx(studyFormApplyOld.getId(), "废止通过", qmr, form.getRemark());
             //发送通知
@@ -212,7 +212,7 @@ public class StudyFormApplyServiceImpl extends ServiceImpl
             studyFormApplyOld.setBdzt(StudyFormApplyBdztEnum.tbz.getValue());
             this.updateById(studyFormApplyOld);
             //稽查轨迹
-            studyFormApplyJcgjService.saveJcgj(studyFormApplyOld.getId(), JcgjlxEnum.lc.getValue(), "废止拒绝", JcmcysEnum.red.getValue(), null, qmr, form.getRemark(), null);
+            studyFormApplyJcgjService.saveJcgj(studyFormApplyOld, JcgjlxEnum.lc.getValue(), "废止拒绝", JcmcysEnum.red.getValue(), null, qmr, form.getRemark(), null);
             //签名信息
             studyFormApplyQmxxService.saveQmxx(studyFormApplyOld.getId(), "废止拒绝", qmr, form.getRemark());
             //发送通知
@@ -256,7 +256,7 @@ public class StudyFormApplyServiceImpl extends ServiceImpl
         formData.put("新归属人", studyFormApply.getUserMc());
         formData.put("原归属人", studyFormApplyOld.getUserMc());
         formData.put("原因", studyFormApply.getRemark());
-        studyFormApplyJcgjService.saveJcgj(studyFormApplyOld.getId(), JcgjlxEnum.lc.getValue(), "更换归属人", JcmcysEnum.orange.getValue(), formData, qmr, null, null);
+        studyFormApplyJcgjService.saveJcgj(studyFormApplyOld, JcgjlxEnum.lc.getValue(), "更换归属人", JcmcysEnum.orange.getValue(), formData, qmr, null, null);
         //签名信息
         studyFormApplyQmxxService.saveQmxx(studyFormApplyOld.getId(), "更换归属人", qmr, studyFormApply.getRemark());
         //发送通知
@@ -309,7 +309,7 @@ public class StudyFormApplyServiceImpl extends ServiceImpl
             //稽查轨迹
             Map<String, String> formData = new LinkedHashMap<>();
             formData.put("备注", studyFormApply.getRemark());
-            studyFormApplyJcgjService.saveJcgj(studyFormApply.getId(), JcgjlxEnum.lc.getValue(), "填写并保存记录", JcmcysEnum.green.getValue(), formData, qmr, null, null);
+            studyFormApplyJcgjService.saveJcgj(studyFormApply, JcgjlxEnum.lc.getValue(), "填写并保存记录", JcmcysEnum.green.getValue(), formData, qmr, null, null);
             result = studyFormApply;
         }
         //签名信息
@@ -375,7 +375,7 @@ public class StudyFormApplyServiceImpl extends ServiceImpl
         //稽查轨迹
         Map<String, String> formData = new LinkedHashMap<>();
         formData.put("备注", studyFormApply.getRemark());
-        studyFormApplyJcgjService.saveJcgj(studyFormApply.getId(), JcgjlxEnum.lc.getValue(), "填写并提交记录", JcmcysEnum.green.getValue(), formData, qmr, null, null);
+        studyFormApplyJcgjService.saveJcgj(studyFormApply, JcgjlxEnum.lc.getValue(), "填写并提交记录", JcmcysEnum.green.getValue(), formData, qmr, null, null);
         //签名信息
         studyFormApplyQmxxService.saveQmxx(studyFormApply.getId(), "填写并提交记录", qmr, studyFormApply.getRemark());
     }
@@ -406,7 +406,7 @@ public class StudyFormApplyServiceImpl extends ServiceImpl
         //稽查轨迹
         Map<String, String> formData = new LinkedHashMap<>();
         formData.put("原因", studyFormApply.getRemark());
-        studyFormApplyJcgjService.saveJcgj(studyFormApplyOld.getId(), JcgjlxEnum.lc.getValue(), "复核通过", JcmcysEnum.green.getValue(), formData, qmr, null, null);
+        studyFormApplyJcgjService.saveJcgj(studyFormApplyOld, JcgjlxEnum.lc.getValue(), "复核通过", JcmcysEnum.green.getValue(), formData, qmr, null, null);
         //签名信息
         studyFormApplyQmxxService.saveQmxx(studyFormApplyOld.getId(), "复核通过", qmr, studyFormApply.getRemark());
         //发送通知
@@ -442,7 +442,7 @@ public class StudyFormApplyServiceImpl extends ServiceImpl
         //稽查轨迹
         Map<String, String> formData = new LinkedHashMap<>();
         formData.put("原因", studyFormApply.getRemark());
-        studyFormApplyJcgjService.saveJcgj(studyFormApplyOld.getId(), JcgjlxEnum.lc.getValue(), "复核拒绝", JcmcysEnum.red.getValue(), formData, qmr, null, null);
+        studyFormApplyJcgjService.saveJcgj(studyFormApplyOld, JcgjlxEnum.lc.getValue(), "复核拒绝", JcmcysEnum.red.getValue(), formData, qmr, null, null);
         //签名信息
         studyFormApplyQmxxService.saveQmxx(studyFormApplyOld.getId(), "复核拒绝", qmr, studyFormApply.getRemark());
         //发送通知
@@ -477,7 +477,7 @@ public class StudyFormApplyServiceImpl extends ServiceImpl
         //稽查轨迹
         Map<String, String> formData = new LinkedHashMap<>();
         formData.put("备注", studyFormApply.getRemark());
-        studyFormApplyJcgjService.saveJcgj(studyFormApplyOld.getId(), JcgjlxEnum.lc.getValue(), "已审阅", JcmcysEnum.green.getValue(), null, qmr, studyFormApply.getRemark(), null);
+        studyFormApplyJcgjService.saveJcgj(studyFormApplyOld, JcgjlxEnum.lc.getValue(), "已审阅", JcmcysEnum.green.getValue(), null, qmr, studyFormApply.getRemark(), null);
         //签名信息
         studyFormApplyQmxxService.saveQmxx(studyFormApplyOld.getId(), "已审阅", qmr, studyFormApply.getRemark());
         //发送通知
@@ -511,7 +511,7 @@ public class StudyFormApplyServiceImpl extends ServiceImpl
         studyFormApplyOld.setBdzt(StudyFormApplyBdztEnum.ywc.getValue());
         this.updateById(studyFormApplyOld);
         //稽查轨迹
-        studyFormApplyJcgjService.saveJcgj(studyFormApplyOld.getId(), JcgjlxEnum.lc.getValue(), "审核通过", JcmcysEnum.green.getValue(), null, qmr, studyFormApply.getRemark(), null);
+        studyFormApplyJcgjService.saveJcgj(studyFormApplyOld, JcgjlxEnum.lc.getValue(), "审核通过", JcmcysEnum.green.getValue(), null, qmr, studyFormApply.getRemark(), null);
         //签名信息
         studyFormApplyQmxxService.saveQmxx(studyFormApplyOld.getId(), "审核通过", qmr, studyFormApply.getRemark());
         //发送通知
@@ -547,7 +547,7 @@ public class StudyFormApplyServiceImpl extends ServiceImpl
         //稽查轨迹
         Map<String, String> formData = new LinkedHashMap<>();
         formData.put("原因", studyFormApply.getRemark());
-        studyFormApplyJcgjService.saveJcgj(studyFormApplyOld.getId(), JcgjlxEnum.lc.getValue(), "审核拒绝", JcmcysEnum.red.getValue(), formData, qmr, studyFormApply.getRemark(), null);
+        studyFormApplyJcgjService.saveJcgj(studyFormApplyOld, JcgjlxEnum.lc.getValue(), "审核拒绝", JcmcysEnum.red.getValue(), formData, qmr, studyFormApply.getRemark(), null);
         //签名信息
         studyFormApplyQmxxService.saveQmxx(studyFormApplyOld.getId(), "审核拒绝", qmr, studyFormApply.getRemark());
         //发送通知

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

@@ -83,7 +83,7 @@ public class StudyFormFillJcgjServiceImpl extends ServiceImpl
 
     /**
      * 新增稽查轨迹
-     * @param formId 表单id
+     * @param studyFormFill 表单
      * @param jcgjlx 稽查轨迹类型:1:流程；3：编辑
      * @param jcmc 稽查名称
      * @param jcmcys 稽查名称颜色：1：蓝色；3：红色；5：绿色；7：橙色
@@ -93,10 +93,9 @@ public class StudyFormFillJcgjServiceImpl extends ServiceImpl
      * @param time 时间
      */
     @Override
-    @Async
-    public  void saveJcgj(Long  formId, Integer jcgjlx, String jcmc, Integer jcmcys, Map<String, String> jcnr, SysUser qmr, String remark, Date time){
+    public  void saveJcgj(StudyFormFill studyFormFill,Integer jcgjlx, String jcmc, Integer jcmcys, Map<String, String> jcnr, SysUser qmr, String remark, Date time){
         StudyFormFillJcgj formJcgj = new StudyFormFillJcgj();
-        formJcgj.setFormId(formId);
+        formJcgj.setFormId(studyFormFill.getId());
         formJcgj.setJcgjlx(jcgjlx);
         formJcgj.setJcmc(jcmc);
         formJcgj.setJcmcEn(StudyFormUtil.getEn(jcmc));
@@ -115,6 +114,9 @@ public class StudyFormFillJcgjServiceImpl extends ServiceImpl
         }
         formJcgj.setRemark(remark);
         this.save(formJcgj);
+
+        systemLogService.saveInfo(studyFormFill.getBdbh(), studyFormFill.getBdbh(), formJcgj.getJcmc(), formJcgj.getJcmcEn(),
+                formJcgj.getJcnr(), formJcgj.getJcnrEn(), formJcgj.getQmrId(), formJcgj.getQmrMc(), formJcgj.getQmrMcEn(), formJcgj.getRemark());
     }
 
 

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

@@ -232,7 +232,7 @@ public class StudyFormFillServiceImpl extends ServiceImpl
             throw new ServiceException("表单不是填报状态，不能加签");
         }
         //稽查轨迹
-        studyFormFillJcgjService.saveJcgj(studyFormFillOld.getId(), JcgjlxEnum.bj.getValue(), studyFormFill.getQmyy(), JcmcysEnum.orange.getValue(), null, SecurityUtils.getLoginUser().getSysUser(), studyFormFill.getRemark(), null);
+        studyFormFillJcgjService.saveJcgj(studyFormFillOld, JcgjlxEnum.bj.getValue(), studyFormFill.getQmyy(), JcmcysEnum.orange.getValue(), null, SecurityUtils.getLoginUser().getSysUser(), studyFormFill.getRemark(), null);
         //签名信息
         studyFormFillQmxxService.saveQmxx(studyFormFill.getId(), studyFormFill.getQmyy(), qmr, studyFormFill.getRemark());
 
@@ -261,7 +261,7 @@ public class StudyFormFillServiceImpl extends ServiceImpl
         studyFormFillOld.setBdzt(StudyFormFillBdztEnum.dfz.getValue());
         this.updateById(studyFormFillOld);
         //稽查轨迹
-        studyFormFillJcgjService.saveJcgj(studyFormFillOld.getId(), JcgjlxEnum.lc.getValue(), "申请废止", JcmcysEnum.orange.getValue(), null, SecurityUtils.getLoginUser().getSysUser(), null, null);
+        studyFormFillJcgjService.saveJcgj(studyFormFillOld, JcgjlxEnum.lc.getValue(), "申请废止", JcmcysEnum.orange.getValue(), null, SecurityUtils.getLoginUser().getSysUser(), null, null);
         //签名信息
         studyFormFillQmxxService.saveQmxx(studyFormFill.getId(), "申请废止", qmr, studyFormFill.getRemark());
 
@@ -294,7 +294,7 @@ public class StudyFormFillServiceImpl extends ServiceImpl
             //稽查轨迹
             Map<String, String> formData = new LinkedHashMap<>();
             formData.put("原因", form.getRemark());
-            studyFormFillJcgjService.saveJcgj(studyFormFillOld.getId(), JcgjlxEnum.lc.getValue(), "废止通过", JcmcysEnum.green.getValue(), formData, SecurityUtils.getLoginUser().getSysUser(), null, null);
+            studyFormFillJcgjService.saveJcgj(studyFormFillOld, JcgjlxEnum.lc.getValue(), "废止通过", JcmcysEnum.green.getValue(), formData, SecurityUtils.getLoginUser().getSysUser(), null, null);
             //签名信息
             studyFormFillQmxxService.saveQmxx(studyFormFillOld.getId(), "废止通过", qmr, form.getRemark());
             //发送通知
@@ -308,7 +308,7 @@ public class StudyFormFillServiceImpl extends ServiceImpl
             //稽查轨迹
             Map<String, String> formData = new LinkedHashMap<>();
             formData.put("原因", form.getRemark());
-            studyFormFillJcgjService.saveJcgj(studyFormFillOld.getId(), JcgjlxEnum.lc.getValue(), "废止拒绝", JcmcysEnum.red.getValue(), formData, SecurityUtils.getLoginUser().getSysUser(), null, null);
+            studyFormFillJcgjService.saveJcgj(studyFormFillOld, JcgjlxEnum.lc.getValue(), "废止拒绝", JcmcysEnum.red.getValue(), formData, SecurityUtils.getLoginUser().getSysUser(), null, null);
             //签名信息
             studyFormFillQmxxService.saveQmxx(studyFormFillOld.getId(), "废止拒绝", qmr, form.getRemark());
             //发送通知
@@ -367,7 +367,7 @@ public class StudyFormFillServiceImpl extends ServiceImpl
         studyFormFillOld.setUserId(studyFormFill.getUserId());
         studyFormFillOld.setUserMc(studyFormFill.getUserMc());
         this.updateById(studyFormFillOld);
-        studyFormFillJcgjService.saveJcgj(studyFormFillOld.getId(), JcgjlxEnum.lc.getValue(), "更换归属人", JcmcysEnum.orange.getValue(), null, SecurityUtils.getLoginUser().getSysUser(), null, null);
+        studyFormFillJcgjService.saveJcgj(studyFormFillOld, JcgjlxEnum.lc.getValue(), "更换归属人", JcmcysEnum.orange.getValue(), null, SecurityUtils.getLoginUser().getSysUser(), null, null);
         //签名信息
         studyFormFillQmxxService.saveQmxx(studyFormFillOld.getId(), "更换归属人", qmr, studyFormFill.getRemark());
         //发送通知
@@ -406,7 +406,7 @@ public class StudyFormFillServiceImpl extends ServiceImpl
             //稽查轨迹
             Map<String, String> formData = new LinkedHashMap<>();
             formData.put("备注", studyFormFill.getRemark());
-            studyFormFillJcgjService.saveJcgj(studyFormFillOld.getId(), JcgjlxEnum.lc.getValue(), "填写并保存记录", JcmcysEnum.green.getValue(), formData, SecurityUtils.getLoginUser().getSysUser(), null, null);
+            studyFormFillJcgjService.saveJcgj(studyFormFillOld, JcgjlxEnum.lc.getValue(), "填写并保存记录", JcmcysEnum.green.getValue(), formData, SecurityUtils.getLoginUser().getSysUser(), null, null);
         } else {
             studyFormFill.setBdzt(StudyFormFillBdztEnum.tbz.getValue());
             studyFormFill.setUserId(SecurityUtils.getUserId());
@@ -420,7 +420,7 @@ public class StudyFormFillServiceImpl extends ServiceImpl
             //稽查轨迹
             Map<String, String> formData = new LinkedHashMap<>();
             formData.put("备注", studyFormFill.getRemark());
-            studyFormFillJcgjService.saveJcgj(studyFormFill.getId(), JcgjlxEnum.lc.getValue(), "创建记录", JcmcysEnum.green.getValue(), formData, SecurityUtils.getLoginUser().getSysUser(), null, null);
+            studyFormFillJcgjService.saveJcgj(studyFormFill, JcgjlxEnum.lc.getValue(), "创建记录", JcmcysEnum.green.getValue(), formData, SecurityUtils.getLoginUser().getSysUser(), null, null);
         }
         return baseMapper.queryInfo(result.getId());
     }
@@ -440,7 +440,7 @@ public class StudyFormFillServiceImpl extends ServiceImpl
         studyFormFill.setUserMc(SecurityUtils.getNickName());
         this.save(studyFormFill);
         //稽查轨迹
-        studyFormFillJcgjService.saveJcgj(studyFormFill.getId(), JcgjlxEnum.lc.getValue(), "创建记录", JcmcysEnum.green.getValue(), null, qmr, studyFormFill.getRemark(), null);
+        studyFormFillJcgjService.saveJcgj(studyFormFill, JcgjlxEnum.lc.getValue(), "创建记录", JcmcysEnum.green.getValue(), null, qmr, studyFormFill.getRemark(), null);
         //签名信息
         studyFormFillQmxxService.saveQmxx(studyFormFill.getId(), "创建记录", qmr, studyFormFill.getRemark());
     }
@@ -617,7 +617,7 @@ public class StudyFormFillServiceImpl extends ServiceImpl
             //稽查轨迹
             Map<String, String> formData = new LinkedHashMap<>();
             formData.put("备注", studyFormFill.getRemark());
-            studyFormFillJcgjService.saveJcgj(studyFormFillOld.getId(), JcgjlxEnum.lc.getValue(), "填写并提交记录", JcmcysEnum.green.getValue(), formData, qmr, null, null);
+            studyFormFillJcgjService.saveJcgj(studyFormFillOld, JcgjlxEnum.lc.getValue(), "填写并提交记录", JcmcysEnum.green.getValue(), formData, qmr, null, null);
         } else {
             studyFormFill.setBdzt(StudyFormFillBdztEnum.ytj.getValue());
             studyFormFill.setUserId(SecurityUtils.getUserId());
@@ -633,7 +633,7 @@ public class StudyFormFillServiceImpl extends ServiceImpl
             //稽查轨迹
             Map<String, String> formData = new LinkedHashMap<>();
             formData.put("备注", studyFormFill.getRemark());
-            studyFormFillJcgjService.saveJcgj(studyFormFill.getId(), JcgjlxEnum.lc.getValue(), "填写并提交记录", JcmcysEnum.green.getValue(), formData, qmr, null, null);
+            studyFormFillJcgjService.saveJcgj(studyFormFill, JcgjlxEnum.lc.getValue(), "填写并提交记录", JcmcysEnum.green.getValue(), formData, qmr, null, null);
         }
         //签名信息
         studyFormFillQmxxService.saveQmxx(studyFormFill.getId(), "填写并提交记录", qmr, studyFormFill.getRemark());
@@ -695,7 +695,7 @@ public class StudyFormFillServiceImpl extends ServiceImpl
         //稽查轨迹
         Map<String, String> formData = new LinkedHashMap<>();
         formData.put("生长情况", form.getQmyy());
-        studyFormFillJcgjService.saveJcgj(studyFormFillOld.getId(), JcgjlxEnum.lc.getValue(), form.getQmyy(), JcmcysEnum.orange.getValue(), formData, SecurityUtils.getLoginUser().getSysUser(), form.getRemark(), null);
+        studyFormFillJcgjService.saveJcgj(studyFormFillOld, JcgjlxEnum.lc.getValue(), form.getQmyy(), JcmcysEnum.orange.getValue(), formData, SecurityUtils.getLoginUser().getSysUser(), form.getRemark(), null);
         //签名信息
         studyFormFillQmxxService.saveQmxx(studyFormFillOld.getId(), form.getQmyy(), qmr, form.getRemark());
 
@@ -728,7 +728,7 @@ public class StudyFormFillServiceImpl extends ServiceImpl
         //稽查轨迹
         Map<String, String> formData = new LinkedHashMap<>();
         formData.put("原因", studyFormFill.getRemark());
-        studyFormFillJcgjService.saveJcgj(studyFormFillOld.getId(), JcgjlxEnum.lc.getValue(), "复核通过", JcmcysEnum.green.getValue(), formData, SecurityUtils.getLoginUser().getSysUser(), null, null);
+        studyFormFillJcgjService.saveJcgj(studyFormFillOld, JcgjlxEnum.lc.getValue(), "复核通过", JcmcysEnum.green.getValue(), formData, SecurityUtils.getLoginUser().getSysUser(), null, null);
         //签名信息
         studyFormFillQmxxService.saveQmxx(studyFormFillOld.getId(), "复核通过", qmr, studyFormFill.getRemark());
         //发送通知
@@ -765,7 +765,7 @@ public class StudyFormFillServiceImpl extends ServiceImpl
         //稽查轨迹
         Map<String, String> formData = new LinkedHashMap<>();
         formData.put("原因", studyFormFill.getRemark());
-        studyFormFillJcgjService.saveJcgj(studyFormFillOld.getId(), JcgjlxEnum.lc.getValue(), "复核拒绝", JcmcysEnum.red.getValue(), formData, SecurityUtils.getLoginUser().getSysUser(), null, null);
+        studyFormFillJcgjService.saveJcgj(studyFormFillOld, JcgjlxEnum.lc.getValue(), "复核拒绝", JcmcysEnum.red.getValue(), formData, SecurityUtils.getLoginUser().getSysUser(), null, null);
 
         //签名信息
         studyFormFillQmxxService.saveQmxx(studyFormFillOld.getId(), "复核拒绝", qmr, studyFormFill.getRemark());
@@ -803,7 +803,7 @@ public class StudyFormFillServiceImpl extends ServiceImpl
         //稽查轨迹
         Map<String, String> formData = new LinkedHashMap<>();
         formData.put("原因", studyFormFill.getRemark());
-        studyFormFillJcgjService.saveJcgj(studyFormFillOld.getId(), JcgjlxEnum.lc.getValue(), "免复核通过", JcmcysEnum.green.getValue(), null, SecurityUtils.getLoginUser().getSysUser(), null, null);
+        studyFormFillJcgjService.saveJcgj(studyFormFillOld, JcgjlxEnum.lc.getValue(), "免复核通过", JcmcysEnum.green.getValue(), null, SecurityUtils.getLoginUser().getSysUser(), null, null);
 
         //签名信息
         studyFormFillQmxxService.saveQmxx(studyFormFillOld.getId(), "免复核通过", qmr, studyFormFill.getRemark());
@@ -839,7 +839,7 @@ public class StudyFormFillServiceImpl extends ServiceImpl
         //稽查轨迹
         Map<String, String> formData = new LinkedHashMap<>();
         formData.put("备注", studyFormFill.getRemark());
-        studyFormFillJcgjService.saveJcgj(studyFormFillOld.getId(), JcgjlxEnum.lc.getValue(), "已审阅", JcmcysEnum.green.getValue(), formData, SecurityUtils.getLoginUser().getSysUser(), null, null);
+        studyFormFillJcgjService.saveJcgj(studyFormFillOld, JcgjlxEnum.lc.getValue(), "已审阅", JcmcysEnum.green.getValue(), formData, SecurityUtils.getLoginUser().getSysUser(), null, null);
         //签名信息
         studyFormFillQmxxService.saveQmxx(studyFormFillOld.getId(), "已审阅", qmr, studyFormFill.getRemark());
         //发送通知

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

@@ -77,7 +77,7 @@ public class StudyFormPlanJcgjServiceImpl extends ServiceImpl
 
     /**
      * 新增稽查轨迹
-     * @param formId 表单id
+     * @param studyFormPlan 表单
      * @param jcgjlx 稽查轨迹类型:1:流程；3：编辑
      * @param jcmc 稽查名称
      * @param jcmcys 稽查名称颜色：1：蓝色；3：红色；5：绿色；7：橙色
@@ -87,10 +87,9 @@ public class StudyFormPlanJcgjServiceImpl extends ServiceImpl
      * @param time 时间
      */
     @Override
-    @Async
-    public  void saveJcgj(Long  formId, Integer jcgjlx, String jcmc, Integer jcmcys, Map<String, String> jcnr, SysUser qmr, String remark, Date time){
+    public  void saveJcgj(StudyFormPlan studyFormPlan, Integer jcgjlx, String jcmc, Integer jcmcys, Map<String, String> jcnr, SysUser qmr, String remark, Date time){
         StudyFormPlanJcgj formJcgj = new StudyFormPlanJcgj();
-        formJcgj.setFormId(formId);
+        formJcgj.setFormId(studyFormPlan.getId());
         formJcgj.setJcgjlx(jcgjlx);
         formJcgj.setJcmc(jcmc);
         formJcgj.setJcmcEn(StudyFormUtil.getEn(jcmc));
@@ -109,6 +108,8 @@ public class StudyFormPlanJcgjServiceImpl extends ServiceImpl
         }
         formJcgj.setRemark(remark);
         this.save(formJcgj);
+        systemLogService.saveInfo(studyFormPlan.getBdbh(), studyFormPlan.getBdbh(), formJcgj.getJcmc(), formJcgj.getJcmcEn(),
+                formJcgj.getJcnr(), formJcgj.getJcnrEn(), formJcgj.getQmrId(), formJcgj.getQmrMc(), formJcgj.getQmrMcEn(), formJcgj.getRemark());
     }
 
 

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

@@ -128,7 +128,7 @@ public class StudyFormPlanServiceImpl extends ServiceImpl
         formData.put("新归属人", studyFormPlan.getUserMc());
         formData.put("原归属人", studyFormPlanOld.getUserMc());
         formData.put("原因", studyFormPlan.getRemark());
-        studyFormPlanJcgjService.saveJcgj(studyFormPlanOld.getId(), JcgjlxEnum.lc.getValue(), "更换归属人", JcmcysEnum.orange.getValue(), formData, qmr, null, null);
+        studyFormPlanJcgjService.saveJcgj(studyFormPlanOld, JcgjlxEnum.lc.getValue(), "更换归属人", JcmcysEnum.orange.getValue(), formData, qmr, null, null);
         //签名信息
         studyFormPlanQmxxService.saveQmxx(studyFormPlanOld.getId(), "更换归属人", qmr, studyFormPlan.getRemark());
         //发送通知
@@ -181,7 +181,7 @@ public class StudyFormPlanServiceImpl extends ServiceImpl
             //稽查轨迹
             Map<String, String> formData = new LinkedHashMap<>();
             formData.put("备注", studyFormPlan.getRemark());
-            studyFormPlanJcgjService.saveJcgj(studyFormPlan.getId(), JcgjlxEnum.lc.getValue(), "填写并保存记录", JcmcysEnum.green.getValue(), formData, qmr, null, null);
+            studyFormPlanJcgjService.saveJcgj(studyFormPlan, JcgjlxEnum.lc.getValue(), "填写并保存记录", JcmcysEnum.green.getValue(), formData, qmr, null, null);
             result = studyFormPlan;
         }
         //签名信息
@@ -253,7 +253,7 @@ public class StudyFormPlanServiceImpl extends ServiceImpl
         //稽查轨迹
         Map<String, String> formData = new LinkedHashMap<>();
         formData.put("备注", studyFormPlan.getRemark());
-        studyFormPlanJcgjService.saveJcgj(studyFormPlan.getId(), JcgjlxEnum.lc.getValue(), "填写并提交记录", JcmcysEnum.green.getValue(), formData, qmr, null, null);
+        studyFormPlanJcgjService.saveJcgj(studyFormPlan, JcgjlxEnum.lc.getValue(), "填写并提交记录", JcmcysEnum.green.getValue(), formData, qmr, null, null);
         //签名信息
         studyFormPlanQmxxService.saveQmxx(studyFormPlan.getId(), "填写并提交记录", qmr, studyFormPlan.getRemark());
     }
@@ -284,7 +284,7 @@ public class StudyFormPlanServiceImpl extends ServiceImpl
         //稽查轨迹
         Map<String, String> formData = new LinkedHashMap<>();
         formData.put("原因", studyFormPlan.getRemark());
-        studyFormPlanJcgjService.saveJcgj(studyFormPlanOld.getId(), JcgjlxEnum.lc.getValue(), "复核通过", JcmcysEnum.green.getValue(), formData, qmr, null, null);
+        studyFormPlanJcgjService.saveJcgj(studyFormPlanOld, JcgjlxEnum.lc.getValue(), "复核通过", JcmcysEnum.green.getValue(), formData, qmr, null, null);
         //签名信息
         studyFormPlanQmxxService.saveQmxx(studyFormPlanOld.getId(), "复核通过", qmr, studyFormPlan.getRemark());
         //发送通知
@@ -320,7 +320,7 @@ public class StudyFormPlanServiceImpl extends ServiceImpl
         //稽查轨迹
         Map<String, String> formData = new LinkedHashMap<>();
         formData.put("原因", studyFormPlan.getRemark());
-        studyFormPlanJcgjService.saveJcgj(studyFormPlanOld.getId(), JcgjlxEnum.lc.getValue(), "复核拒绝", JcmcysEnum.red.getValue(), formData, qmr, null, null);
+        studyFormPlanJcgjService.saveJcgj(studyFormPlanOld, JcgjlxEnum.lc.getValue(), "复核拒绝", JcmcysEnum.red.getValue(), formData, qmr, null, null);
         //签名信息
         studyFormPlanQmxxService.saveQmxx(studyFormPlanOld.getId(), "复核拒绝", qmr, studyFormPlan.getRemark());
         //发送通知
@@ -354,7 +354,7 @@ public class StudyFormPlanServiceImpl extends ServiceImpl
         studyFormPlanOld.setBdnr(studyFormPlan.getBdnr());
         this.updateById(studyFormPlanOld);
         //稽查轨迹
-        studyFormPlanJcgjService.saveJcgj(studyFormPlanOld.getId(), JcgjlxEnum.lc.getValue(), "已审阅", JcmcysEnum.green.getValue(), null, qmr, studyFormPlan.getRemark(), null);
+        studyFormPlanJcgjService.saveJcgj(studyFormPlanOld, JcgjlxEnum.lc.getValue(), "已审阅", JcmcysEnum.green.getValue(), null, qmr, studyFormPlan.getRemark(), null);
         //签名信息
         studyFormPlanQmxxService.saveQmxx(studyFormPlanOld.getId(), "已审阅", qmr, studyFormPlan.getRemark());
         //发送通知

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

@@ -77,7 +77,7 @@ public class StudyFormPreJcgjServiceImpl extends ServiceImpl
 
     /**
      * 新增稽查轨迹
-     * @param formId 表单id
+     * @param studyFormPre 表单
      * @param jcgjlx 稽查轨迹类型:1:流程；3：编辑
      * @param jcmc 稽查名称
      * @param jcmcys 稽查名称颜色：1：蓝色；3：红色；5：绿色；7：橙色
@@ -87,10 +87,9 @@ public class StudyFormPreJcgjServiceImpl extends ServiceImpl
      * @param time 时间
      */
     @Override
-    @Async
-    public  void saveJcgj(Long  formId, Integer jcgjlx, String jcmc, Integer jcmcys, Map<String, String> jcnr, SysUser qmr, String remark, Date time){
+    public  void saveJcgj(StudyFormPre studyFormPre, Integer jcgjlx, String jcmc, Integer jcmcys, Map<String, String> jcnr, SysUser qmr, String remark, Date time){
         StudyFormPreJcgj formJcgj = new StudyFormPreJcgj();
-        formJcgj.setFormId(formId);
+        formJcgj.setFormId(studyFormPre.getId());
         formJcgj.setJcgjlx(jcgjlx);
         formJcgj.setJcmc(jcmc);
         formJcgj.setJcmcEn(StudyFormUtil.getEn(jcmc));
@@ -109,7 +108,8 @@ public class StudyFormPreJcgjServiceImpl extends ServiceImpl
         }
         formJcgj.setRemark(remark);
         this.save(formJcgj);
-
+        systemLogService.saveInfo(studyFormPre.getBdbh(), studyFormPre.getBdbh(), formJcgj.getJcmc(), formJcgj.getJcmcEn(),
+                formJcgj.getJcnr(), formJcgj.getJcnrEn(), formJcgj.getQmrId(), formJcgj.getQmrMc(), formJcgj.getQmrMcEn(), formJcgj.getRemark());
     }
 
 

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

@@ -160,7 +160,7 @@ public class StudyFormPreServiceImpl extends ServiceImpl
             //稽查轨迹
             Map<String, String> formData = new LinkedHashMap<>();
             formData.put("备注", studyFormPre.getRemark());
-            studyFormPreJcgjService.saveJcgj(studyFormPre.getId(), JcgjlxEnum.lc.getValue(), "制作保存预制表单", JcmcysEnum.green.getValue(), formData, qmr, null, null);
+            studyFormPreJcgjService.saveJcgj(studyFormPre, JcgjlxEnum.lc.getValue(), "制作保存预制表单", JcmcysEnum.green.getValue(), formData, qmr, null, null);
             result = studyFormPre;
         }
         //签名信息
@@ -235,7 +235,7 @@ public class StudyFormPreServiceImpl extends ServiceImpl
         //稽查轨迹
         Map<String, String> formData = new LinkedHashMap<>();
         formData.put("备注", studyFormPre.getRemark());
-        studyFormPreJcgjService.saveJcgj(studyFormPre.getId(), JcgjlxEnum.lc.getValue(), "制作提交预制表单", JcmcysEnum.green.getValue(), formData, qmr, null, null);
+        studyFormPreJcgjService.saveJcgj(studyFormPre, JcgjlxEnum.lc.getValue(), "制作提交预制表单", JcmcysEnum.green.getValue(), formData, qmr, null, null);
         //签名信息
         studyFormPreQmxxService.saveQmxx(studyFormPre.getId(), "制作提交预制表单", qmr, studyFormPre.getRemark());
         //发送通知
@@ -316,7 +316,7 @@ public class StudyFormPreServiceImpl extends ServiceImpl
         //稽查轨迹
         Map<String, String> formData = new LinkedHashMap<>();
         formData.put("备注", form.getRemark());
-        studyFormPreJcgjService.saveJcgj(studyFormPreOld.getId(), JcgjlxEnum.lc.getValue(), "审核通过", JcmcysEnum.green.getValue(), formData, qmr, null, null);
+        studyFormPreJcgjService.saveJcgj(studyFormPreOld, JcgjlxEnum.lc.getValue(), "审核通过", JcmcysEnum.green.getValue(), formData, qmr, null, null);
         //签名信息
         studyFormPreQmxxService.saveQmxx(studyFormPreOld.getId(), "审核通过", qmr, form.getRemark());
     }
@@ -343,7 +343,7 @@ public class StudyFormPreServiceImpl extends ServiceImpl
         //稽查轨迹
         Map<String, String> formData = new LinkedHashMap<>();
         formData.put("原因", form.getRemark());
-        studyFormPreJcgjService.saveJcgj(studyFormPreOld.getId(), JcgjlxEnum.lc.getValue(), "审核拒绝", JcmcysEnum.red.getValue(), formData, qmr, null, null);
+        studyFormPreJcgjService.saveJcgj(studyFormPreOld, JcgjlxEnum.lc.getValue(), "审核拒绝", JcmcysEnum.red.getValue(), formData, qmr, null, null);
         //签名信息
         studyFormPreQmxxService.saveQmxx(studyFormPreOld.getId(), "审核拒绝", qmr, form.getRemark());
         //发送通知
@@ -372,7 +372,7 @@ public class StudyFormPreServiceImpl extends ServiceImpl
         }
         Date time = new Date();
         //稽查轨迹
-        studyFormPreJcgjService.saveJcgj(studyFormPreOld.getId(), JcgjlxEnum.lc.getValue(), "创建记录", JcmcysEnum.green.getValue(), null, qmr, null, null);
+        studyFormPreJcgjService.saveJcgj(studyFormPreOld, JcgjlxEnum.lc.getValue(), "创建记录", JcmcysEnum.green.getValue(), null, qmr, null, null);
         //签名信息
         studyFormPreQmxxService.saveQmxx(studyFormPreOld.getId(), "创建记录", qmr, studyFormPre.getRemark());
         //生成填报表单
@@ -421,7 +421,7 @@ public class StudyFormPreServiceImpl extends ServiceImpl
         //稽查轨迹
         Map<String, String> formData = new LinkedHashMap<>();
         formData.put("原因", studyFormPre.getRemark());
-        studyFormPreJcgjService.saveJcgj(studyFormPreOld.getId(), JcgjlxEnum.lc.getValue(), "申请关闭", JcmcysEnum.green.getValue(), formData, qmr, null, null);
+        studyFormPreJcgjService.saveJcgj(studyFormPreOld, JcgjlxEnum.lc.getValue(), "申请关闭", JcmcysEnum.green.getValue(), formData, qmr, null, null);
         //签名信息
         studyFormFillQmxxService.saveQmxx(studyFormPreOld.getId(), "申请关闭", qmr, studyFormPre.getRemark());
         //发送通知
@@ -457,7 +457,7 @@ public class StudyFormPreServiceImpl extends ServiceImpl
         //稽查轨迹
         Map<String, String> formData = new LinkedHashMap<>();
         formData.put("原因", form.getRemark());
-        studyFormPreJcgjService.saveJcgj(studyFormPreOld.getId(), JcgjlxEnum.lc.getValue(), "关闭拒绝", JcmcysEnum.red.getValue(), formData, qmr, null, null);
+        studyFormPreJcgjService.saveJcgj(studyFormPreOld, JcgjlxEnum.lc.getValue(), "关闭拒绝", JcmcysEnum.red.getValue(), formData, qmr, null, null);
         //签名信息
         studyFormPreQmxxService.saveQmxx(studyFormPreOld.getId(), "关闭拒绝", qmr, form.getRemark());
         //发送通知
@@ -492,7 +492,7 @@ public class StudyFormPreServiceImpl extends ServiceImpl
         //稽查轨迹
         Map<String, String> formData = new LinkedHashMap<>();
         formData.put("原因", form.getRemark());
-        studyFormPreJcgjService.saveJcgj(studyFormPreOld.getId(), JcgjlxEnum.lc.getValue(), "关闭同意", JcmcysEnum.green.getValue(), formData, qmr, null, null);
+        studyFormPreJcgjService.saveJcgj(studyFormPreOld, JcgjlxEnum.lc.getValue(), "关闭同意", JcmcysEnum.green.getValue(), formData, qmr, null, null);
         //签名信息
         studyFormPreQmxxService.saveQmxx(studyFormPreOld.getId(), "关闭同意", qmr, form.getRemark());
         //发送通知