From 41ee328455c692eb2e0a984cda1f30840f52fcb9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=B3=89=E4=BD=B3?= <1107186916@qq.com> Date: Wed, 21 Oct 2026 15:48:41 +0800 Subject: [PATCH] =?UTF-8?q?:fix:=20=E5=90=88=E5=90=8C=E7=89=B9=E6=89=B9?= =?UTF-8?q?=E9=99=84=E4=BB=B6=E5=BD=92=E5=8F=A3=E4=BD=90=E8=AF=81=E6=9D=90?= =?UTF-8?q?=E6=96=99=E5=8C=BA=E6=A0=A1=E9=AA=8C=E5=B9=B6=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E7=89=B9=E6=89=B9=E9=99=84=E4=BB=B6=E6=96=87=E6=A1=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/ContractManageServiceImpl.java | 28 ++++++++++---- ...contract_spec_attachment_dict_20261017.sql | 37 +++++++++++++++++++ 2 files changed, 57 insertions(+), 8 deletions(-) create mode 100644 doc/sql/transport/blade_contract_spec_attachment_dict_20261017.sql diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/ContractManageServiceImpl.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/ContractManageServiceImpl.java index 5e8f3900..754e7d93 100644 --- a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/ContractManageServiceImpl.java +++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/ContractManageServiceImpl.java @@ -161,7 +161,7 @@ public class ContractManageServiceImpl extends BaseServiceImpl HcsSyncConstant.ATTACHMENT_TYPE_SPEC_EXPLANATION .equals(Objects.toString(attachment.get(HcsSyncConstant.ATTACHMENT_TYPE_FIELD), null))); - if (!hasSpecExplanation) { - throw new ServiceException("合同相对方存在高风险/黑名单客商，必须上传「特批说明」类型附件后再提交审批"); - } } /** diff --git a/doc/sql/transport/blade_contract_spec_attachment_dict_20261017.sql b/doc/sql/transport/blade_contract_spec_attachment_dict_20261017.sql new file mode 100644 index 00000000..bdb0a1ca --- /dev/null +++ b/doc/sql/transport/blade_contract_spec_attachment_dict_20261017.sql @@ -0,0 +1,37 @@ +-- 特批附件归口「附件（佐证材料等）」区上传（产品口径 2026-10-17）。 +-- ① 下架用印材料字典 contract_attachment_type 中的特批附件（隐藏，逻辑删除，幂等）； +-- ② 新建佐证材料附件类型字典 contract_supporting_attachment_type：特批附件/其他文件。 +-- 佐证材料区此前取不到字典时前端走兜底选项，落库后各环境与前端兜底保持一致。 + +-- ① 用印材料字典下架特批附件 +UPDATE blade_dict_biz +SET is_deleted = 1 +WHERE code = 'contract_attachment_type' AND dict_key = '特批附件' AND tenant_id = '000000' AND is_deleted = 0; + +-- ② 佐证材料附件类型字典父项 +INSERT INTO blade_dict_biz (id, tenant_id, parent_id, code, dict_key, dict_value, sort, remark, is_sealed, status, is_deleted) +SELECT 2099700000000000001, '000000', 0, 'contract_supporting_attachment_type', '-1', '佐证材料附件类型', 1, NULL, 0, 1, 0 +WHERE NOT EXISTS ( + SELECT 1 FROM blade_dict_biz + WHERE code = 'contract_supporting_attachment_type' AND dict_key = '-1' AND tenant_id = '000000' AND is_deleted = 0 +); + +-- ③ 子项：特批附件（高风险/黑名单客商合同必传，fileType=特批附件） +INSERT INTO blade_dict_biz (id, tenant_id, parent_id, code, dict_key, dict_value, sort, remark, is_sealed, status, is_deleted) +SELECT 2099700000000000002, '000000', + (SELECT id FROM blade_dict_biz WHERE code = 'contract_supporting_attachment_type' AND dict_key = '-1' AND tenant_id = '000000' AND is_deleted = 0 LIMIT 1), + 'contract_supporting_attachment_type', '特批附件', '特批附件', 1, NULL, 0, 1, 0 +WHERE NOT EXISTS ( + SELECT 1 FROM blade_dict_biz + WHERE code = 'contract_supporting_attachment_type' AND dict_key = '特批附件' AND tenant_id = '000000' AND is_deleted = 0 +); + +-- ④ 子项：其他文件（佐证材料历史唯一类型） +INSERT INTO blade_dict_biz (id, tenant_id, parent_id, code, dict_key, dict_value, sort, remark, is_sealed, status, is_deleted) +SELECT 2099700000000000003, '000000', + (SELECT id FROM blade_dict_biz WHERE code = 'contract_supporting_attachment_type' AND dict_key = '-1' AND tenant_id = '000000' AND is_deleted = 0 LIMIT 1), + 'contract_supporting_attachment_type', '其他文件', '其他文件', 2, NULL, 0, 1, 0 +WHERE NOT EXISTS ( + SELECT 1 FROM blade_dict_biz + WHERE code = 'contract_supporting_attachment_type' AND dict_key = '其他文件' AND tenant_id = '000000' AND is_deleted = 0 +);