1.1.9 合同回款页面阶段详情查询优化

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;

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());