外协结算审批

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;
+
     /**
      * 提交时间开始
      */

blade-service/blade-desk/src/main/java/org/springblade/desk/oem/mapper/OemSettlementApprovalMapper.xml

@@ -53,6 +53,13 @@
             <if test="query.approvalStatus != null">
                 AND a.APPROVAL_STATUS = #{query.approvalStatus}
             </if>
+            <if test="query.approvalStatusList != null and query.approvalStatusList != ''">
+                AND a.APPROVAL_STATUS IN
+                <foreach collection="query.approvalStatusList.split(',')" item="approval"
+                         open="(" separator="," close=")" index="index">
+                    #{approval}
+                </foreach>
+            </if>
             <if test="query.submitTimeStart != null">
                 AND a.SUBMIT_TIME &gt;= #{query.submitTimeStart}
             </if>