fix:操作日志

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

@@ -1,7 +1,7 @@
 package com.hxhq.business.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.hxhq.business.domain.GyzjFfjlJcgj;
+import com.hxhq.business.domain.*;
 import com.hxhq.business.domain.GyzjFfjlJcgj;
 import com.hxhq.system.api.domain.SysUser;
 
@@ -25,6 +25,14 @@ public interface IGyzjFfjlJcgjService extends IService
     public List<GyzjFfjlJcgj> queryList(GyzjFfjlJcgj gyzjJcgj);
 
     /**
+     * 批量保存稽查轨迹-并保留日志
+     * @param gyzjFfjl
+     * @param jcgjList
+     */
+    void saveBatchWithLog(GyzjFfjl gyzjFfjl, List<GyzjFfjlJcgj> jcgjList);
+
+
+    /**
      * 新增稽查轨迹
      * @param ffjlId 发放记录id
      * @param jcgjlx 稽查轨迹类型:1:流程；3：编辑

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

@@ -3,7 +3,7 @@ package com.hxhq.business.service;
 import java.util.List;
 import java.util.Map;
 
-import com.hxhq.business.domain.GyzjJcgj;
+import com.hxhq.business.domain.*;
 import com.hxhq.business.domain.GyzjJcgj;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.hxhq.business.domain.GyzjJcgj;
@@ -25,6 +25,13 @@ public interface IGyzjJcgjService extends IService
     public List<GyzjJcgj> queryList(GyzjJcgj gyzjJcgj);
 
     /**
+     * 批量保存稽查轨迹-并保留日志
+     * @param gyzj
+     * @param jcgjList
+     */
+    void saveBatchWithLog(Gyzj gyzj, List<GyzjJcgj> jcgjList);
+
+    /**
      * 新增稽查轨迹
      * @param mjyId 给药制剂id
      * @param jcgjlx 稽查轨迹类型:1:流程；3：编辑

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

@@ -3,9 +3,8 @@ package com.hxhq.business.service;
 import java.util.List;
 import java.util.Map;
 
-import com.hxhq.business.domain.MjyFfjlJcgj;
+import com.hxhq.business.domain.*;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.hxhq.business.domain.MjyJcgj;
 import com.hxhq.system.api.domain.SysUser;
 
 /**
@@ -25,6 +24,13 @@ public interface IMjyFfjlJcgjService extends IService
     public List<MjyFfjlJcgj> queryList(MjyFfjlJcgj mjyJcgj);
 
     /**
+     * 批量保存稽查轨迹-并保留日志
+     * @param mjyFfjl
+     * @param jcgjList
+     */
+    void saveBatchWithLog(MjyFfjl mjyFfjl, List<MjyFfjlJcgj> jcgjList);
+
+    /**
      * 新增稽查轨迹
      * @param ffjlId 发放记录id
      * @param jcgjlx 稽查轨迹类型:1:流程；3：编辑

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

@@ -3,8 +3,7 @@ package com.hxhq.business.service;
 import java.util.List;
 import java.util.Map;
 
-import com.hxhq.business.domain.GyzjJcgj;
-import com.hxhq.business.domain.MjyJcgj;
+import com.hxhq.business.domain.*;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.hxhq.system.api.domain.SysUser;
 
@@ -24,6 +23,13 @@ public interface IMjyJcgjService extends IService
     public List<MjyJcgj> queryList(MjyJcgj mjyJcgj);
 
     /**
+     * 批量保存稽查轨迹-并保留日志
+     * @param mjy
+     * @param jcgjList
+     */
+    void saveBatchWithLog(Mjy mjy, List<MjyJcgj> jcgjList);
+
+    /**
      * 新增稽查轨迹
      * @param mjyId 麻精药id
      * @param jcgjlx 稽查轨迹类型:1:流程；3：编辑

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

@@ -4,8 +4,11 @@ import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
+import com.hxhq.business.domain.StudyFormApply;
 import com.hxhq.business.domain.StudyFormApplyJcgj;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.hxhq.business.domain.StudyFormPre;
+import com.hxhq.business.domain.StudyFormPreJcgj;
 import com.hxhq.business.form.study.StudyFormUpdateForm;
 import com.hxhq.system.api.domain.SysUser;
 
@@ -25,6 +28,14 @@ public interface IStudyFormApplyJcgjService extends IService
      */
     public List<StudyFormApplyJcgj> queryList(StudyFormApplyJcgj studyFormApplyJcgj);
 
