Merge remote-tracking branch 'origin/main'

ruoyi-oa/src/main/java/com/ruoyi/oa/domain/SysOaFinance.java

@@ -91,6 +91,11 @@ public class SysOaFinance extends BaseEntity {
      */
     private SysOaProject project;
 
+    /**
+     * 收款账户id
+     */
+    private Long receiveAccountId;
+
     /**
      * 一对多关联进出账明细
      */

ruoyi-oa/src/main/java/com/ruoyi/oa/domain/SysOaReceiveAccount.java

@@ -0,0 +1,50 @@
+package com.ruoyi.oa.domain;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.baomidou.mybatisplus.annotation.*;
+import com.ruoyi.oa.domain.vo.SysOaReceiveAccountVo;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import com.ruoyi.common.core.domain.BaseEntity;
+
+import java.util.List;
+
+/**
+ * 付款账户管理对象 sys_oa_receive_account
+ *
+ * @author hdka
+ * @date 2024-11-02
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("sys_oa_receive_account")
+public class SysOaReceiveAccount extends BaseEntity {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 主键id
+     */
+    @TableId(value = "receive_account_id")
+    private Long receiveAccountId;
+    /**
+     * 收款账户名
+     */
+    private String receiveAccountName;
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 父节点
+     */
+    @ExcelProperty(value = "父节点")
+    private Long parentId;
+
+
+
+
+
+}

ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/SysOaFinanceBo.java

@@ -104,6 +104,11 @@ public class SysOaFinanceBo extends BaseEntity {
      */
     private SysOaProject project;
 
+    /**
+     * 收款账户id
+     */
+    private Long receiveAccountId;
+
     /**
      * 进出账明细
      */

ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/SysOaReceiveAccountBo.java

@@ -0,0 +1,49 @@
+package com.ruoyi.oa.domain.bo;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.ruoyi.common.core.validate.AddGroup;
+import com.ruoyi.common.core.validate.EditGroup;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import javax.validation.constraints.*;
+
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 付款账户管理业务对象 sys_oa_receive_account
+ *
+ * @author hdka
+ * @date 2024-11-02
+ */
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class SysOaReceiveAccountBo extends BaseEntity {
+
+    /**
+     * 主键id
+     */
+    @NotNull(message = "主键id不能为空", groups = { EditGroup.class })
+    private Long receiveAccountId;
+
+    /**
+     * 收款账户名
+     */
+    @NotBlank(message = "收款账户名不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String receiveAccountName;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+
+    /**
+     * 父节点
+     */
+    @ExcelProperty(value = "父节点")
+    private Long parentId;
+
+}

ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/SysOaFinanceVo.java

@@ -117,6 +117,16 @@ public class SysOaFinanceVo {
      */
     private SysOaProject project;
 
+    /**
+     * 收款账户id
+     */
+    private Long receiveAccountId;
+
+    /**
+     * 收款账户id
+     */
+    private String receiveAccountName;
+
     /**
      * 一对多关联进出账明细
      */

ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/SysOaReceiveAccountVo.java

@@ -0,0 +1,58 @@
+package com.ruoyi.oa.domain.vo;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+
+/**
+ * 付款账户管理视图对象 sys_oa_receive_account
+ *
+ * @author hdka
+ * @date 2024-11-02
+ */
+@Data
+@ExcelIgnoreUnannotated
+public class SysOaReceiveAccountVo {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键id
+     */
+    @ExcelProperty(value = "主键id")
+    private Long receiveAccountId;
+
+    /**
+     * 收款账户名
+     */
+    @ExcelProperty(value = "收款账户名")
+    private String receiveAccountName;
+
+    /**
+     * 备注
+     */
+    @ExcelProperty(value = "备注")
+    private String remark;
+
+    /**
+     * 父节点
+     */
+    @ExcelProperty(value = "父节点")
+    private Long parentId;
+
+    /**
+     * 子节点
+     */
+    @ExcelProperty(value = "子节点")
+    private List<SysOaReceiveAccountVo> children;
+
+    /**
+     * 前端树节点需要这个
+     */
+    private String label;
+
+
+}