fix: 合同接口合并后报错

This commit is contained in:
刘泉佳
2026-10-27 09:54:33 +08:00
parent 0e2fdc5173
commit 7a6ff0c456
@@ -40,6 +40,7 @@ import org.springblade.system.pojo.entity.Dept;
import org.springblade.transport.constant.HcsSyncConstant;
import org.springblade.transport.excel.ContractManageExcel;
import org.springblade.transport.mapper.ContractManageMapper;
import org.springblade.transport.mapper.HcsContractExeStageMapper;
import org.springblade.transport.pojo.entity.ContractManage;
import org.springblade.transport.pojo.entity.HcsContractExeStage;
import org.springblade.transport.pojo.vo.ContractManageVO;
@@ -403,15 +404,13 @@ public class ContractManageServiceImpl extends BaseServiceImpl<ContractManageMap
source.setChangeAttachmentsJson(TransportBusinessSupport.trimToNull(request.getChangeAttachmentsJson()));
// 高风险/黑名单客商管控:变更提交同样必须携带特批附件(与新增/暂存/转正式一致,外部客商,内部组织默认无风险)
validateSpecExplanationOnSubmit(source);
Map<String, Object> afterData = buildContractChangeSnapshot(source);
retainChangedSnapshotFields(beforeData, afterData);
source.setApprovalStatus(STATUS_CHANGE_REVIEWING);
source.setChangeContent(TransportBusinessSupport.trimToNull(request.getChangeContent()));
source.setChangeReason(changeReason);
source.setCurrentNode("合同变更审批");
source.setCurrentProcessor("待处理");
appendChangeRecord(source, "合同信息变更", changeReason, STATUS_CHANGE_REVIEWING, "审核中", beforeData, afterData);
return updateById(source);
source.setBillingPlanJson(request.getBillingPlanJson());
source.setSettlementRuleJson(request.getSettlementRuleJson());
source.setPreSettlementConfigJson(request.getPreSettlementConfigJson());
source.setFormalSettlementConfigJson(request.getFormalSettlementConfigJson());
source.setPaymentRatioJson(request.getPaymentRatioJson());
source.setContractFileJson(request.getContractFileJson());
source.setAttachmentsJson(request.getAttachmentsJson());
}
@Override