Merge branch 'test'

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<String> statuses;
+
     /** 账单日期查询起始日。 */
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date billDateStart;

bms-back/bms-system/src/main/resources/mapper/ar/ArBillMapper.xml

@@ -85,7 +85,15 @@
                 '%')
             </if>
             <if test="query.customerId != null">and customer_id = #{query.customerId}</if>
-            <if test="query.status != null and query.status != ''">and status = #{query.status}</if>
+            <choose>
+                <when test="query.statuses != null and query.statuses.size() > 0">
+                    and status in
+                    <foreach collection="query.statuses" item="statusValue" open="(" separator="," close=")">
+                        #{statusValue}
+                    </foreach>
+                </when>
+                <when test="query.status != null and query.status != ''">and status = #{query.status}</when>
+            </choose>
             <if test="query.currency != null and query.currency != ''">and currency = #{query.currency}</if>
             <if test="query.billDateStart != null">and bill_date &gt;= #{query.billDateStart}</if>
             <if test="query.billDateEnd != null">and bill_date &lt;= #{query.billDateEnd}</if>
@@ -106,6 +114,7 @@
                coalesce(sum(unwritten_amount), 0) as unwritten_amount
         from ar_bill b
         <include refid="arBillListFilter"/>
+        and status in ('CONFIRMED', 'PARTIAL_WRITTEN_OFF', 'WRITTEN_OFF')
     </select>
 
     <select id="selectArBillById" parameterType="long" resultMap="ArBillResult">