feat:权限审批

pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/dto/WalletForeignDto.java

@@ -0,0 +1,18 @@
+package com.bsd.pjcloud.wallet.api.dto;
+
+import com.bsd.pjcloud.admin.api.vo.base.BaseDeptInterface;
+import com.bsd.pjcloud.admin.api.vo.base.BaseUserInterface;
+import com.bsd.pjcloud.wallet.api.entity.WalletForeignEntity;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class WalletForeignDto extends WalletForeignEntity {
+
+    private List<Long> userIds;
+
+    private List<Long> deptIds;
+
+
+}

pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/dto/WalletStrideDto.java

@@ -3,6 +3,13 @@ package com.bsd.pjcloud.wallet.api.dto;
 import com.bsd.pjcloud.wallet.api.entity.WalletStrideEntity;
 import lombok.Data;
 
+import java.util.List;
+
 @Data
 public class WalletStrideDto extends WalletStrideEntity {
+
+    private List<Long> userIds;
+
+    private List<Long> deptIds;
+
 }

pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/entity/WalletForeignEntity.java

@@ -3,9 +3,9 @@ package com.bsd.pjcloud.wallet.api.entity;
 import com.baomidou.mybatisplus.annotation.*;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
+import lombok.*;
 import com.bsd.pjcloud.common.core.util.TenantTable;
+
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 
@@ -15,6 +15,9 @@ import java.time.LocalDateTime;
  * @author dzc
  * @date 2025-01-02 16:26:48
  */
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
 @Data
 @TenantTable
 @TableName("wallet_foreign")
@@ -23,94 +26,106 @@ import java.time.LocalDateTime;
 public class WalletForeignEntity extends Model<WalletForeignEntity> {
 
 
-	/**
-	* 编号
-	*/
+    /**
+     * 编号
+     */
     @TableId(type = IdType.ASSIGN_ID)
-    @Schema(description="编号")
+    @Schema(description = "编号")
     private Long id;
 
-	/**
-	* 用户id
-	*/
-    @Schema(description="用户id")
+    /**
+     * 用户id
+     */
+    @Schema(description = "用户id")
     private Long userId;
 
-	/**
-	* 部门id
-	*/
-    @Schema(description="部门id")
+    /**
+     * 流程id
+     */
+    @Schema(description = "流程id")
+    private String processId;
+
+    /**
+     * 流程状态
+     */
+    @Schema(description = "流程状态")
+    private Integer processStatus;
+
+    /**
+     * 部门id
+     */
+    @Schema(description = "部门id")
     private Long deptId;
 
-	/**
-	* 申请使用开始时间
-	*/
-    @Schema(description="申请使用开始时间")
+    /**
+     * 申请使用开始时间
+     */
+    @Schema(description = "申请使用开始时间")
     private LocalDate applyStartTime;
 
-	/**
-	* 申请使用结束时间
-	*/
-    @Schema(description="申请使用结束时间")
+    /**
+     * 申请使用结束时间
+     */
+    @Schema(description = "申请使用结束时间")
     private LocalDate applyEndTime;
 
-	/**
-	* 申请数量
-	*/
-    @Schema(description="申请数量")
+    /**
+     * 申请数量
+     */
+    @Schema(description = "申请数量")
     private Integer count;
 
-	/**
-	* 使用数量
-	*/
-    @Schema(description="使用数量")
+    /**
+     * 使用数量
+     */
+    @Schema(description = "使用数量")
     private Integer useCount;
 
-	/**
-	* 申请备注
-	*/
-    @Schema(description="申请备注")
+    /**
+     * 申请备注
+     */
+    @Schema(description = "申请备注")
     private String remark;
 
-	/**
-	* 创建人
-	*/
-	@TableField(fill = FieldFill.INSERT)
-    @Schema(description="创建人")
+    /**
+     * 创建人
+     */
+    @TableField(fill = FieldFill.INSERT)
+    @Schema(description = "创建人")
     private String createBy;
 
-	/**
-	* 创建时间
-	*/
-	@TableField(fill = FieldFill.INSERT)
-    @Schema(description="创建时间")
+    /**
+     * 创建时间
+     */
+    @TableField(fill = FieldFill.INSERT)
+    @Schema(description = "创建时间")
     private LocalDateTime createTime;
 
-	/**
-	* 修改人
-	*/
-	@TableField(fill = FieldFill.INSERT_UPDATE)
-    @Schema(description="修改人")
+    /**
+     * 修改人
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    @Schema(description = "修改人")
     private String updateBy;
 
-	/**
-	* 修改时间
-	*/
-	@TableField(fill = FieldFill.INSERT_UPDATE)
-    @Schema(description="修改时间")
+    /**
+     * 修改时间
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    @Schema(description = "修改时间")
     private LocalDateTime updateTime;
 
-	/**
-	* 删除标记
-	*/
+    /**
+     * 删除标记
+     */
     @TableLogic
-	@TableField(fill = FieldFill.INSERT)
-    @Schema(description="删除标记")
+    @TableField(fill = FieldFill.INSERT)
+    @Schema(description = "删除标记")
     private String delFlag;
 
-	/**
-	* 租户ID
-	*/
-    @Schema(description="租户ID")
+    /**
+     * 租户ID
+     */
+    @Schema(description = "租户ID")
     private Long tenantId;
 }

pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/entity/WalletStrideEntity.java

