From 6517983616c054106376c65598f3cecef54a1af1 Mon Sep 17 00:00:00 2001
From: maxiangong <298222784@qq.com>
Date: Fri, 29 May 2026 16:45:03 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=96=E5=8D=8F=E7=BB=93=E7=AE=97=E5=AE=A1?=
=?UTF-8?q?=E6=89=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../desk/oem/pojo/request/SettlementApprovalQuery.java | 3 +++
.../desk/oem/mapper/OemSettlementApprovalMapper.xml | 7 +++++++
2 files changed, 10 insertions(+)
diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/oem/pojo/request/SettlementApprovalQuery.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/oem/pojo/request/SettlementApprovalQuery.java
index 143c844c6..922bdffbd 100644
--- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/oem/pojo/request/SettlementApprovalQuery.java
+++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/oem/pojo/request/SettlementApprovalQuery.java
@@ -28,6 +28,9 @@ public class SettlementApprovalQuery {
@Schema(description = "审批状态:1-待审批,2-审批中,3-审批通过,4-审批不通过")
private Integer approvalStatus;
+ @Schema(description = "审批状态多选 , 分隔")
+ private String approvalStatusList;
+
/**
* 提交时间开始
*/
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/oem/mapper/OemSettlementApprovalMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/oem/mapper/OemSettlementApprovalMapper.xml
index 9abf9e7be..488afe155 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/oem/mapper/OemSettlementApprovalMapper.xml
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/oem/mapper/OemSettlementApprovalMapper.xml
@@ -53,6 +53,13 @@
AND a.APPROVAL_STATUS = #{query.approvalStatus}
+
+ AND a.APPROVAL_STATUS IN
+
+ #{approval}
+
+
AND a.SUBMIT_TIME >= #{query.submitTimeStart}