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}