From 79390abd306cbb2aba98ae0089e9ca6194eb2f08 Mon Sep 17 00:00:00 2001 From: aikai Date: Fri, 11 Jul 2025 22:51:52 +0800 Subject: [PATCH] =?UTF-8?q?feat(bpm):=20=E5=BC=80=E6=94=AF=E6=97=A5?= =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E5=A2=9E=E5=8A=A0=E6=94=AF=E4=BB=98=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E7=AD=9B=E9=80=89=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在 BpmOAExpensesMapper.xml 中添加支付状态的查询条件 - 在 BpmOAExpensesPageReqVO 中添加 status 字段用于接收支付状态参数 --- .../admin/oa/vo/expenses/BpmOAExpensesPageReqVO.java | 5 +++-- .../src/main/resources/mapper/oa/BpmOAExpensesMapper.xml | 3 +++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/expenses/BpmOAExpensesPageReqVO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/expenses/BpmOAExpensesPageReqVO.java index 2cd32c4a..1e6c9302 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/expenses/BpmOAExpensesPageReqVO.java +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/expenses/BpmOAExpensesPageReqVO.java @@ -7,8 +7,6 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; -import java.time.LocalDateTime; - @Schema(description = "管理后台 - 开支日报分页 Request VO") @Data @NoArgsConstructor @@ -25,6 +23,9 @@ public class BpmOAExpensesPageReqVO extends PageParam { @Schema(description = "费用类型 | 字典值参照bpm_oa_expenses_type") private Integer type; + @Schema(description = "支付状态 | 0未支付 1已支付") + private Integer status; + @Schema(description = "费用板块 | 1叉车 2打包 3搬运 4运输") private Integer costSection; diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/resources/mapper/oa/BpmOAExpensesMapper.xml b/yudao-module-bpm/yudao-module-bpm-biz/src/main/resources/mapper/oa/BpmOAExpensesMapper.xml index a057015e..2c77d176 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/resources/mapper/oa/BpmOAExpensesMapper.xml +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/resources/mapper/oa/BpmOAExpensesMapper.xml @@ -40,6 +40,9 @@ AND b.user_id = #{pageReqVO.userId} + + AND b.status = #{pageReqVO.status} + AND a.dept_id = #{pageReqVO.factoryId}