From 8b9f66dd128c34385bdd65707e04634c9d4198e0 Mon Sep 17 00:00:00 2001
From: yinq <yinq>
Date: Thu, 29 Jan 2026 16:53:14 +0800
Subject: [PATCH] =?UTF-8?q?1.0.63=20=E5=9B=9E=E6=AC=BE=E9=98=B6=E6=AE=B5?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BB=98=E6=AC=BE=E8=8A=82=E7=82=B9=E3=80=81?=
 =?UTF-8?q?=E4=BB=98=E6=AC=BE=E6=9D=A1=E6=AC=BE=E6=A8=A1=E6=9D=BF=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dromara/oa/base/domain/BasePaymentStage.java   | 10 ++++++++++
 .../oa/base/domain/bo/BasePaymentStageBo.java      | 14 ++++++++++++--
 .../oa/base/domain/vo/BasePaymentStageVo.java      | 13 ++++++++++++-
 .../service/impl/BasePaymentStageServiceImpl.java  |  3 ++-
 .../mapper/oa/base/BasePaymentStageMapper.xml      |  2 ++
 5 files changed, 38 insertions(+), 4 deletions(-)

diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/base/domain/BasePaymentStage.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/base/domain/BasePaymentStage.java
index b72d92ba..360a312b 100644
--- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/base/domain/BasePaymentStage.java
+++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/base/domain/BasePaymentStage.java
@@ -42,6 +42,16 @@ public class BasePaymentStage extends TenantEntity {
      */
     private String collectionStage;
 
+    /**
+     * 付款节点
+     */
+    private String paymentMethod;
+
+    /**
+     * 付款条款模板
+     */
+    private String paymentTemplate;
+
     /**
      * 排序号
      */
diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/base/domain/bo/BasePaymentStageBo.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/base/domain/bo/BasePaymentStageBo.java
index 5264289f..6c3b6035 100644
--- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/base/domain/bo/BasePaymentStageBo.java
+++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/base/domain/bo/BasePaymentStageBo.java
@@ -33,15 +33,25 @@ public class BasePaymentStageBo extends BaseEntity {
     /**
      * 阶段名称
      */
-    @NotBlank(message = "阶段名称不能为空", groups = { AddGroup.class, EditGroup.class })
+    @NotBlank(message = "阶段名称不能为空", groups = {AddGroup.class, EditGroup.class})
     private String stageName;
 
     /**
      * 回款阶段（关联各节点，提示用）
      */
-    @NotBlank(message = "回款阶段（关联各节点，提示用）不能为空", groups = { AddGroup.class, EditGroup.class })
+    @NotBlank(message = "回款阶段（关联各节点，提示用）不能为空", groups = {AddGroup.class, EditGroup.class})
     private String collectionStage;
 
+    /**
+     * 付款节点
+     */
+    private String paymentMethod;
+
+    /**
+     * 付款条款模板
+     */
+    private String paymentTemplate;
+
     /**
      * 排序号
      */
diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/base/domain/vo/BasePaymentStageVo.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/base/domain/vo/BasePaymentStageVo.java
index 029a01e4..276b5ad4 100644
--- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/base/domain/vo/BasePaymentStageVo.java
+++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/base/domain/vo/BasePaymentStageVo.java
@@ -13,7 +13,6 @@ import java.io.Serializable;
 import java.util.Date;
 
 
-
 /**
  * 回款阶段视图对象 base_payment_stage
  *
@@ -53,6 +52,18 @@ public class BasePaymentStageVo implements Serializable {
     @ExcelDictFormat(dictType = "collection_stage")
     private String collectionStage;
 
+    /**
+     * 付款节点
+     */
+    @ExcelProperty(value = "付款节点")
+    private String paymentMethod;
+
+    /**
+     * 付款条款模板
+     */
+    @ExcelProperty(value = "付款条款模板")
+    private String paymentTemplate;
+
     /**
      * 排序号
      */
diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/base/service/impl/BasePaymentStageServiceImpl.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/base/service/impl/BasePaymentStageServiceImpl.java
index 901ab759..7958d485 100644
--- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/base/service/impl/BasePaymentStageServiceImpl.java
+++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/base/service/impl/BasePaymentStageServiceImpl.java
@@ -77,7 +77,8 @@ public class BasePaymentStageServiceImpl implements IBasePaymentStageService {
                 .eq(StringUtils.isNotBlank(bo.getStageCode()), BasePaymentStage::getStageCode, bo.getStageCode())
                 .like(StringUtils.isNotBlank(bo.getStageName()), BasePaymentStage::getStageName, bo.getStageName())
                 .eq(StringUtils.isNotBlank(bo.getCollectionStage()), BasePaymentStage::getCollectionStage, bo.getCollectionStage())
-                .eq(bo.getSortOrder() != null, BasePaymentStage::getSortOrder, bo.getSortOrder());
+                .eq(bo.getSortOrder() != null, BasePaymentStage::getSortOrder, bo.getSortOrder())
+                .orderByAsc(BasePaymentStage::getSortOrder);
         return lqw;
     }
 
diff --git a/ruoyi-modules/ruoyi-oa/src/main/resources/mapper/oa/base/BasePaymentStageMapper.xml b/ruoyi-modules/ruoyi-oa/src/main/resources/mapper/oa/base/BasePaymentStageMapper.xml
index d3bd0032..3542c09e 100644
--- a/ruoyi-modules/ruoyi-oa/src/main/resources/mapper/oa/base/BasePaymentStageMapper.xml
+++ b/ruoyi-modules/ruoyi-oa/src/main/resources/mapper/oa/base/BasePaymentStageMapper.xml
@@ -12,6 +12,8 @@
                stage_code,
                stage_name,
                collection_stage,
+               payment_method,
+               payment_template,
                sort_order,
                remark,
                del_flag,