+
+    /**
+     * 批量保存稽查轨迹-并保留日志
+     * @param studyFormApply
+     * @param jcgjList
+     */
+    void saveBatchWithLog(StudyFormApply studyFormApply, List<StudyFormApplyJcgj> jcgjList);
+
     /**
      * 新增稽查轨迹
      * @param formId 表单id

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

@@ -4,10 +4,8 @@ import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
-import com.hxhq.business.domain.GyzjJcgj;
-import com.hxhq.business.domain.StudyFormFillJcgj;
+import com.hxhq.business.domain.*;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.hxhq.business.domain.StudyFormPreJcgj;
 import com.hxhq.system.api.domain.SysUser;
 
 /**
@@ -26,6 +24,15 @@ public interface IStudyFormFillJcgjService extends IService
      */
     public List<StudyFormFillJcgj> queryList(StudyFormFillJcgj studyFormFillJcgj);
 
+
+    /**
+     * 批量保存稽查轨迹-并保留日志
+     * @param studyFormFill
+     * @param jcgjList
+     */
+    void saveBatchWithLog(StudyFormFill studyFormFill, List<StudyFormFillJcgj> jcgjList);
+
+
     /**
      * 新增稽查轨迹
      * @param formId 表单id

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

@@ -4,7 +4,7 @@ import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
-import com.hxhq.business.domain.StudyFormPlanJcgj;
+import com.hxhq.business.domain.*;
 import com.hxhq.business.domain.StudyFormPlanJcgj;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.hxhq.system.api.domain.SysUser;
@@ -25,6 +25,14 @@ public interface IStudyFormPlanJcgjService extends IService
      */
     public List<StudyFormPlanJcgj> queryList(StudyFormPlanJcgj studyFormPlanJcgj);
 
