From d94d42612268ce938fa62ed29b314ce0b1c12bff Mon Sep 17 00:00:00 2001 From: "15881625488@163.com" <15881625488@163.com> Date: Mon, 19 Jan 2026 08:29:15 +0800 Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A[=E8=B5=84=E6=BA=90=E5=BA=93]?= =?UTF-8?q?=E5=8F=91=E6=94=BE=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/hxhq/business/domain/GyzjFfjl.java | 12 ++++++------ .../main/java/com/hxhq/business/enums/zykgl/JcgjlxEnum.java | 9 +++++++-- .../com/hxhq/business/service/impl/GyzjFfjlServiceImpl.java | 2 +- .../com/hxhq/business/service/impl/MjyFfjlServiceImpl.java | 2 +- 4 files changed, 15 insertions(+), 10 deletions(-) diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/GyzjFfjl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/GyzjFfjl.java index 46b3b99..d926c53 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/GyzjFfjl.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/GyzjFfjl.java @@ -187,10 +187,10 @@ public class GyzjFfjl extends MpBaseEntity private Long gdsqrId; /** 归档申请人名称 */ - private Long gdsqrMc; + private String gdsqrMc; /** 归档申请人名称-英文 */ - private Long gdsqrMcEn; + private String gdsqrMcEn; /** 暂存柜id */ private Long zcgId; @@ -299,19 +299,19 @@ public class GyzjFfjl extends MpBaseEntity this.jsr2McEn = jsr2McEn; } - public Long getGdsqrMc() { + public String getGdsqrMc() { return gdsqrMc; } - public void setGdsqrMc(Long gdsqrMc) { + public void setGdsqrMc(String gdsqrMc) { this.gdsqrMc = gdsqrMc; } - public Long getGdsqrMcEn() { + public String getGdsqrMcEn() { return gdsqrMcEn; } - public void setGdsqrMcEn(Long gdsqrMcEn) { + public void setGdsqrMcEn(String gdsqrMcEn) { this.gdsqrMcEn = gdsqrMcEn; } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/enums/zykgl/JcgjlxEnum.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/enums/zykgl/JcgjlxEnum.java index b5272eb..7fbe8fa 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/enums/zykgl/JcgjlxEnum.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/enums/zykgl/JcgjlxEnum.java @@ -1,7 +1,7 @@ package com.hxhq.business.enums.zykgl; /** - * 稽查轨迹类型:1:流程；3：编辑；5：人员；7：修改 + * 稽查轨迹类型:1:流程；3：编辑；5：人员；7：修改；9：补充说明 * @author tanfei */ public enum JcgjlxEnum { @@ -24,7 +24,12 @@ public enum JcgjlxEnum { /** * 修改 */ - xg(7, "修改"); + xg(7, "修改"), + + /** + * 补充说明 + */ + bcsm(9, "补充说明"); private int value; private String text; diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GyzjFfjlServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GyzjFfjlServiceImpl.java index 6fe4338..5586f1a 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GyzjFfjlServiceImpl.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GyzjFfjlServiceImpl.java @@ -124,7 +124,7 @@ public class GyzjFfjlServiceImpl extends ServiceImpl i throw new ServiceException("发放记录【" + gyzjFfjlOld.getMc() + "】不是未锁定状态，不能加签"); } //稽查轨迹 - gyzjFfjlJcgjService.saveJcgj(gyzjFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "补充说明", JcmcysEnum.orange.getValue(), null,qmr, form.getRemark()); + gyzjFfjlJcgjService.saveJcgj(gyzjFfjlOld.getId(), JcgjlxEnum.bcsm.getValue(), "补充说明", JcmcysEnum.orange.getValue(), null,qmr, form.getRemark()); } /** diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/MjyFfjlServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/MjyFfjlServiceImpl.java index 91e0b01..1defcf0 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/MjyFfjlServiceImpl.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/MjyFfjlServiceImpl.java @@ -121,7 +121,7 @@ public class MjyFfjlServiceImpl extends ServiceImpl impl throw new ServiceException("发放记录【" + mjyFfjlOld.getMc() + "】不是未锁定状态，不能加签"); } //稽查轨迹 - mjyFfjlJcgjService.saveJcgj(mjyFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "补充说明", JcmcysEnum.orange.getValue(), null, qmr,form.getRemark()); + mjyFfjlJcgjService.saveJcgj(mjyFfjlOld.getId(), JcgjlxEnum.bcsm.getValue(), "补充说明", JcmcysEnum.orange.getValue(), null, qmr,form.getRemark()); } /**