From f02850f58bdbc5c6cd167b3bfb076f72d9f69235 Mon Sep 17 00:00:00 2001
From: yujh_java <yujh_java@163.com>
Date: Wed, 17 Sep 2025 20:07:37 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B4=E4=BD=93=E4=BF=AE=E6=94=B9=E4=B8=80?=
 =?UTF-8?q?=E4=BD=93=E5=8C=96=E4=BA=8B=E4=B8=9A=E9=83=A8BI=E6=B1=87?=
 =?UTF-8?q?=E6=80=BBsql=E9=80=BB=E8=BE=91-2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../datalinkup/service/impl/SaleDataSummaryServiceImpl.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/com.awspaas.user.apps.bnbm.datalinkup/com.awspaas.user.apps.bnbm.datalinkup/src/main/java/com/awspaas/user/apps/bnbm/datalinkup/service/impl/SaleDataSummaryServiceImpl.java b/com.awspaas.user.apps.bnbm.datalinkup/com.awspaas.user.apps.bnbm.datalinkup/src/main/java/com/awspaas/user/apps/bnbm/datalinkup/service/impl/SaleDataSummaryServiceImpl.java
index 242215b..0de006b 100644
--- a/com.awspaas.user.apps.bnbm.datalinkup/com.awspaas.user.apps.bnbm.datalinkup/src/main/java/com/awspaas/user/apps/bnbm/datalinkup/service/impl/SaleDataSummaryServiceImpl.java
+++ b/com.awspaas.user.apps.bnbm.datalinkup/com.awspaas.user.apps.bnbm.datalinkup/src/main/java/com/awspaas/user/apps/bnbm/datalinkup/service/impl/SaleDataSummaryServiceImpl.java
@@ -187,10 +187,8 @@ public class SaleDataSummaryServiceImpl implements DataSummaryService {
                     "        WHEN SQ LIKE '%西藏%' THEN '西藏' " +
                     "    END AS PROVINCE, " +
                     "    CS, " +
-                    "    -- 条件判断：如果是轻钢龙骨则用ZSSL，否则用XSSL " +
                     "    SUM(CASE WHEN LB_1 = '轻钢龙骨' THEN ZSSL ELSE XSSL END) AS SALES_VOLUME, " +
                     "    SUM(NMNY) AS REVENUE_AMOUNT, " +
-                    "    -- 单价计算也需要同步使用对应的数量字段 " +
                     "    SUM(NMNY)  / SUM(CASE WHEN LB_1 = '轻钢龙骨' THEN ZSSL ELSE XSSL END) AS UNIT_PRICE " +
                     "FROM " +
                     "    BO_EU_BNBM_DATALINKUP_XS_XSL_HZ " +
@@ -222,6 +220,7 @@ public class SaleDataSummaryServiceImpl implements DataSummaryService {
                     priceBO.set("BKGS", bkgs1);
                     priceBO.set("DATE", dzrq);
                     priceBO.set("CITY", map.getString("CS"));
+                    priceBO.set("PRODUCT_TYPE", lb_1);
                     priceBO.set("SALES_VOLUME", sales_volume);
                     priceBO.set("REVENUE_AMOUNT", revenue_amount);
                     priceBO.set("UNIT_PRICE", unit_price);
@@ -919,6 +918,7 @@ public class SaleDataSummaryServiceImpl implements DataSummaryService {
                     "    (SQ LIKE '%海南%' OR SQ LIKE '%新疆%' OR SQ LIKE '%西藏%') " +
                     "    AND DZRQ >= '" + year + "-" + monthStr + "-01' " +
                     "    AND BKGS = ? " +
+                    "    AND LB_1 IN('石膏板','轻钢龙骨','涂料') " +
                     " GROUP BY " +
                     "    LB_1, " +
                     "    PROVINCE, " +