diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GspFfjlJcgjServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GspFfjlJcgjServiceImpl.java index fa1d077..794fb71 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GspFfjlJcgjServiceImpl.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GspFfjlJcgjServiceImpl.java @@ -1,5 +1,6 @@ package com.hxhq.business.service.impl; +import java.util.Date; import java.util.List; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; @@ -49,6 +50,8 @@ public class GspFfjlJcgjServiceImpl extends ServiceImpl impl @Override public void saveJcgj(Gsp gsp, Integer jcgjlx, String jcmc, String jcmcEn, Integer jcmcys, String jcnr, String jcnrEn, SysUser qmr) { + Date date = new Date(); + GspJcgj jcgj = new GspJcgj(); jcgj.setGspId(gsp.getId()); jcgj.setJcgjlx(jcgjlx); @@ -71,29 +74,36 @@ public class GspJcgjServiceImpl extends ServiceImpl impl jcgj.setQmrId(qmr.getUserId()); jcgj.setQmrMc(qmr.getNickName()); jcgj.setQmrMcEn(qmr.getUserName()); + jcgj.setCreateTime(date); this.save(jcgj); - systemLogService.saveInfo(gsp.getBh(), gsp.getBh(), jcgj.getJcmc(), jcgj.getJcmcEn(), - jcgj.getJcnr(), jcgj.getJcnrEn(), jcgj.getQmrId(), jcgj.getQmrMc(), jcgj.getQmrMcEn(), jcgj.getRemark()); + systemLogService.saveInfoWithData(gsp.getBh(), gsp.getBh(), jcgj.getJcmc(), jcgj.getJcmcEn(), + jcgj.getJcnr(), jcgj.getJcnrEn(), jcgj.getQmrId(), jcgj.getQmrMc(), jcgj.getQmrMcEn(), jcgj.getRemark(), date); } @Override @Async public void saveBatchWithLog(Gsp gsp, List jcgjList) { + Date date = new Date(); + for (GspJcgj gspJcgj : jcgjList) { + gspJcgj.setCreateTime(date); + } this.saveBatch(jcgjList); for (GspJcgj jcgj : jcgjList) { - systemLogService.saveInfo(gsp.getBh(), gsp.getBh(), jcgj.getJcmc(), jcgj.getJcmcEn(), - jcgj.getJcnr(), jcgj.getJcnrEn(), jcgj.getQmrId(), jcgj.getQmrMc(), jcgj.getQmrMcEn(), jcgj.getRemark()); + systemLogService.saveInfoWithData(gsp.getBh(), gsp.getBh(), jcgj.getJcmc(), jcgj.getJcmcEn(), + jcgj.getJcnr(), jcgj.getJcnrEn(), jcgj.getQmrId(), jcgj.getQmrMc(), jcgj.getQmrMcEn(), jcgj.getRemark(), date); } } @Override @Async public void saveWithLog(Gsp gsp, GspJcgj jcgj) { + Date date = new Date(); + jcgj.setCreateTime(date); this.save(jcgj); - systemLogService.saveInfo(gsp.getBh(), gsp.getBh(), jcgj.getJcmc(), jcgj.getJcmcEn(), - jcgj.getJcnr(), jcgj.getJcnrEn(), jcgj.getQmrId(), jcgj.getQmrMc(), jcgj.getQmrMcEn(), jcgj.getRemark()); + systemLogService.saveInfoWithData(gsp.getBh(), gsp.getBh(), jcgj.getJcmc(), jcgj.getJcmcEn(), + jcgj.getJcnr(), jcgj.getJcnrEn(), jcgj.getQmrId(), jcgj.getQmrMc(), jcgj.getQmrMcEn(), jcgj.getRemark(), date); } @Override diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GspRkjlJcgjServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GspRkjlJcgjServiceImpl.java index 0e5458f..bac3f39 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GspRkjlJcgjServiceImpl.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GspRkjlJcgjServiceImpl.java @@ -1,5 +1,6 @@ package com.hxhq.business.service.impl; +import java.util.Date; import java.util.List; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; @@ -46,6 +47,7 @@ public class GspRkjlJcgjServiceImpl extends ServiceImpl jcgjList) { + Date date = new Date(); + for (GspRkjlJcgj gspRkjlJcgj : jcgjList) { + gspRkjlJcgj.setCreateTime(date); + } this.saveBatch(jcgjList); for (GspRkjlJcgj jcgj : jcgjList) { - systemLogService.saveInfo(gspRkjl.getMc(), gspRkjl.getMc(), jcgj.getJcmc(), jcgj.getJcmcEn(), - jcgj.getJcnr(), jcgj.getJcnrEn(), jcgj.getQmrId(), jcgj.getQmrMc(), jcgj.getQmrMcEn(), jcgj.getRemark()); + systemLogService.saveInfoWithData(gspRkjl.getMc(), gspRkjl.getMc(), jcgj.getJcmc(), jcgj.getJcmcEn(), + jcgj.getJcnr(), jcgj.getJcnrEn(), jcgj.getQmrId(), jcgj.getQmrMc(), jcgj.getQmrMcEn(), jcgj.getRemark(), date); } } @Override @Async public void saveWithLog(GspRkjl gspRkjl, GspRkjlJcgj jcgj) { + Date date = new Date(); + jcgj.setCreateTime(date); this.save(jcgj); - systemLogService.saveInfo(gspRkjl.getMc(), gspRkjl.getMc(), jcgj.getJcmc(), jcgj.getJcmcEn(), - jcgj.getJcnr(), jcgj.getJcnrEn(), jcgj.getQmrId(), jcgj.getQmrMc(), jcgj.getQmrMcEn(), jcgj.getRemark()); + systemLogService.saveInfoWithData(gspRkjl.getMc(), gspRkjl.getMc(), jcgj.getJcmc(), jcgj.getJcmcEn(), + jcgj.getJcnr(), jcgj.getJcnrEn(), jcgj.getQmrId(), jcgj.getQmrMc(), jcgj.getQmrMcEn(), jcgj.getRemark(), date); } @Override diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/SjJcgjServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/SjJcgjServiceImpl.java index 228a409..764949d 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/SjJcgjServiceImpl.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/SjJcgjServiceImpl.java @@ -1,5 +1,6 @@ package com.hxhq.business.service.impl; +import java.util.Date; import java.util.List; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -58,17 +59,19 @@ public class SjJcgjServiceImpl extends ServiceImpl imple public void saveBatchWithLog(Sj sj, List sjJcgjList) { this.saveBatch(sjJcgjList); for (SjJcgj sjJcgj : sjJcgjList) { - systemLogService.saveInfo(sj.getBh(), sj.getBh(), sjJcgj.getJcmc(), sjJcgj.getJcmcEn(), - sjJcgj.getJcnr(), sjJcgj.getJcnrEn(), sjJcgj.getQmrId(), sjJcgj.getQmrMc(), sjJcgj.getQmrMcEn(), sjJcgj.getRemark()); + systemLogService.saveInfoWithData(sj.getBh(), sj.getBh(), sjJcgj.getJcmc(), sjJcgj.getJcmcEn(), + sjJcgj.getJcnr(), sjJcgj.getJcnrEn(), sjJcgj.getQmrId(), sjJcgj.getQmrMc(), sjJcgj.getQmrMcEn(), sjJcgj.getRemark(), sjJcgj.getCreateTime()); } } @Override @Async public void saveWithLog(Sj sj, SjJcgj sjJcgj) { + Date date = new Date(); + sjJcgj.setCreateTime(date); this.save(sjJcgj); - systemLogService.saveInfo(sj.getBh(), sj.getBh(), sjJcgj.getJcmc(), sjJcgj.getJcmcEn(), - sjJcgj.getJcnr(), sjJcgj.getJcnrEn(), sjJcgj.getQmrId(), sjJcgj.getQmrMc(), sjJcgj.getQmrMcEn(), sjJcgj.getRemark()); + systemLogService.saveInfoWithData(sj.getBh(), sj.getBh(), sjJcgj.getJcmc(), sjJcgj.getJcmcEn(), + sjJcgj.getJcnr(), sjJcgj.getJcnrEn(), sjJcgj.getQmrId(), sjJcgj.getQmrMc(), sjJcgj.getQmrMcEn(), sjJcgj.getRemark(), date); } @Override @@ -86,10 +89,12 @@ public class SjJcgjServiceImpl extends ServiceImpl imple sjJcgj.setQmrId(sysUser.getUserId()); sjJcgj.setQmrMc(sysUser.getNickName()); sjJcgj.setQmrMcEn(sysUser.getUserName()); + Date date = new Date(); + sjJcgj.setCreateTime(date); this.save(sjJcgj); - systemLogService.saveInfo(sj.getBh(), sj.getBh(), sjJcgj.getJcmc(), sjJcgj.getJcmcEn(), - sjJcgj.getJcnr(), sjJcgj.getJcnrEn(), sjJcgj.getQmrId(), sjJcgj.getQmrMc(), sjJcgj.getQmrMcEn(), sjJcgj.getRemark()); + systemLogService.saveInfoWithData(sj.getBh(), sj.getBh(), sjJcgj.getJcmc(), sjJcgj.getJcmcEn(), + sjJcgj.getJcnr(), sjJcgj.getJcnrEn(), sjJcgj.getQmrId(), sjJcgj.getQmrMc(), sjJcgj.getQmrMcEn(), sjJcgj.getRemark(), date); } @Override diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/SjServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/SjServiceImpl.java index b69bf04..7209ed7 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/SjServiceImpl.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/SjServiceImpl.java @@ -171,6 +171,7 @@ public class SjServiceImpl extends ServiceImpl implements ISjServi List sjJcgjList = new ArrayList<>(); //region 稽查轨迹 + Date date = new Date(); for (ObjectCompareUtil.FieldChange fieldChange : fieldChanges) { SjJcgj jcgj = new SjJcgj(); jcgj.setSjId(sjOld.getId()); @@ -184,6 +185,7 @@ public class SjServiceImpl extends ServiceImpl implements ISjServi jcgj.setQmrMc(qmr.getNickName()); jcgj.setQmrMcEn(qmr.getUserName()); jcgj.setRemark(form.getKcbjbz()); + jcgj.setCreateTime(date); sjJcgjList.add(jcgj); } sjJcgjService.saveBatchWithLog(sjOld, sjJcgjList); @@ -592,6 +594,7 @@ public class SjServiceImpl extends ServiceImpl implements ISjServi updateById(sjOld); List gspJcgjList = new ArrayList<>(); + Date date = new Date(); for (ObjectCompareUtil.FieldChange fieldChange : fieldChanges) { SjJcgj sjJcgj = new SjJcgj(); sjJcgj.setSjId(sjOld.getId()); @@ -605,6 +608,7 @@ public class SjServiceImpl extends ServiceImpl implements ISjServi sjJcgj.setQmrMc(qmr.getNickName()); sjJcgj.setQmrMcEn(qmr.getUserName()); sjJcgj.setRemark(form.getQmbz()); + sjJcgj.setCreateTime(date); gspJcgjList.add(sjJcgj); } sjJcgjService.saveBatchWithLog(sjOld, gspJcgjList); diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyMethodJcgjServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyMethodJcgjServiceImpl.java index ed0d947..43373c5 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyMethodJcgjServiceImpl.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyMethodJcgjServiceImpl.java @@ -1,5 +1,6 @@ package com.hxhq.business.service.impl; +import java.util.Date; import java.util.List; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; @@ -8,6 +9,7 @@ import com.hxhq.business.service.ISystemLogService; import com.hxhq.common.core.utils.DateUtils; 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.StudyMethodJcgjMapper; import com.hxhq.business.domain.StudyMethodJcgj; @@ -41,7 +43,9 @@ public class StudyMethodJcgjServiceImpl extends ServiceImpl impleme @Override @Async public void saveJcgj(Yq yq, Integer jcgjlx, String jcmc, String jcmcEn, Integer jcmcys, String jcnr, String jcnrEn) { + Date date = new Date(); SysUser sysUser = SecurityUtils.getLoginUser().getSysUser(); YqJcgj jcgj = new YqJcgj(); jcgj.setYqId(yq.getId()); @@ -70,19 +72,24 @@ public class YqJcgjServiceImpl extends ServiceImpl impleme jcgj.setQmrId(sysUser.getUserId()); jcgj.setQmrMc(sysUser.getNickName()); jcgj.setQmrMcEn(sysUser.getUserName()); + jcgj.setCreateTime(date); this.save(jcgj); - systemLogService.saveInfo(yq.getMc(), yq.getMc(), jcgj.getJcmc(), jcgj.getJcmcEn(), - jcgj.getJcnr(), jcgj.getJcnrEn(), jcgj.getQmrId(), jcgj.getQmrMc(), jcgj.getQmrMcEn(), jcgj.getRemark()); + systemLogService.saveInfoWithData(yq.getMc(), yq.getMc(), jcgj.getJcmc(), jcgj.getJcmcEn(), + jcgj.getJcnr(), jcgj.getJcnrEn(), jcgj.getQmrId(), jcgj.getQmrMc(), jcgj.getQmrMcEn(), jcgj.getRemark(), date); } @Override @Async public void saveBatchWithLog(Yq yq, List jcgjList) { + Date date = new Date(); + for (YqJcgj jcgj : jcgjList) { + jcgj.setCreateTime(date); + } this.saveBatch(jcgjList); for (YqJcgj jcgj : jcgjList) { - systemLogService.saveInfo(yq.getMc(), yq.getMc(), jcgj.getJcmc(), jcgj.getJcmcEn(), - jcgj.getJcnr(), jcgj.getJcnrEn(), jcgj.getQmrId(), jcgj.getQmrMc(), jcgj.getQmrMcEn(), jcgj.getRemark()); + systemLogService.saveInfoWithData(yq.getMc(), yq.getMc(), jcgj.getJcmc(), jcgj.getJcmcEn(), + jcgj.getJcnr(), jcgj.getJcnrEn(), jcgj.getQmrId(), jcgj.getQmrMc(), jcgj.getQmrMcEn(), jcgj.getRemark(), date); } }