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;