diff --git a/bms-back/bms-system/src/main/java/com/bms/ar/domain/vo/ArBillQuery.java b/bms-back/bms-system/src/main/java/com/bms/ar/domain/vo/ArBillQuery.java index 1952c824..70d4ff43 100644 --- a/bms-back/bms-system/src/main/java/com/bms/ar/domain/vo/ArBillQuery.java +++ b/bms-back/bms-system/src/main/java/com/bms/ar/domain/vo/ArBillQuery.java @@ -1,6 +1,7 @@ package com.bms.ar.domain.vo; import java.util.Date; +import java.util.List; import org.springframework.format.annotation.DateTimeFormat; import com.bms.ar.domain.ArBill; import lombok.Data; @@ -13,6 +14,9 @@ public class ArBillQuery extends ArBill { private static final long serialVersionUID = 1L; + /** 多选账单状态;为空时与旧版 status 参数保持兼容并表示不按状态筛选。 */ + private List statuses; + /** 账单日期查询起始日。 */ @DateTimeFormat(pattern = "yyyy-MM-dd") private Date billDateStart; diff --git a/bms-back/bms-system/src/main/resources/mapper/ar/ArBillMapper.xml b/bms-back/bms-system/src/main/resources/mapper/ar/ArBillMapper.xml index ed8d8445..a3e86e24 100644 --- a/bms-back/bms-system/src/main/resources/mapper/ar/ArBillMapper.xml +++ b/bms-back/bms-system/src/main/resources/mapper/ar/ArBillMapper.xml @@ -85,7 +85,15 @@ '%') and customer_id = #{query.customerId} - and status = #{query.status} + + + and status in + + #{statusValue} + + + and status = #{query.status} + and currency = #{query.currency} and bill_date >= #{query.billDateStart} and bill_date <= #{query.billDateEnd} @@ -106,6 +114,7 @@ coalesce(sum(unwritten_amount), 0) as unwritten_amount from ar_bill b + and status in ('CONFIRMED', 'PARTIAL_WRITTEN_OFF', 'WRITTEN_OFF')