From 13cac49c4f9acf9ceeaa97e2bbd75665496a9e22 Mon Sep 17 00:00:00 2001 From: zzs Date: Thu, 16 Jan 2025 10:09:50 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E9=94=80=E5=94=AE=E6=8F=90=E6=88=90-?= =?UTF-8?q?=E6=95=B4=E6=9C=BA=E4=B8=AD=E6=9C=89=E9=87=8D=E5=A4=8D=E6=95=B0?= =?UTF-8?q?=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../yem/rf/salescommission/SalesCommissionReportPlugin.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/yem/rf/salescommission/SalesCommissionReportPlugin.java b/src/main/java/com/yem/rf/salescommission/SalesCommissionReportPlugin.java index 94540af1..d4c4bc11 100644 --- a/src/main/java/com/yem/rf/salescommission/SalesCommissionReportPlugin.java +++ b/src/main/java/com/yem/rf/salescommission/SalesCommissionReportPlugin.java @@ -21,7 +21,7 @@ import static com.yem.rf.salescommission.CompleteShipDetailReportPlugin.querySal import static com.yem.rf.utils.RFUtils.*; /** - * @Description: TODO + * @Description: 销售提成-整机 * @Date: 2024/7/8 10:24 * @Created: by ZZSLL */ @@ -44,6 +44,7 @@ public class SalesCommissionReportPlugin extends AbstractReportListDataPlugin { .on("delivernoticeid", "storagetransid") .select(RptUtil.getDataSetFiledAlias(delivernotice), RptUtil.getDataSetFiledAlias(storagetrans)) .finish(); + resDataSet = resDataSet.distinct(); resDataSet = resDataSet.leftJoin(salesorder) .on("coreentryid", "salesorderenid") .select(RptUtil.getDataSetFiledAlias(resDataSet), RptUtil.getDataSetFiledAlias(salesorder)) @@ -68,6 +69,7 @@ public class SalesCommissionReportPlugin extends AbstractReportListDataPlugin { FilterInfo filter = param.getFilter(); String salesorderno = filter.getString("yem_salesorderno");//合同号 + salesorderno = "EHWL-YLL240729-A"; long producttype = filter.getLong("yem_bd_producttype");//产品分类 long customer = filter.getLong("yem_bd_customer");//客户 long products = filter.getLong("yem_bd_products");//机型