+
+    /**
+     * 批量保存稽查轨迹-并保留日志
+     * @param studyFormPlan
+     * @param jcgjList
+     */
+    void saveBatchWithLog(StudyFormPlan studyFormPlan, List<StudyFormPlanJcgj> jcgjList);
+
     /**
      * 新增稽查轨迹
      * @param formId 表单id

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

@@ -4,8 +4,7 @@ import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
-import com.hxhq.business.domain.MjyFfjlJcgj;
-import com.hxhq.business.domain.StudyFormPreJcgj;
+import com.hxhq.business.domain.*;
 import com.hxhq.business.domain.StudyFormPreJcgj;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.hxhq.system.api.domain.SysUser;
@@ -27,6 +26,13 @@ public interface IStudyFormPreJcgjService extends IService
     public List<StudyFormPreJcgj> queryList(StudyFormPreJcgj studyFormPreJcgj);
 
     /**
+     * 批量保存稽查轨迹-并保留日志
+     * @param studyFormPre
+     * @param jcgjList
+     */
+    void saveBatchWithLog(StudyFormPre studyFormPre, List<StudyFormPreJcgj> jcgjList);
+
+    /**
      * 新增稽查轨迹
      * @param formId 表单id
      * @param jcgjlx 稽查轨迹类型:1:流程；3：编辑

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

@@ -3,14 +3,20 @@ package com.hxhq.business.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.hxhq.business.domain.GyzjFfjl;
 import com.hxhq.business.domain.GyzjFfjlJcgj;
+import com.hxhq.business.domain.MjyFfjl;
+import com.hxhq.business.domain.MjyFfjlJcgj;
 import com.hxhq.business.mapper.GyzjFfjlJcgjMapper;
 import com.hxhq.business.service.IGyzjFfjlJcgjService;
+import com.hxhq.business.service.ISystemLogService;
 import com.hxhq.business.utils.JctUtil;
 import com.hxhq.business.utils.lang.GyzjJcnrUtil;
 import com.hxhq.common.core.exception.ServiceException;
 import com.hxhq.common.core.utils.StringUtils;
 import com.hxhq.system.api.domain.SysUser;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -25,6 +31,8 @@ import java.util.Map;
 @Service
 public class GyzjFfjlJcgjServiceImpl extends ServiceImpl<GyzjFfjlJcgjMapper, GyzjFfjlJcgj> implements IGyzjFfjlJcgjService
 {
+    @Autowired
+    private ISystemLogService systemLogService;
 
     /**
      * 查询稽查轨迹列表
@@ -50,6 +58,21 @@ public class GyzjFfjlJcgjServiceImpl extends ServiceImpl
     }
 
     /**
+     * 批量保存稽查轨迹-并保留日志
+     * @param gyzjFfjl
+     * @param jcgjList
+     */
+    @Override
+    @Async
+    public void saveBatchWithLog(GyzjFfjl gyzjFfjl, List<GyzjFfjlJcgj> jcgjList) {
+        this.saveBatch(jcgjList);
+        for (GyzjFfjlJcgj jcgj : jcgjList) {
+            systemLogService.saveInfo(gyzjFfjl.getBh(), gyzjFfjl.getBh(), jcgj.getJcmc(), jcgj.getJcmcEn(),
+                    jcgj.getJcnr(), jcgj.getJcnrEn(), jcgj.getQmrId(), jcgj.getQmrMc(), jcgj.getQmrMcEn(), jcgj.getRemark());
+        }
+    }
+
+    /**
      * 新增稽查轨迹
      * @param ffjlId 发放记录id
      * @param jcgjlx 稽查轨迹类型:1:流程；3：编辑

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

@@ -5,12 +5,17 @@ import java.util.Map;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.hxhq.business.domain.Gyzj;
 import com.hxhq.business.domain.GyzjJcgj;
+import com.hxhq.business.domain.Mjy;
+import com.hxhq.business.domain.MjyJcgj;
+import com.hxhq.business.service.ISystemLogService;
 import com.hxhq.business.utils.JctUtil;
 import com.hxhq.business.utils.lang.GyzjJcnrUtil;
 import com.hxhq.common.core.exception.ServiceException;
 import com.hxhq.common.core.utils.StringUtils;
 import com.hxhq.system.api.domain.SysUser;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 import com.hxhq.business.mapper.GyzjJcgjMapper;
@@ -27,6 +32,9 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 public class GyzjJcgjServiceImpl extends ServiceImpl<GyzjJcgjMapper, GyzjJcgj> implements IGyzjJcgjService
 {
 
+    @Autowired
+    private ISystemLogService systemLogService;
+
     /**
      * 查询稽查轨迹列表
      * @param gyzjJcgj 麻给药
@@ -51,6 +59,21 @@ public class GyzjJcgjServiceImpl extends ServiceImpl i
     }
 
     /**
+     * 批量保存稽查轨迹-并保留日志
+     * @param gyzj
+     * @param jcgjList
+     */
+    @Override
+    @Async
+    public void saveBatchWithLog(Gyzj gyzj, List<GyzjJcgj> jcgjList) {
+        this.saveBatch(jcgjList);
+        for (GyzjJcgj jcgj : jcgjList) {
+            systemLogService.saveInfo(gyzj.getBh(), gyzj.getBh(), jcgj.getJcmc(), jcgj.getJcmcEn(),
+                    jcgj.getJcnr(), jcgj.getJcnrEn(), jcgj.getQmrId(), jcgj.getQmrMc(), jcgj.getQmrMcEn(), jcgj.getRemark());
+        }
+    }
+
+    /**
      * 新增稽查轨迹
      * @param gyzjId 麻精药id
      * @param jcgjlx 稽查轨迹类型:1:流程；3：编辑

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

@@ -5,11 +5,17 @@ import java.util.Map;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.hxhq.business.domain.Mjy;
+import com.hxhq.business.domain.MjyFfjl;
+import com.hxhq.business.domain.MjyJcgj;
+import com.hxhq.business.service.ISystemLogService;
 import com.hxhq.business.utils.JctUtil;
 import com.hxhq.business.utils.lang.MjyJcnrUtil;
 import com.hxhq.common.core.exception.ServiceException;
 import com.hxhq.common.core.utils.StringUtils;
 import com.hxhq.system.api.domain.SysUser;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 import com.hxhq.business.mapper.MjyFfjlJcgjMapper;
 import com.hxhq.business.domain.MjyFfjlJcgj;
@@ -25,6 +31,8 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 @Service
 public class MjyFfjlJcgjServiceImpl extends ServiceImpl<MjyFfjlJcgjMapper, MjyFfjlJcgj> implements IMjyFfjlJcgjService
 {
+    @Autowired
+    private ISystemLogService systemLogService;
 
     /**
      * 查询稽查轨迹列表
@@ -50,6 +58,21 @@ public class MjyFfjlJcgjServiceImpl extends ServiceImpl
     }
 
     /**
+     * 批量保存稽查轨迹-并保留日志
+     * @param mjyFfjl
+     * @param jcgjList
+     */
+    @Override
+    @Async
+    public void saveBatchWithLog(MjyFfjl mjyFfjl, List<MjyFfjlJcgj> jcgjList) {
+        this.saveBatch(jcgjList);
+        for (MjyFfjlJcgj jcgj : jcgjList) {
+            systemLogService.saveInfo(mjyFfjl.getBh(), mjyFfjl.getBh(), jcgj.getJcmc(), jcgj.getJcmcEn(),
+                    jcgj.getJcnr(), jcgj.getJcnrEn(), jcgj.getQmrId(), jcgj.getQmrMc(), jcgj.getQmrMcEn(), jcgj.getRemark());
+        }
+    }
+
+    /**
      * 新增稽查轨迹
      * @param ffjlId 发放记录id
      * @param jcgjlx 稽查轨迹类型:1:流程；3：编辑

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

@@ -5,12 +5,17 @@ import java.util.Map;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.hxhq.business.domain.Mjy;
 import com.hxhq.business.domain.MjyJcgj;
+import com.hxhq.business.domain.Sj;
+import com.hxhq.business.domain.SjJcgj;
+import com.hxhq.business.service.ISystemLogService;
 import com.hxhq.business.utils.JctUtil;
 import com.hxhq.business.utils.lang.MjyJcnrUtil;
 import com.hxhq.common.core.exception.ServiceException;
 import com.hxhq.common.core.utils.StringUtils;
 import com.hxhq.system.api.domain.SysUser;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 import com.hxhq.business.mapper.MjyJcgjMapper;
@@ -26,6 +31,8 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 @Service
 public class MjyJcgjServiceImpl extends ServiceImpl<MjyJcgjMapper, MjyJcgj> implements IMjyJcgjService
 {
+    @Autowired
+    private ISystemLogService systemLogService;
 
     /**
      * 查询稽查轨迹列表
@@ -51,6 +58,21 @@ public class MjyJcgjServiceImpl extends ServiceImpl impl
     }
 
     /**
+     * 批量保存稽查轨迹-并保留日志
+     * @param mjy
+     * @param jcgjList
+     */
+    @Override
+    @Async
+    public void saveBatchWithLog(Mjy mjy, List<MjyJcgj> jcgjList) {
+        this.saveBatch(jcgjList);
+        for (MjyJcgj jcgj : jcgjList) {
+            systemLogService.saveInfo(mjy.getBh(), mjy.getBh(), jcgj.getJcmc(), jcgj.getJcmcEn(),
+                    jcgj.getJcnr(), jcgj.getJcnrEn(), jcgj.getQmrId(), jcgj.getQmrMc(), jcgj.getQmrMcEn(), jcgj.getRemark());
+        }
+    }
+
+    /**
      * 新增稽查轨迹
      * @param mjyId 麻精药id
      * @param jcgjlx 稽查轨迹类型:1:流程；3：编辑

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

@@ -6,12 +6,18 @@ import java.util.Map;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.hxhq.business.domain.Mjy;
+import com.hxhq.business.domain.MjyJcgj;
+import com.hxhq.business.domain.StudyFormApply;
 import com.hxhq.business.domain.StudyFormApplyJcgj;
+import com.hxhq.business.service.ISystemLogService;
 import com.hxhq.business.utils.JctUtil;
 import com.hxhq.business.utils.lang.StudyFormUtil;
 import com.hxhq.common.core.exception.ServiceException;
 import com.hxhq.common.core.utils.StringUtils;
 import com.hxhq.system.api.domain.SysUser;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 import com.hxhq.business.mapper.StudyFormApplyJcgjMapper;
 import com.hxhq.business.service.IStudyFormApplyJcgjService;
@@ -26,6 +32,9 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 @Service
 public class StudyFormApplyJcgjServiceImpl extends ServiceImpl<StudyFormApplyJcgjMapper, StudyFormApplyJcgj> implements IStudyFormApplyJcgjService
 {
+    @Autowired
+    private ISystemLogService systemLogService;
+
 
     /**
      * 查询稽查轨迹列表
@@ -51,6 +60,21 @@ public class StudyFormApplyJcgjServiceImpl extends ServiceImpl
     }
 
     /**
+     * 批量保存稽查轨迹-并保留日志
+     * @param studyFormApply
+     * @param jcgjList
+     */
+    @Override
+    @Async
+    public void saveBatchWithLog(StudyFormApply studyFormApply, List<StudyFormApplyJcgj> jcgjList) {
+        this.saveBatch(jcgjList);
+        for (StudyFormApplyJcgj jcgj : jcgjList) {
+            systemLogService.saveInfo(studyFormApply.getBdbh(), studyFormApply.getBdbh(), jcgj.getJcmc(), jcgj.getJcmcEn(),
+                    jcgj.getJcnr(), jcgj.getJcnrEn(), jcgj.getQmrId(), jcgj.getQmrMc(), jcgj.getQmrMcEn(), jcgj.getRemark());
+        }
+    }
+
+    /**
      * 新增稽查轨迹
      * @param formId 表单id
      * @param jcgjlx 稽查轨迹类型:1:流程；3：编辑
@@ -62,6 +86,7 @@ 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){
         StudyFormApplyJcgj formJcgj = new StudyFormApplyJcgj();
         formJcgj.setFormId(formId);

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

@@ -6,12 +6,18 @@ import java.util.Map;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.hxhq.business.domain.StudyFormApply;
+import com.hxhq.business.domain.StudyFormApplyJcgj;
+import com.hxhq.business.domain.StudyFormFill;
 import com.hxhq.business.enums.zykgl.JcgjlxEnum;
+import com.hxhq.business.service.ISystemLogService;
 import com.hxhq.business.utils.lang.StudyFormUtil;
 import com.hxhq.business.utils.JctUtil;
 import com.hxhq.common.core.exception.ServiceException;
 import com.hxhq.common.core.utils.StringUtils;
 import com.hxhq.system.api.domain.SysUser;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 import com.hxhq.business.mapper.StudyFormFillJcgjMapper;
 import com.hxhq.business.domain.StudyFormFillJcgj;
@@ -27,6 +33,9 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 @Service
 public class StudyFormFillJcgjServiceImpl extends ServiceImpl<StudyFormFillJcgjMapper, StudyFormFillJcgj> implements IStudyFormFillJcgjService
 {
+    @Autowired
+    private ISystemLogService systemLogService;
+
 
     /**
      * 查询稽查轨迹列表
@@ -57,6 +66,22 @@ public class StudyFormFillJcgjServiceImpl extends ServiceImpl
     }
 
     /**
+     * 批量保存稽查轨迹-并保留日志
+     * @param studyFormFill
+     * @param jcgjList
+     */
+    @Override
+    @Async
+    public void saveBatchWithLog(StudyFormFill studyFormFill, List<StudyFormFillJcgj> jcgjList) {
+        this.saveBatch(jcgjList);
+        for (StudyFormFillJcgj jcgj : jcgjList) {
+            systemLogService.saveInfo(studyFormFill.getBdbh(), studyFormFill.getBdbh(), jcgj.getJcmc(), jcgj.getJcmcEn(),
+                    jcgj.getJcnr(), jcgj.getJcnrEn(), jcgj.getQmrId(), jcgj.getQmrMc(), jcgj.getQmrMcEn(), jcgj.getRemark());
+        }
+    }
+
+
+    /**
      * 新增稽查轨迹
      * @param formId 表单id
      * @param jcgjlx 稽查轨迹类型:1:流程；3：编辑
@@ -68,6 +93,7 @@ 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){
         StudyFormFillJcgj formJcgj = new StudyFormFillJcgj();
         formJcgj.setFormId(formId);

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

@@ -6,12 +6,18 @@ import java.util.Map;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.hxhq.business.domain.StudyFormFill;
+import com.hxhq.business.domain.StudyFormFillJcgj;
+import com.hxhq.business.domain.StudyFormPlan;
 import com.hxhq.business.domain.StudyFormPlanJcgj;
+import com.hxhq.business.service.ISystemLogService;
 import com.hxhq.business.utils.JctUtil;
 import com.hxhq.business.utils.lang.StudyFormUtil;
 import com.hxhq.common.core.exception.ServiceException;
 import com.hxhq.common.core.utils.StringUtils;
 import com.hxhq.system.api.domain.SysUser;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 import com.hxhq.business.mapper.StudyFormPlanJcgjMapper;
 import com.hxhq.business.service.IStudyFormPlanJcgjService;
@@ -26,7 +32,10 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 @Service
 public class StudyFormPlanJcgjServiceImpl extends ServiceImpl<StudyFormPlanJcgjMapper, StudyFormPlanJcgj> implements IStudyFormPlanJcgjService
 {
-    
+
+    @Autowired
+    private ISystemLogService systemLogService;
+
 
     /**
      * 查询稽查轨迹列表
@@ -52,6 +61,21 @@ public class StudyFormPlanJcgjServiceImpl extends ServiceImpl
     }
 
     /**
+     * 批量保存稽查轨迹-并保留日志
+     * @param studyFormPlan
+     * @param jcgjList
+     */
+    @Override
+    @Async
+    public void saveBatchWithLog(StudyFormPlan studyFormPlan, List<StudyFormPlanJcgj> jcgjList) {
+        this.saveBatch(jcgjList);
+        for (StudyFormPlanJcgj jcgj : jcgjList) {
+            systemLogService.saveInfo(studyFormPlan.getBdbh(), studyFormPlan.getBdbh(), jcgj.getJcmc(), jcgj.getJcmcEn(),
+                    jcgj.getJcnr(), jcgj.getJcnrEn(), jcgj.getQmrId(), jcgj.getQmrMc(), jcgj.getQmrMcEn(), jcgj.getRemark());
+        }
+    }
+
+    /**
      * 新增稽查轨迹
      * @param formId 表单id
      * @param jcgjlx 稽查轨迹类型:1:流程；3：编辑
@@ -63,6 +87,7 @@ 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){
         StudyFormPlanJcgj formJcgj = new StudyFormPlanJcgj();
         formJcgj.setFormId(formId);

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

@@ -6,12 +6,18 @@ import java.util.Map;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.hxhq.business.domain.StudyFormPlan;
+import com.hxhq.business.domain.StudyFormPlanJcgj;
+import com.hxhq.business.domain.StudyFormPre;
 import com.hxhq.business.domain.StudyFormPreJcgj;
+import com.hxhq.business.service.ISystemLogService;
 import com.hxhq.business.utils.JctUtil;
 import com.hxhq.business.utils.lang.StudyFormUtil;
 import com.hxhq.common.core.exception.ServiceException;
 import com.hxhq.common.core.utils.StringUtils;
 import com.hxhq.system.api.domain.SysUser;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 import com.hxhq.business.mapper.StudyFormPreJcgjMapper;
 import com.hxhq.business.service.IStudyFormPreJcgjService;
@@ -26,6 +32,11 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 @Service
 public class StudyFormPreJcgjServiceImpl extends ServiceImpl<StudyFormPreJcgjMapper, StudyFormPreJcgj> implements IStudyFormPreJcgjService
 {
+
+    @Autowired
+    private ISystemLogService systemLogService;
+
+
     /**
      * 查询稽查轨迹列表
      * @param studyFormPreJcgj
@@ -50,6 +61,21 @@ public class StudyFormPreJcgjServiceImpl extends ServiceImpl
     }
 
     /**
+     * 批量保存稽查轨迹-并保留日志
+     * @param studyFormPre
+     * @param jcgjList
+     */
+    @Override
+    @Async
+    public void saveBatchWithLog(StudyFormPre studyFormPre, List<StudyFormPreJcgj> jcgjList) {
+        this.saveBatch(jcgjList);
+        for (StudyFormPreJcgj jcgj : jcgjList) {
+            systemLogService.saveInfo(studyFormPre.getBdbh(), studyFormPre.getBdbh(), jcgj.getJcmc(), jcgj.getJcmcEn(),
+                    jcgj.getJcnr(), jcgj.getJcnrEn(), jcgj.getQmrId(), jcgj.getQmrMc(), jcgj.getQmrMcEn(), jcgj.getRemark());
+        }
+    }
+
+    /**
      * 新增稽查轨迹
      * @param formId 表单id
      * @param jcgjlx 稽查轨迹类型:1:流程；3：编辑
@@ -61,6 +87,7 @@ 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){
         StudyFormPreJcgj formJcgj = new StudyFormPreJcgj();
         formJcgj.setFormId(formId);
@@ -82,6 +109,7 @@ public class StudyFormPreJcgjServiceImpl extends ServiceImpl
         }
         formJcgj.setRemark(remark);
         this.save(formJcgj);
+
     }