From b3286c69d5b5456705a92802fa2a9b598bceaf35 Mon Sep 17 00:00:00 2001 From: furongxin <419481438@qq.com> Date: Sat, 12 Apr 2025 19:32:09 +0800 Subject: [PATCH] =?UTF-8?q?feat(bpm):=20=E4=BC=98=E5=8C=96=E5=80=9F?= =?UTF-8?q?=E6=AC=BE=E6=8A=A5=E9=94=80=E5=8A=9F=E8=83=BD=E5=B9=B6=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E8=96=AA=E8=B5=84=E4=B8=BB=E4=BD=93=E6=98=8E=E7=BB=86?= =?UTF-8?q?=E5=8A=9F=E8=83=BD-=20=E5=9C=A8=20BpmOALoanServiceImpl=20?= =?UTF-8?q?=E4=B8=AD=E6=B7=BB=E5=8A=A0=E4=BA=86=E5=AF=B9=E8=80=81=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E7=9A=84=E8=BF=87=E6=BB=A4=E9=80=BB=E8=BE=91=20-=20?= =?UTF-8?q?=E5=9C=A8=20BpmOASalaryCreateReqVO=E3=80=81BpmOASalaryDO=20?= =?UTF-8?q?=E5=92=8C=20BpmOASalaryRespVO=20=E4=B8=AD=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E4=BA=86=E8=96=AA=E8=B5=84=E4=B8=BB=E4=BD=93=E6=98=8E=E7=BB=86?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=20-=20=E6=96=B0=E5=A2=9E=20SalarySubjectItem?= =?UTF-8?q?sVO=20=E7=B1=BB=E7=94=A8=E4=BA=8E=E8=A1=A8=E7=A4=BA=E8=96=AA?= =?UTF-8?q?=E8=B5=84=E4=B8=BB=E4=BD=93=E6=98=8E=E7=BB=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../oa/vo/salary/BpmOASalaryCreateReqVO.java | 3 +++ .../admin/oa/vo/salary/BpmOASalaryRespVO.java | 4 +++- .../oa/vo/salary/SalarySubjectItemsVO.java | 17 +++++++++++++++++ .../bpm/dal/dataobject/oa/BpmOASalaryDO.java | 8 ++++++++ .../bpm/service/oa/BpmOALoanServiceImpl.java | 5 +++++ 5 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/salary/SalarySubjectItemsVO.java diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/salary/BpmOASalaryCreateReqVO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/salary/BpmOASalaryCreateReqVO.java index 216df6d6..1f187486 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/salary/BpmOASalaryCreateReqVO.java +++ b/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 salarySubjectItems; + @Schema(description = "流程实例编号") private String processInstanceId; diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/salary/BpmOASalaryRespVO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/salary/BpmOASalaryRespVO.java index e57403e0..a0363670 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/salary/BpmOASalaryRespVO.java +++ b/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 salarySubjectItems; + @Schema(description = "流程实例编号") private String processInstanceId; diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/salary/SalarySubjectItemsVO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/salary/SalarySubjectItemsVO.java new file mode 100644 index 00000000..9493aa30 --- /dev/null +++ b/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; +} diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/oa/BpmOASalaryDO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/oa/BpmOASalaryDO.java index 8605ba7a..66de08e5 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/oa/BpmOASalaryDO.java +++ b/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 salarySubjectItems; + /** * 薪资付款申请的结果 * diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOALoanServiceImpl.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOALoanServiceImpl.java index ad4f4b5e..1d6cc5d9 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOALoanServiceImpl.java +++ b/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 getReturnList(BpmOALoanPageReqVO pageReqVO) { + + // 过滤之前老数据 + if (pageReqVO.getLoanType() == null) { + return PageResult.empty(); + } IPage page = loanMapper.selectReturnList(pageReqVO, MyBatisUtils.buildPage(pageReqVO)); return new PageResult<>(page.getRecords(), page.getTotal()); }