@@ -3,9 +3,9 @@ package com.bsd.pjcloud.wallet.api.entity;
 import com.baomidou.mybatisplus.annotation.*;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
+import lombok.*;
 import com.bsd.pjcloud.common.core.util.TenantTable;
+
 import java.time.LocalDateTime;
 
 /**
@@ -14,6 +14,9 @@ import java.time.LocalDateTime;
  * @author pjcloud
  * @date 2025-01-02 16:27:26
  */
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
 @Data
 @TenantTable
 @TableName("wallet_stride")
@@ -22,82 +25,94 @@ import java.time.LocalDateTime;
 public class WalletStrideEntity extends Model<WalletStrideEntity> {
 
 
-	/**
-	* 编号
-	*/
+    /**
+     * 编号
+     */
     @TableId(type = IdType.ASSIGN_ID)
-    @Schema(description="编号")
+    @Schema(description = "编号")
     private Long id;
 
-	/**
-	* 部门id
-	*/
-    @Schema(description="部门id")
+    /**
+     * 流程id
+     */
+    @Schema(description = "流程id")
+    private String processId;
+
+    /**
+     * 流程状态
+     */
+    @Schema(description = "流程状态")
+    private Integer processStatus;
+
+    /**
+     * 部门id
+     */
+    @Schema(description = "部门id")
     private Long deptId;
 
-	/**
-	* 申请数量
-	*/
-    @Schema(description="申请数量")
+    /**
+     * 申请数量
+     */
+    @Schema(description = "申请数量")
     private Integer count;
 
-	/**
-	* 使用数量
-	*/
-    @Schema(description="使用数量")
+    /**
+     * 使用数量
+     */
+    @Schema(description = "使用数量")
     private Integer useCount;
 
-	/**
-	* 申请人id
-	*/
-    @Schema(description="申请人id")
+    /**
+     * 申请人id
+     */
+    @Schema(description = "申请人id")
     private Long userId;
 
-	/**
-	* 备注
-	*/
-    @Schema(description="备注")
+    /**
+     * 备注
+     */
+    @Schema(description = "备注")
     private String remark;
 
-	/**
-	* 创建人
-	*/
-	@TableField(fill = FieldFill.INSERT)
-    @Schema(description="创建人")
+    /**
+     * 创建人
+     */
+    @TableField(fill = FieldFill.INSERT)
+    @Schema(description = "创建人")
     private String createBy;
 
-	/**
-	* 创建时间
-	*/
-	@TableField(fill = FieldFill.INSERT)
-    @Schema(description="创建时间")
+    /**
+     * 创建时间
+     */
+    @TableField(fill = FieldFill.INSERT)
+    @Schema(description = "创建时间")
     private LocalDateTime createTime;
 
-	/**
-	* 修改人
-	*/
-	@TableField(fill = FieldFill.INSERT_UPDATE)
-    @Schema(description="修改人")
+    /**
+     * 修改人
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    @Schema(description = "修改人")
     private String updateBy;
 
-	/**
-	* 修改时间
-	*/
-	@TableField(fill = FieldFill.INSERT_UPDATE)
-    @Schema(description="修改时间")
+    /**
+     * 修改时间
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    @Schema(description = "修改时间")
     private LocalDateTime updateTime;
 
-	/**
-	* 删除标记
-	*/
+    /**
+     * 删除标记
+     */
     @TableLogic
-	@TableField(fill = FieldFill.INSERT)
-    @Schema(description="删除标记")
+    @TableField(fill = FieldFill.INSERT)
+    @Schema(description = "删除标记")
     private String delFlag;
 
-	/**
-	* 租户ID
-	*/
-    @Schema(description="租户ID")
+    /**
+     * 租户ID
+     */
+    @Schema(description = "租户ID")
     private Long tenantId;
 }

pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/vo/WalletForeignVo.java

@@ -1,9 +1,25 @@
 package com.bsd.pjcloud.wallet.api.vo;
 
+import com.bsd.pjcloud.admin.api.vo.base.BaseDeptInterface;
+import com.bsd.pjcloud.admin.api.vo.base.BaseUserInterface;
 import com.bsd.pjcloud.wallet.api.entity.WalletForeignEntity;
 import lombok.Data;
 
 @Data
-public class WalletForeignVo extends WalletForeignEntity {
+public class WalletForeignVo extends WalletForeignEntity implements BaseUserInterface, BaseDeptInterface {
+
+    /**
+     * 用户相关
+     */
+    private String username;
+
+    private String userMobile;
+
+    private String userAvatar;
+
+    /**
+     * 部门相关
+     */
+    private String deptName;
 
 }

pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/vo/WalletStrideVo.java

@@ -1,9 +1,24 @@
 package com.bsd.pjcloud.wallet.api.vo;
 
+import com.bsd.pjcloud.admin.api.vo.base.BaseDeptInterface;
+import com.bsd.pjcloud.admin.api.vo.base.BaseUserInterface;
 import com.bsd.pjcloud.wallet.api.entity.WalletStrideEntity;
 import lombok.Data;
 
 @Data
-public class WalletStrideVo extends WalletStrideEntity {
+public class WalletStrideVo extends WalletStrideEntity implements BaseUserInterface, BaseDeptInterface {
 
+    /**
+     * 用户相关
+     */
+    private String username;
+
+    private String userMobile;
+
+    private String userAvatar;
+
+    /**
+     * 部门相关
+     */
+    private String deptName;
 }