From 214b68b8e69487c66eca15a89a3993ade1a41d71 Mon Sep 17 00:00:00 2001 From: zhouxiaofeng <2946471396@qq.com> Date: Mon, 8 Jun 2026 09:57:29 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A1=A5=E5=BD=95=E4=B8=BB=E5=90=88=E5=90=8C?= =?UTF-8?q?=E5=92=8C=E6=93=8D=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../zgwl/contractlaunch/dto/ContractLaunchPlanDto.java | 10 +++++++--- .../service/ContractLaunchServiceImpl.java | 6 +++++- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/nbport/zgwl/contractlaunch/dto/ContractLaunchPlanDto.java b/src/main/java/com/nbport/zgwl/contractlaunch/dto/ContractLaunchPlanDto.java index cce5fd3..e4fd263 100644 --- a/src/main/java/com/nbport/zgwl/contractlaunch/dto/ContractLaunchPlanDto.java +++ b/src/main/java/com/nbport/zgwl/contractlaunch/dto/ContractLaunchPlanDto.java @@ -46,11 +46,15 @@ public class ContractLaunchPlanDto implements Serializable { */ private String planSubjectCode; - /** - * 所属主体名称，推送法务字段 planSubjectName。 - */ + /** 所属主体名称，推送法务字段 planSubjectName。 */ private String planSubjectName; + /** + * 执行人公司ID，推送法务字段 executorUnitId。 + * 对应履行计划中执行人所属的公司/组织ID。 + */ + private Long executorUnitId; + /** 备注 */ private String planDetail; diff --git a/src/main/java/com/nbport/zgwl/contractlaunch/service/ContractLaunchServiceImpl.java b/src/main/java/com/nbport/zgwl/contractlaunch/service/ContractLaunchServiceImpl.java index fd85427..47e092c 100644 --- a/src/main/java/com/nbport/zgwl/contractlaunch/service/ContractLaunchServiceImpl.java +++ b/src/main/java/com/nbport/zgwl/contractlaunch/service/ContractLaunchServiceImpl.java @@ -1064,7 +1064,10 @@ public class ContractLaunchServiceImpl implements ContractLaunchService { Map payload = new LinkedHashMap<>(); payload.put("contractSource", contract.getContractSource()); payload.put("isAddit", contract.getIsAddit() == null ? 2 : contract.getIsAddit()); - payload.put("operate", "create"); + String operate = (ContractLaunchConstants.STATUS_REJECTED.equals(contract.getStatus()) + || (contract.getLawContractCode() != null && !contract.getLawContractCode().isBlank())) + ? "update" : "create"; + payload.put("operate", operate); payload.put("mainContractCode", contract.getMainContractCode()); payload.put("periodExplain", contract.getPeriodExplain()); payload.put("valuationMode", contract.getValuationMode()); @@ -1126,6 +1129,7 @@ public class ContractLaunchServiceImpl implements ContractLaunchService { map.put("planDay", plan.getPlanDay()); map.put("planSubjectCode", plan.getPlanSubjectCode()); map.put("planSubjectName", plan.getPlanSubjectName()); + map.put("executorUnitId", plan.getExecutorUnitId()); return map; }).collect(Collectors.toList())); // payload.put("contractText", buildSettlementFilePayloadList(contract, ContractLaunchConstants.FILE_CATEGORY_BODY));