From f54c05949b30e06b54a67c8a802fbe0db73c811e Mon Sep 17 00:00:00 2001
From: yinq <yinq>
Date: Thu, 2 Apr 2026 18:23:19 +0800
Subject: [PATCH] =?UTF-8?q?1.1.9=20=E5=90=88=E5=90=8C=E5=9B=9E=E6=AC=BE?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E9=98=B6=E6=AE=B5=E8=AF=A6=E6=83=85=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../oa/erp/domain/vo/ContractCollectionStageDetailVo.java   | 1 +
 .../oa/erp/service/impl/ErpProjectPlanServiceImpl.java      | 6 ++++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/vo/ContractCollectionStageDetailVo.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/vo/ContractCollectionStageDetailVo.java
index af060a45..b61e1cda 100644
--- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/vo/ContractCollectionStageDetailVo.java
+++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/vo/ContractCollectionStageDetailVo.java
@@ -26,6 +26,7 @@ public class ContractCollectionStageDetailVo {
      * 项目计划阶段回款确认信息（按 collectionStage 匹配）
      */
     private Long planStageId;
+    private Long repaymentRate;
     private Date receivableDate;
     private BigDecimal actualRepaymentAmount;
     private Long collectionConfirmUserId;
diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpProjectPlanServiceImpl.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpProjectPlanServiceImpl.java
index db39bf37..1d447bfa 100644
--- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpProjectPlanServiceImpl.java
+++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpProjectPlanServiceImpl.java
@@ -449,17 +449,19 @@ public class ErpProjectPlanServiceImpl implements IErpProjectPlanService {
                 .eq(ErpProjectPlanStage::getProjectPlanId, projectPlanId)
                 .eq(ErpProjectPlanStage::getDelFlag, "0")
         );
+        // erp_project_plan_stage.collection_stage 实际存的是 paymentStageId（字符串）
         Map<String, ErpProjectPlanStage> planStageMap = planStages.stream()
             .filter(i -> StringUtils.isNotBlank(i.getCollectionStage()))
             .collect(Collectors.toMap(ErpProjectPlanStage::getCollectionStage, i -> i, (a, b) -> a));
 
         contractStages.forEach(item -> {
-            if (StringUtils.isBlank(item.getCollectionStage())) {
+            if (item.getPaymentStageId() == null) {
                 return;
             }
-            ErpProjectPlanStage matched = planStageMap.get(item.getCollectionStage());
+            ErpProjectPlanStage matched = planStageMap.get(String.valueOf(item.getPaymentStageId()));
             if (matched != null) {
                 item.setPlanStageId(matched.getPlanStageId());
+                item.setRepaymentRate(matched.getRepaymentRate());
                 item.setReceivableDate(matched.getReceivableDate());
                 item.setActualRepaymentAmount(matched.getActualRepaymentAmount());
                 item.setCollectionConfirmUserId(matched.getCollectionConfirmUserId());