From 6f941697e9b23a3b0f4c0d36845c6664f75bce3c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=B3=89=E4=BD=B3?= <1107186916@qq.com> Date: Fri, 30 Oct 2026 14:11:49 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E5=90=88=E5=90=8C=E8=A1=A8?= =?UTF-8?q?=E9=BB=91=E5=90=8D=E5=8D=95=E7=8A=B6=E6=80=81=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E6=94=B9kingdee=5F=E5=89=8D=E7=BC=80=EF=BC=88hcs=5Fblack=5Fsta?= =?UTF-8?q?tus=E6=94=B9=E5=90=8Dkingdee=5Fblack=5Fstatus=E5=B9=B6=E8=BF=81?= =?UTF-8?q?=E7=A7=BB=E6=95=B0=E6=8D=AE=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../transport/pojo/entity/ContractChange.java | 2 +- .../transport/pojo/entity/ContractManage.java | 2 +- .../support/hcs/HcsContractSyncSupport.java | 4 +-- ..._contract_black_status_rename_20261030.sql | 32 +++++++++++++++++++ 4 files changed, 36 insertions(+), 4 deletions(-) create mode 100644 doc/sql/transport/lqj/temp/04_blade_contract_black_status_rename_20261030.sql diff --git a/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/entity/ContractChange.java b/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/entity/ContractChange.java index 936ec485..0ca18f11 100644 --- a/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/entity/ContractChange.java +++ b/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/entity/ContractChange.java @@ -208,7 +208,7 @@ public class ContractChange extends TenantEntity { private String hcsRiskLevel; @Schema(description = "合规客商黑名单状态（展示用）") - private String hcsBlackStatus; + private String kingdeeBlackStatus; @Schema(description = "审批状态") private String approvalStatus; diff --git a/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/entity/ContractManage.java b/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/entity/ContractManage.java index 655ae234..adb92905 100644 --- a/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/entity/ContractManage.java +++ b/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/entity/ContractManage.java @@ -244,7 +244,7 @@ public class ContractManage extends TenantEntity { private String hcsRiskLevel; @Schema(description = "合规客商黑名单状态（C101-1，甲方/乙方取是）") - private String hcsBlackStatus; + private String kingdeeBlackStatus; @Schema(description = "合规风险校验时间") private LocalDateTime hcsRiskTime; 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 30fe801d..81b95b30 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 @@ -282,7 +282,7 @@ public class HcsContractSyncSupport { // 黑名单状态：任一方黑名单即为是 boolean blacklist = riskPartyA.blacklist() || riskPartyB.blacklist(); contractManage.setHcsRiskLevel(riskLevel); - contractManage.setHcsBlackStatus(blacklist ? BLACK_STATUS_YES : "no"); + contractManage.setKingdeeBlackStatus(blacklist ? BLACK_STATUS_YES : "no"); contractManage.setHcsRiskTime(LocalDateTime.now()); contractManageMapper.updateById(contractManage); boolean risky = HcsSyncConstant.RISK_LEVEL_HIGH.equals(riskLevel) || blacklist; @@ -312,7 +312,7 @@ public class HcsContractSyncSupport { contractManage.setCurrentNode(HcsSyncConstant.SPEC_REVIEW_NODE); contractManageMapper.updateById(contractManage); log.info("HCS合同高风险/黑名单挂起特批审核：contractNo={}，riskLevel={}，blackStatus={}，挂起节点={}", - contractManage.getContractNo(), contractManage.getHcsRiskLevel(), contractManage.getHcsBlackStatus(), + contractManage.getContractNo(), contractManage.getHcsRiskLevel(), contractManage.getKingdeeBlackStatus(), contractManage.getCurrentNode()); } diff --git a/doc/sql/transport/lqj/temp/04_blade_contract_black_status_rename_20261030.sql b/doc/sql/transport/lqj/temp/04_blade_contract_black_status_rename_20261030.sql new file mode 100644 index 00000000..bc0a7a3d --- /dev/null +++ b/doc/sql/transport/lqj/temp/04_blade_contract_black_status_rename_20261030.sql @@ -0,0 +1,32 @@ +-- 合同表黑名单状态列改 kingdee_ 前缀（黑名单数据归金蝶口径，与客商档案表字段命名统一）： +-- blade_contract_manage.hcs_black_status -> kingdee_black_status +-- blade_contract_change.hcs_black_status -> kingdee_black_status +-- 幂等可重复执行：新列不存在时，旧列存在则 CHANGE 改名迁移数据，否则新增；旧索引自动跟随列名，无需处理。 + +-- ① blade_contract_manage +SET @ddl = (SELECT IF( + (SELECT COUNT(*) FROM information_schema.COLUMNS + WHERE TABLE_SCHEMA = DATABASE() AND TABLE_NAME = 'blade_contract_manage' AND COLUMN_NAME = 'kingdee_black_status') = 0, + (SELECT IF( + (SELECT COUNT(*) FROM information_schema.COLUMNS + WHERE TABLE_SCHEMA = DATABASE() AND TABLE_NAME = 'blade_contract_manage' AND COLUMN_NAME = 'hcs_black_status') > 0, + 'ALTER TABLE `blade_contract_manage` CHANGE COLUMN `hcs_black_status` `kingdee_black_status` varchar(8) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT ''合规客商黑名单状态（C101-1，任一方黑名单记是）''', + 'ALTER TABLE `blade_contract_manage` ADD COLUMN `kingdee_black_status` varchar(8) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT ''合规客商黑名单状态（C101-1，任一方黑名单记是）'' AFTER `hcs_risk_level`')), + 'SELECT 1')); +PREPARE stmt FROM @ddl; +EXECUTE stmt; +DEALLOCATE PREPARE stmt; + +-- ② blade_contract_change +SET @ddl = (SELECT IF( + (SELECT COUNT(*) FROM information_schema.COLUMNS + WHERE TABLE_SCHEMA = DATABASE() AND TABLE_NAME = 'blade_contract_change' AND COLUMN_NAME = 'kingdee_black_status') = 0, + (SELECT IF( + (SELECT COUNT(*) FROM information_schema.COLUMNS + WHERE TABLE_SCHEMA = DATABASE() AND TABLE_NAME = 'blade_contract_change' AND COLUMN_NAME = 'hcs_black_status') > 0, + 'ALTER TABLE `blade_contract_change` CHANGE COLUMN `hcs_black_status` `kingdee_black_status` varchar(8) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT ''合规客商黑名单状态（展示用）''', + 'ALTER TABLE `blade_contract_change` ADD COLUMN `kingdee_black_status` varchar(8) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT ''合规客商黑名单状态（展示用）'' AFTER `hcs_risk_level`')), + 'SELECT 1')); +PREPARE stmt FROM @ddl; +EXECUTE stmt; +DEALLOCATE PREPARE stmt;