From ea62697b9861b92af384053bc370db27cf9407f9 Mon Sep 17 00:00:00 2001 From: caojia <1301869380@qq.com> Date: Mon, 16 Nov 2026 20:24:27 +0800 Subject: [PATCH] =?UTF-8?q?:sparkles:=20=E6=AF=9B=E5=88=A9=E5=88=86?= =?UTF-8?q?=E6=9E=90=E5=90=88=E5=B9=B6=E8=AE=A2=E5=8D=95=E6=98=8E=E7=BB=86?= =?UTF-8?q?=E5=8F=8A=E4=BA=A7=E5=93=81=E7=AD=9B=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../price/domain/vo/PrcProfitReportQuery.java | 2 + .../mapper/price/PrcProfitReportMapper.xml | 6 + bms-front/src/views/report/profit/index.vue | 263 +++++------------- 3 files changed, 78 insertions(+), 193 deletions(-) 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 6e62a0bc..651bd1aa 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 @@ -33,7 +33,9 @@ public class PrcProfitReportQuery extends BaseEntity private List customerNames; private String belongSalerCode; private String productCode; + private String productName; private String countryCode; + private String countryName; private String currency; /** 订单维度应收状态筛选:UNBILLED、PARTIAL、BILLED。 */ private String arBillStatus; 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 ac667444..a1093f80 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,6 +197,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + and p.product_name like concat('%', #{productName}, '%') + + + and p.country_name like concat('%', #{countryName}, '%') + diff --git a/bms-front/src/views/report/profit/index.vue b/bms-front/src/views/report/profit/index.vue index 524542bc..cc0df466 100644 --- a/bms-front/src/views/report/profit/index.vue +++ b/bms-front/src/views/report/profit/index.vue @@ -46,6 +46,28 @@ + + + + + + + + + + + + + + + + + + + + + + - + @@ -119,10 +141,7 @@
- - - - + 订单明细
- - + + + + + + + + + + + + + + + + + + + + + + +
@@ -212,35 +207,6 @@ /> - - - - - - - - - - - - - - - - - - - - - - - @@ -309,15 +275,14 @@