From f579a7eb20ee4d4712e0e9b915fe0b28010d6c86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=B3=89=E4=BD=B3?= <1107186916@qq.com> Date: Tue, 20 Oct 2026 16:54:26 +0800 Subject: [PATCH] =?UTF-8?q?:refactor:=20=E6=8F=90=E5=8F=96=E5=AE=A1?= =?UTF-8?q?=E6=89=B9=E7=8A=B6=E6=80=81=E4=B8=AD=E6=96=87=E5=90=8D=E6=98=A0?= =?UTF-8?q?=E5=B0=84=E4=B8=BA=E5=85=AC=E5=85=B1=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 审批状态中文名映射收敛至 HcsSyncConstant.approvalStatusName（金蝶回调变更记录共用） - 删除项目/合同特批/合同同步三个支撑组件中的重复私有实现 --- .../transport/constant/HcsSyncConstant.java | 21 +++++++++++++++++ .../hcs/HcsContractSpecSyncSupport.java | 21 +---------------- .../support/hcs/HcsContractSyncSupport.java | 21 +---------------- .../support/hcs/HcsProjectSyncSupport.java | 23 +------------------ 4 files changed, 24 insertions(+), 62 deletions(-) diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/constant/HcsSyncConstant.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/constant/HcsSyncConstant.java index e82d304a..c4eb9884 100644 --- a/blade-service/blade-transport/src/main/java/org/springblade/transport/constant/HcsSyncConstant.java +++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/constant/HcsSyncConstant.java @@ -301,6 +301,27 @@ public final class HcsSyncConstant { return message.length() > SYNC_MSG_MAX_LENGTH ? message.substring(0, SYNC_MSG_MAX_LENGTH) : message; } + /** + * 审批状态中文名（变更记录展示用，金蝶同步结果回调等系统链路共用；未匹配回退原值） + */ + public static String approvalStatusName(String approvalStatus) { + if (approvalStatus == null || approvalStatus.isEmpty()) { + return null; + } + return switch (approvalStatus) { + case "draft" -> "草稿"; + case "reviewing" -> "审批中"; + case "withdrawn" -> "已撤回"; + case "approved" -> "审批通过"; + case "rejected" -> "已驳回"; + case "change_reviewing" -> "变更审批中"; + case "change_rejected" -> "变更驳回"; + case "change_approved" -> "变更审批通过"; + case "voided" -> "已作废"; + default -> approvalStatus; + }; + } + private HcsSyncConstant() { } } diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/support/hcs/HcsContractSpecSyncSupport.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/support/hcs/HcsContractSpecSyncSupport.java index dad84844..f14c7565 100644 --- a/blade-service/blade-transport/src/main/java/org/springblade/transport/support/hcs/HcsContractSpecSyncSupport.java +++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/support/hcs/HcsContractSpecSyncSupport.java @@ -229,30 +229,11 @@ public class HcsContractSpecSyncSupport { record.put("changeType", "金蝶同步结果"); record.put("changeContent", changeContent); record.put("status", contractManage.getApprovalStatus()); - record.put("statusName", approvalStatusName(contractManage.getApprovalStatus())); + record.put("statusName", HcsSyncConstant.approvalStatusName(contractManage.getApprovalStatus())); records.add(record); contractManage.setChangeRecordJson(JSONUtil.toJsonStr(records)); } - /** - * 审批状态中文名（变更记录展示用，未匹配回退原值） - */ - private String approvalStatusName(String approvalStatus) { - if (StringUtil.isBlank(approvalStatus)) { - return null; - } - return switch (approvalStatus) { - case "draft" -> "草稿"; - case "reviewing" -> "审批中"; - case "withdrawn" -> "已撤回"; - case "approved" -> "审批通过"; - case "rejected" -> "已驳回"; - case "change_reviewing" -> "变更审批中"; - case "change_approved" -> "变更审批通过"; - default -> approvalStatus; - }; - } - /** * 按 ERP 合同编号定位合同（合规推送 contractCode，合同编号唯一） */ diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/support/hcs/HcsContractSyncSupport.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/support/hcs/HcsContractSyncSupport.java index 47e1adc2..7cd6e1c4 100644 --- a/blade-service/blade-transport/src/main/java/org/springblade/transport/support/hcs/HcsContractSyncSupport.java +++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/support/hcs/HcsContractSyncSupport.java @@ -208,30 +208,11 @@ public class HcsContractSyncSupport { record.put("changeType", "金蝶同步结果"); record.put("changeContent", changeContent); record.put("status", contractManage.getApprovalStatus()); - record.put("statusName", approvalStatusName(contractManage.getApprovalStatus())); + record.put("statusName", HcsSyncConstant.approvalStatusName(contractManage.getApprovalStatus())); records.add(record); contractManage.setChangeRecordJson(JSONUtil.toJsonStr(records)); } - /** - * 审批状态中文名（变更记录展示用，未匹配回退原值） - */ - private String approvalStatusName(String approvalStatus) { - if (StringUtil.isBlank(approvalStatus)) { - return null; - } - return switch (approvalStatus) { - case "draft" -> "草稿"; - case "reviewing" -> "审批中"; - case "withdrawn" -> "已撤回"; - case "approved" -> "审批通过"; - case "rejected" -> "已驳回"; - case "change_reviewing" -> "变更审批中"; - case "change_approved" -> "变更审批通过"; - default -> approvalStatus; - }; - } - /** * 推送合同到 HCS：特批挂起门禁 → 风险校验（仅留痕，高风险不再阻断）→ 附件转传 → 判重 → 起草/更新 → 回填合规 fdId 置 synced * → 履约计划行级同步（C103-9，先于特批挂起）→ 高风险/黑名单客商合同挂起"特批审核"等待合规特批结果（报文随 fdSepcailContract=true，外部客商管控） diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/support/hcs/HcsProjectSyncSupport.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/support/hcs/HcsProjectSyncSupport.java index db8c5106..7c4fa704 100644 --- a/blade-service/blade-transport/src/main/java/org/springblade/transport/support/hcs/HcsProjectSyncSupport.java +++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/support/hcs/HcsProjectSyncSupport.java @@ -331,32 +331,11 @@ public class HcsProjectSyncSupport { record.put("changeType", "金蝶同步结果"); record.put("changeContent", changeContent); record.put("status", projectApply.getApprovalStatus()); - record.put("statusName", approvalStatusName(projectApply.getApprovalStatus())); + record.put("statusName", HcsSyncConstant.approvalStatusName(projectApply.getApprovalStatus())); records.add(record); projectApply.setChangeRecordJson(JSONUtil.toJsonStr(records)); } - /** - * 审批状态中文名（变更记录展示用，未匹配回退原值） - */ - private String approvalStatusName(String approvalStatus) { - if (StringUtil.isBlank(approvalStatus)) { - return null; - } - return switch (approvalStatus) { - case "draft" -> "草稿"; - case "reviewing" -> "审批中"; - case "withdrawn" -> "已撤回"; - case "approved" -> "审批通过"; - case "rejected" -> "已驳回"; - case "change_reviewing" -> "变更审批中"; - case "change_rejected" -> "变更驳回"; - case "change_approved" -> "变更审批通过"; - case "voided" -> "已作废"; - default -> approvalStatus; - }; - } - /** * 按 ERP 项目编号定位项目（合规推送 projectCode，对应 C102 fd_num） */