1.0.63 回款阶段添加付款节点、付款条款模板字段

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;
+
     /**
      * 排序号
      */

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;
+
     /**
      * 排序号
      */

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;
+
     /**
      * 排序号
      */

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;
     }
 

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,