diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisCommissionProfitServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisCommissionProfitServiceImpl.java index 9604e7183..59902fe7a 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisCommissionProfitServiceImpl.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisCommissionProfitServiceImpl.java @@ -1355,6 +1355,10 @@ public class EmisCommissionProfitServiceImpl extends EmisBaseService implements ratioQuery.setSalesSupport(salesSupport); ratioQuery.setSalesExecutive(salesExecutive); ratioQuery.setStatus("1"); + // 添加运单寄件日期条件,查询运单寄件日期在计提表有效期内的比例配置 + if (waybill.getSendDate() != null) { + ratioQuery.getParams().put("sendDate", waybill.getSendDate()); + } List ratioList = emisSalesCommissionRatioMapper .selectEmisSalesCommissionRatioList(ratioQuery); if (!CollectionUtils.isEmpty(ratioList)) { diff --git a/emis-biz/src/main/resources/mapper/EmisSalesCommissionRatioMapper.xml b/emis-biz/src/main/resources/mapper/EmisSalesCommissionRatioMapper.xml index 450785fa7..748dce7b9 100644 --- a/emis-biz/src/main/resources/mapper/EmisSalesCommissionRatioMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisSalesCommissionRatioMapper.xml @@ -38,6 +38,10 @@ and end_date >= NOW() + + + and start_date <= #{params.sendDate} and end_date >= #{params.sendDate} + ORDER BY id DESC