From b78f87130cde63b6bc59bfa4a03b7c44a2f5b837 Mon Sep 17 00:00:00 2001 From: "15881625488@163.com" <15881625488@163.com> Date: Mon, 26 Jan 2026 12:37:22 +0800 Subject: [PATCH] =?UTF-8?q?fit:[=E6=A1=A3=E6=A1=88=E7=AE=A1=E7=90=86]?= =?UTF-8?q?=E7=BB=99=E8=8D=AF=E5=88=B6=E5=89=82=E6=A1=A3=E6=A1=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../business/service/impl/GyzjServiceImpl.java | 32 +++++++++++++++++----- 1 file changed, 25 insertions(+), 7 deletions(-) diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GyzjServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GyzjServiceImpl.java index dfef5d6..b18ed4a 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GyzjServiceImpl.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GyzjServiceImpl.java @@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.hxhq.business.domain.*; import com.hxhq.business.dto.gyzj.DetailDto; import com.hxhq.business.dto.gyzj.ListDto; +import com.hxhq.business.enums.archive.ArchiveLogTypeEnum; import com.hxhq.business.enums.zykgl.*; import com.hxhq.business.form.gyzj.*; import com.hxhq.business.service.*; @@ -47,6 +48,8 @@ public class GyzjServiceImpl extends ServiceImpl implements IG private IZcgService zcgService; @Autowired private IGyzjTzService gyzjTzService; + @Autowired + private IArchiveLogService archiveLogService; //region 资源库管理 @@ -160,7 +163,8 @@ public class GyzjServiceImpl extends ServiceImpl implements IG this.updateById(gyzjOld); //稽查轨迹 gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "申请解档", JcmcysEnum.green.getValue(), null, qmr, form.getRemark()); - + //保存日志 + archiveLogService.saveInfo(ArchiveLogTypeEnum.gyzj, gyzjOld.getId(), gyzjOld.getMc(), gyzjOld.getBh(), gyzjOld.getNd()+gyzjOld.getNddw(), "申请解档"); } /** @@ -197,6 +201,8 @@ public class GyzjServiceImpl extends ServiceImpl implements IG 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()); + //保存日志 + archiveLogService.saveInfo(ArchiveLogTypeEnum.gyzj, gyzjOld.getId(), gyzjOld.getMc(), gyzjOld.getBh(), gyzjOld.getNd()+gyzjOld.getNddw(), "申请借阅"); } /** @@ -229,6 +235,8 @@ public class GyzjServiceImpl extends ServiceImpl implements IG gyzj.setDazt(DaztEnum.ygd.getValue()); //稽查轨迹 gyzjJcgjList.add(gyzjJcgjService.getJcgj(gyzj.getId(), JcgjlxEnum.lc.getValue(), "申请归档", JcmcysEnum.orange.getValue(),null, qmr, form.getRemark())); + //保存日志 + archiveLogService.saveInfo(ArchiveLogTypeEnum.gyzj, gyzj.getId(), gyzj.getMc(), gyzj.getBh(), gyzj.getNd()+gyzj.getNddw(), "申请归档"); } this.updateBatchById(gyzjList); gyzjJcgjService.saveBatch(gyzjJcgjList); @@ -262,6 +270,8 @@ public class GyzjServiceImpl extends ServiceImpl implements IG this.updateById(gyzjOld); //稽查轨迹 gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "申请归档", JcmcysEnum.orange.getValue(),null, qmr, form.getRemark()); + //保存日志 + archiveLogService.saveInfo(ArchiveLogTypeEnum.gyzj, gyzjOld.getId(), gyzjOld.getMc(), gyzjOld.getBh(), gyzjOld.getNd()+gyzjOld.getNddw(), "申请归档"); } @@ -1325,7 +1335,8 @@ public class GyzjServiceImpl extends ServiceImpl implements IG this.updateById(gyzjOld); //稽查轨迹 gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "同意归档", JcmcysEnum.green.getValue(), null, qmr, form.getRemark()); - + //保存日志 + archiveLogService.saveInfo(ArchiveLogTypeEnum.gyzj, gyzjOld.getId(), gyzjOld.getMc(), gyzjOld.getBh(), gyzjOld.getNd()+gyzjOld.getNddw(), "同意归档"); } /** @@ -1353,7 +1364,8 @@ public class GyzjServiceImpl extends ServiceImpl implements IG Map formData = new LinkedHashMap<>(); formData.put("原因", form.getRemark()); gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "拒绝归档", JcmcysEnum.green.getValue(), formData, qmr, null); - + //保存日志 + archiveLogService.saveInfo(ArchiveLogTypeEnum.gyzj, gyzjOld.getId(), gyzjOld.getMc(), gyzjOld.getBh(), gyzjOld.getNd()+gyzjOld.getNddw(), "拒绝归档"); } /** @@ -1379,7 +1391,8 @@ public class GyzjServiceImpl extends ServiceImpl implements IG this.updateById(gyzjOld); //稽查轨迹 gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "同意解档", JcmcysEnum.green.getValue(), null, qmr, form.getRemark()); - + //保存日志 + archiveLogService.saveInfo(ArchiveLogTypeEnum.gyzj, gyzjOld.getId(), gyzjOld.getMc(), gyzjOld.getBh(), gyzjOld.getNd()+gyzjOld.getNddw(), "同意解档"); } /** @@ -1406,6 +1419,8 @@ public class GyzjServiceImpl extends ServiceImpl implements IG Map formData = new LinkedHashMap<>(); formData.put("原因", form.getRemark()); gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "拒绝解档", JcmcysEnum.green.getValue(), formData, qmr, null); + //保存日志 + archiveLogService.saveInfo(ArchiveLogTypeEnum.gyzj, gyzjOld.getId(), gyzjOld.getMc(), gyzjOld.getBh(), gyzjOld.getNd()+gyzjOld.getNddw(), "拒绝解档"); } @@ -1436,7 +1451,8 @@ public class GyzjServiceImpl extends ServiceImpl implements IG 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()); - + //保存日志 + archiveLogService.saveInfo(ArchiveLogTypeEnum.gyzj, gyzjOld.getId(), gyzjOld.getMc(), gyzjOld.getBh(), gyzjOld.getNd()+gyzjOld.getNddw(), "同意借阅"); } /** @@ -1467,7 +1483,8 @@ public class GyzjServiceImpl extends ServiceImpl implements IG formData.put("借阅结束时间", DateUtils.dateTime(form.getJyjsrq())); formData.put("原因", form.getRemark()); gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "拒绝借阅", JcmcysEnum.green.getValue(), formData, qmr, null); - + //保存日志 + archiveLogService.saveInfo(ArchiveLogTypeEnum.gyzj, gyzjOld.getId(), gyzjOld.getMc(), gyzjOld.getBh(), gyzjOld.getNd()+gyzjOld.getNddw(), "拒绝借阅"); } /** @@ -1492,7 +1509,8 @@ public class GyzjServiceImpl extends ServiceImpl implements IG this.updateById(gyzjOld); //稽查轨迹 gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "确认归还", JcmcysEnum.green.getValue(), null, qmr, form.getRemark()); - + //保存日志 + archiveLogService.saveInfo(ArchiveLogTypeEnum.gyzj, gyzjOld.getId(), gyzjOld.getMc(), gyzjOld.getBh(), gyzjOld.getNd()+gyzjOld.getNddw(), "确认归还"); } //endregion