✨ 支持应收账单明细按单号和产品搜索

This commit is contained in:
caojia
2026-11-18 16:51:40 +08:00
parent 69491b07d9
commit b13284ebaa
8 changed files with 242 additions and 12 deletions
@@ -0,0 +1,16 @@
package com.bms.receivable.domain.vo;
import jakarta.validation.constraints.Size;
import lombok.Data;
/** 当前账单内的明细筛选条件;账单范围和数据权限由后端独立传入。 */
@Data
public class ArBillDetailQuery {
/** 完整订单号、运单号或转单号,按等值匹配。 */
@Size(max = 64, message = "单号不能超过64个字符")
private String orderKeyword;
/** 产品代码或名称,按包含关系匹配。 */
@Size(max = 100, message = "产品搜索条件不能超过100个字符")
private String productKeyword;
}
@@ -7,9 +7,12 @@ import java.util.Map;
import org.apache.ibatis.annotations.Param;
import com.bms.receivable.domain.ArBillDetail;
import com.bms.receivable.domain.vo.ArBillDetailQuery;
public interface ArBillDetailMapper {
List<ArBillDetail> selectByBillIdScoped(@Param("arBillId") Long arBillId, @Param("scope") ArBillRowScope scope);
List<ArBillDetail> selectByBillIdScoped(@Param("arBillId") Long arBillId,
@Param("query") ArBillDetailQuery query,
@Param("scope") ArBillRowScope scope);
List<ArBillDetail> selectByBillId(Long arBillId);
@@ -15,6 +15,7 @@ import com.bms.receivable.domain.vo.ArBillGenerateRequest;
import com.bms.receivable.domain.vo.ArBillGenerateQuery;
import com.bms.receivable.domain.vo.ArBillActionRequest;
import com.bms.receivable.domain.vo.ArBillQuery;
import com.bms.receivable.domain.vo.ArBillDetailQuery;
import com.bms.receivable.domain.vo.ArBillSummary;
import com.bms.receivable.domain.vo.ArBillExportTemplateOption;
import com.bms.receivable.security.ArBillRowScope;
@@ -33,7 +34,7 @@ public interface IArBillService
ArBill selectArBillById(Long arBillId);
List<ArBillDetail> selectArBillDetails(Long arBillId);
List<ArBillDetail> selectArBillDetails(Long arBillId, ArBillDetailQuery query);
List<ArBillDetailFee> selectArBillDetailFees(Long arBillId, Long detailId);
@@ -76,6 +76,7 @@ import com.bms.receivable.domain.vo.ArBillActionRequest;
import com.bms.receivable.domain.vo.ArBillGenerateQuery;
import com.bms.receivable.domain.vo.ArBillGenerateRequest;
import com.bms.receivable.domain.vo.ArBillQuery;
import com.bms.receivable.domain.vo.ArBillDetailQuery;
import com.bms.receivable.domain.vo.ArBillSummary;
import com.bms.receivable.domain.vo.ArBillExportTemplateOption;
import com.bms.receivable.export.ArBillWorkbookWriters;
@@ -210,9 +211,12 @@ public class ArBillServiceImpl implements IArBillService {
* 查询账单明细,分页由 Controller 层的 startPage 统一接管。
*/
@Override
public List<ArBillDetail> selectArBillDetails(Long arBillId) {
public List<ArBillDetail> selectArBillDetails(Long arBillId, ArBillDetailQuery query) {
long startedAt = System.nanoTime();
List<ArBillDetail> details = detailMapper.selectByBillIdScoped(arBillId, billScope.resolve());
ArBillDetailQuery normalized = query == null ? new ArBillDetailQuery() : query;
normalized.setOrderKeyword(StringUtils.trim(normalized.getOrderKeyword()));
normalized.setProductKeyword(StringUtils.trim(normalized.getProductKeyword()));
List<ArBillDetail> details = detailMapper.selectByBillIdScoped(arBillId, normalized, billScope.resolve());
log.debug("应收账单明细查询完成,arBillId={}, resultCount={}, costMs={}",
arBillId, details.size(), elapsedMillis(startedAt));
return details;
@@ -51,7 +51,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
product_code, product_name, goods_description, country_code, country_name, dest_postcode,
actual_weight, receive_weight, volume_weight, charge_weight, freight_rate, registration_fee, pkg_length, pkg_width, pkg_height,
currency, total_amount, product_amount, redline_amount, billing_fail_status, remark, create_by, create_time
from ar_bill_detail where ar_bill_id = #{arBillId} AND EXISTS (SELECT 1 FROM ar_bill b WHERE b.ar_bill_id = ar_bill_detail.ar_bill_id <include refid="com.bms.receivable.mapper.ArBillScopeMapper.billScope"/>)
from ar_bill_detail
where ar_bill_id = #{arBillId}
<if test="query != null and query.orderKeyword != null and query.orderKeyword != ''">
and (order_no = #{query.orderKeyword}
or tracking_no = #{query.orderKeyword}
or transfer_no = #{query.orderKeyword})
</if>
<if test="query != null and query.productKeyword != null and query.productKeyword != ''">
and (product_code like concat('%', #{query.productKeyword}, '%')
or product_name like concat('%', #{query.productKeyword}, '%'))
</if>
AND EXISTS (SELECT 1 FROM ar_bill b WHERE b.ar_bill_id = ar_bill_detail.ar_bill_id <include refid="com.bms.receivable.mapper.ArBillScopeMapper.billScope"/>)
order by detail_no
</select>