feat(bpm): 优化借款报销功能并添加薪资主体明细功能- 在 BpmOALoanServiceImpl 中添加了对老数据的过滤逻辑

- 在 BpmOASalaryCreateReqVO、BpmOASalaryDO 和 BpmOASalaryRespVO 中添加了薪资主体明细字段
- 新增 SalarySubjectItemsVO 类用于表示薪资主体明细

yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/salary/BpmOASalaryCreateReqVO.java

@@ -47,6 +47,9 @@ public class BpmOASalaryCreateReqVO {
     @Schema(description = "支付对象")
     private String paymentRecipient;
 
+    @Schema(description = "薪资主体明细")
+    private List<SalarySubjectItemsVO> salarySubjectItems;
+
     @Schema(description = "流程实例编号")
     private String processInstanceId;
 

yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/salary/BpmOASalaryRespVO.java

@@ -8,7 +8,6 @@ import lombok.EqualsAndHashCode;
 import lombok.ToString;
 import org.springframework.format.annotation.DateTimeFormat;
 
-import javax.validation.constraints.NotNull;
 import java.math.BigDecimal;
 import java.util.List;
 
@@ -46,6 +45,9 @@ public class BpmOASalaryRespVO extends BpmOABaseRespVO {
     @Schema(description = "支付对象")
     private String paymentRecipient;
 
+    @Schema(description = "薪资主体明细")
+    private List<SalarySubjectItemsVO> salarySubjectItems;
+
     @Schema(description = "流程实例编号")
     private String processInstanceId;
 

yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/salary/SalarySubjectItemsVO.java

@@ -0,0 +1,17 @@
+package cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.salary;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Schema(description = "管理后台 - 薪资付款申请创建 Request VO")
+@Data
+public class SalarySubjectItemsVO {
+
+    @Schema(description = "薪资主体编号")
+    private Integer salarySubjectId;
+
+    @Schema(description = "金额")
+    private BigDecimal amount;
+}

yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/oa/BpmOASalaryDO.java

@@ -2,6 +2,7 @@ package cn.iocoder.yudao.module.bpm.dal.dataobject.oa;
 
 import cn.iocoder.yudao.framework.common.pojo.UploadUserFile;
 import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.salary.SalarySubjectItemsVO;
 import cn.iocoder.yudao.module.bpm.enums.task.BpmProcessInstanceResultEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -69,6 +70,13 @@ public class BpmOASalaryDO extends BaseDO {
      */
     private String paymentRecipient;
 
+
+    /**
+     * 薪资主体明细
+     */
+    @TableField(typeHandler = JacksonTypeHandler.class)
+    private List<SalarySubjectItemsVO> salarySubjectItems;
+
     /**
      * 薪资付款申请的结果
      *

yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOALoanServiceImpl.java

@@ -203,6 +203,11 @@ public class BpmOALoanServiceImpl extends BpmOABaseService implements BpmOALoanS
 
     @Override
     public PageResult<BpmOAReturnVO> getReturnList(BpmOALoanPageReqVO pageReqVO) {
+
+        // 过滤之前老数据
+        if (pageReqVO.getLoanType() == null) {
+            return PageResult.empty();
+        }
         IPage<BpmOAReturnVO> page = loanMapper.selectReturnList(pageReqVO, MyBatisUtils.buildPage(pageReqVO));
         return new PageResult<>(page.getRecords(), page.getTotal());
     }