From e0588f42bef1397b79ec4497d6069018ffa93d27 Mon Sep 17 00:00:00 2001 From: wangli <274027703@qq.com> Date: Mon, 3 Mar 2025 13:59:02 +0800 Subject: [PATCH] =?UTF-8?q?feat(REQ-3300)=20-=20=E8=B0=83=E6=95=B4?= =?UTF-8?q?=E5=8D=95=E6=8D=AE=E5=88=97=E8=A1=A8=E5=93=8D=E5=BA=94=E6=8C=89?= =?UTF-8?q?=E9=92=AE=E7=9A=84=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/axzo/nanopart/visa/server/domain/ChangeRecord.java | 6 +++++- .../cn/axzo/nanopart/visa/server/service/VisaHelper.java | 3 +++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/domain/ChangeRecord.java b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/domain/ChangeRecord.java index a75dc40c..3aaacbbb 100644 --- a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/domain/ChangeRecord.java +++ b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/domain/ChangeRecord.java @@ -124,7 +124,11 @@ public class ChangeRecord extends BaseEntity { */ @TableField(value = "stamp_status") private VisaStampStatusEnum stampStatus; - + /** + * 是否申请过用印 + */ + @TableField(value = "applied_stamp") + private Boolean appliedStamp; /** * 合同 ID */ diff --git a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/VisaHelper.java b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/VisaHelper.java index 7cfdcfe6..819d5289 100644 --- a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/VisaHelper.java +++ b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/VisaHelper.java @@ -326,6 +326,9 @@ public class VisaHelper { switch (changeRecord.getStampStatus()) { case UNPRINTED: buttons.add(VisaButtonTypeEnum.REQUEST_STAMP); + if (changeRecord.getAppliedStamp()) { + buttons.add(VisaButtonTypeEnum.STAMP_PROGRESS); + } break; case WITH_PRINT: buttons.add(VisaButtonTypeEnum.STAMP_PROGRESS);