diff --git a/bms-back/bms-admin/src/test/java/com/bms/report/ProfitReportAreaFilterTest.java b/bms-back/bms-admin/src/test/java/com/bms/report/ProfitReportAreaFilterTest.java index fbbfeadd..f7a28c77 100644 --- a/bms-back/bms-admin/src/test/java/com/bms/report/ProfitReportAreaFilterTest.java +++ b/bms-back/bms-admin/src/test/java/com/bms/report/ProfitReportAreaFilterTest.java @@ -104,6 +104,12 @@ class ProfitReportAreaFilterTest String emptySql = statement.getBoundSql(query).getSql(); assertFalse(emptySql.contains("join ctr_customer c")); assertTrue(emptySql.contains("and 1 = 0")); + + query.setAreaCustomerIds(null); + query.setProductKeyword("EXP"); + String productSql = statement.getBoundSql(query).getSql(); + assertTrue(productSql.contains("p.product_code like concat('%', ?, '%')")); + assertTrue(productSql.contains("p.product_name like concat('%', ?, '%')")); } } diff --git a/bms-back/bms-system/src/main/java/com/bms/price/domain/vo/PrcProfitReportQuery.java b/bms-back/bms-system/src/main/java/com/bms/price/domain/vo/PrcProfitReportQuery.java index 03361652..93fe7fde 100644 --- a/bms-back/bms-system/src/main/java/com/bms/price/domain/vo/PrcProfitReportQuery.java +++ b/bms-back/bms-system/src/main/java/com/bms/price/domain/vo/PrcProfitReportQuery.java @@ -37,6 +37,8 @@ public class PrcProfitReportQuery extends BaseEntity /** 客户名称拆分后的多值查询条件。 */ private List customerNames; private String belongSalerCode; + /** 产品代码或产品名称的统一模糊查询关键字。 */ + private String productKeyword; private String productCode; private String productName; private String countryCode; diff --git a/bms-back/bms-system/src/main/java/com/bms/price/service/impl/PrcProfitReportServiceImpl.java b/bms-back/bms-system/src/main/java/com/bms/price/service/impl/PrcProfitReportServiceImpl.java index 7f870995..2d0880bc 100644 --- a/bms-back/bms-system/src/main/java/com/bms/price/service/impl/PrcProfitReportServiceImpl.java +++ b/bms-back/bms-system/src/main/java/com/bms/price/service/impl/PrcProfitReportServiceImpl.java @@ -171,6 +171,10 @@ public class PrcProfitReportServiceImpl implements IPrcProfitReportService } query.setCustomerArea(query.getCustomerArea().trim()); query.setProfitRule(rule.name()); + if (query.getBelongSalerCode() != null) + { + query.setBelongSalerCode(query.getBelongSalerCode().trim()); + } query.setOrderNos(splitFilterValues(query.getOrderNo(), "订单号")); query.setCustomerCodes(splitFilterValues(query.getCustomerCode(), "客户代码")); query.setCustomerNames(splitFilterValues(query.getCustomerName(), "客户名称")); diff --git a/bms-back/bms-system/src/main/resources/mapper/price/PrcProfitReportMapper.xml b/bms-back/bms-system/src/main/resources/mapper/price/PrcProfitReportMapper.xml index 42df2d13..5c39012d 100644 --- a/bms-back/bms-system/src/main/resources/mapper/price/PrcProfitReportMapper.xml +++ b/bms-back/bms-system/src/main/resources/mapper/price/PrcProfitReportMapper.xml @@ -197,12 +197,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and p.country_code <=> #{countryCode} and i.currency <=> #{currency} - and i.belong_saler_code = #{belongSalerCode} + and (i.belong_saler_code = #{belongSalerCode} + or p.belong_saler_code = #{belongSalerCode} + or i.belong_saler like concat('%', #{belongSalerCode}, '%') + or p.belong_saler like concat('%', #{belongSalerCode}, '%')) - and i.belong_saler_code = #{belongSalerCode} + and (i.belong_saler_code = #{belongSalerCode} + or p.belong_saler_code = #{belongSalerCode} + or i.belong_saler like concat('%', #{belongSalerCode}, '%') + or p.belong_saler like concat('%', #{belongSalerCode}, '%')) and p.product_code = #{productCode} @@ -215,6 +221,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + and (p.product_code like concat('%', #{productKeyword}, '%') + or p.product_name like concat('%', #{productKeyword}, '%')) + and p.product_name like concat('%', #{productName}, '%') diff --git a/bms-front/src/views/report/profit/index.vue b/bms-front/src/views/report/profit/index.vue index 19721063..c667dcd5 100644 --- a/bms-front/src/views/report/profit/index.vue +++ b/bms-front/src/views/report/profit/index.vue @@ -16,7 +16,7 @@ - + @@ -52,18 +52,13 @@ - - + + - - - - - - - + + @@ -282,8 +277,7 @@ const query = reactive({ orderNo: '', customerCode: '', belongSalerCode: '', - productCode: '', - productName: '', + productKeyword: '', countryName: '', countryCode: '', currency: '' @@ -599,8 +593,7 @@ watch(() => [ query.orderNo, query.customerCode, query.belongSalerCode, - query.productCode, - query.productName, + query.productKeyword, query.countryName, query.countryCode, query.currency,