From 5dffee5b926a922964129d6153fd67c0e1b60e11 Mon Sep 17 00:00:00 2001 From: "15881625488@163.com" <15881625488@163.com> Date: Thu, 22 Jan 2026 19:04:35 +0800 Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A[=E6=A1=A3=E6=A1=88=E7=AE=A1?= =?UTF-8?q?=E7=90=86]=E7=BB=99=E8=8D=AF=E5=88=B6=E5=89=82=E6=A1=A3?= =?UTF-8?q?=E6=A1=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../business/controller/GyzjArchiveController.java | 2 +- .../java/com/hxhq/business/dto/gyzj/ListDto.java | 23 ++++++++++++++++++++++ .../business/service/impl/GyzjServiceImpl.java | 19 ++++++++++++++---- .../main/resources/mapper/business/GyzjMapper.xml | 2 +- 4 files changed, 40 insertions(+), 6 deletions(-) diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/GyzjArchiveController.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/GyzjArchiveController.java index de4d274..a0a6b82 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/GyzjArchiveController.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/GyzjArchiveController.java @@ -99,7 +99,7 @@ public class GyzjArchiveController extends BaseController * 拒绝解档 */ @PostMapping("/jjjd") - @RequiresPermissions("business:resource:gyzj:jjjd") + @RequiresPermissions("business:archive:gyzj:jjjd") public AjaxResult jjjd(@RequestBody ArchiveForm form) { gyzjService.jjjd(form); diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/dto/gyzj/ListDto.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/dto/gyzj/ListDto.java index ca7e002..bebcd9d 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/dto/gyzj/ListDto.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/dto/gyzj/ListDto.java @@ -100,6 +100,29 @@ public class ListDto { /** 发放目的其他 */ private String mdOther; + /** 借阅开始日期 */ + @JsonFormat(pattern = "yyyy-MM-dd") + private Date jyksrq; + + /** 借阅结束日期 */ + @JsonFormat(pattern = "yyyy-MM-dd") + private Date jyjsrq; + + public Date getJyksrq() { + return jyksrq; + } + + public void setJyksrq(Date jyksrq) { + this.jyksrq = jyksrq; + } + + public Date getJyjsrq() { + return jyjsrq; + } + + public void setJyjsrq(Date jyjsrq) { + this.jyjsrq = jyjsrq; + } public Long getResourceId() { return resourceId; 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 3bc49b8..d579b48 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 @@ -1347,7 +1347,9 @@ 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()); + Map formData = new LinkedHashMap<>(); + formData.put("原因", form.getRemark()); + gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "拒绝归档", JcmcysEnum.green.getValue(), formData, qmr, null); } @@ -1398,7 +1400,9 @@ 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()); + Map formData = new LinkedHashMap<>(); + formData.put("原因", form.getRemark()); + gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "拒绝解档", JcmcysEnum.green.getValue(), formData, qmr, null); } @@ -1425,7 +1429,10 @@ public class GyzjServiceImpl extends ServiceImpl implements IG gyzjOld.setJyjsrq(form.getJyjsrq()); this.updateById(gyzjOld); //稽查轨迹 - gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "同意借阅", JcmcysEnum.green.getValue(), null, qmr, form.getRemark()); + Map 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()); } @@ -1452,7 +1459,11 @@ public class GyzjServiceImpl extends ServiceImpl implements IG gyzjOld.setJyjsrq(form.getJyjsrq()); this.updateById(gyzjOld); //稽查轨迹 - gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "拒绝借阅", JcmcysEnum.green.getValue(), null, qmr, form.getRemark()); + Map formData = new LinkedHashMap<>(); + 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); } diff --git a/hxhq-modules/hxhq-system/src/main/resources/mapper/business/GyzjMapper.xml b/hxhq-modules/hxhq-system/src/main/resources/mapper/business/GyzjMapper.xml index 12e0d88..83de8c5 100644 --- a/hxhq-modules/hxhq-system/src/main/resources/mapper/business/GyzjMapper.xml +++ b/hxhq-modules/hxhq-system/src/main/resources/mapper/business/GyzjMapper.xml @@ -15,7 +15,7 @@