From b34a91ab1aabbb9af288b41b7ed7b1c914a10728 Mon Sep 17 00:00:00 2001 From: yujh_java Date: Thu, 18 Sep 2025 17:22:31 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=80=E4=BD=93=E5=8C=96=E8=90=A5=E4=B8=9A?= =?UTF-8?q?=E6=94=B6=E5=85=A5=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/SaleDataSummaryServiceImpl.java | 74 +++++++++++++++++-- 1 file changed, 68 insertions(+), 6 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 b2d1136..b2802f8 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 @@ -881,9 +881,9 @@ public class SaleDataSummaryServiceImpl implements DataSummaryService { + " WHERE YEARMONTH >= '" + yearMonth + "' AND BKGS = '"+bkgs+"'"); LOGGER.info("准备同步{}年{}月-营业收入累计数据，删除了{}条数据",year, month,delete); //计算轻钢龙骨和石膏板 - String querySql = " SELECT " + + /*String querySql = " SELECT " + " BKGS, " + - " LB_1, " + + " CASE WHEN LB_1 LIKE '%涂料%' THEN '涂料' ELSE LB_1 END AS LB_1, " + " CASE " + " WHEN SQ LIKE '%海南%' THEN '海南' " + " WHEN SQ LIKE '%新疆%' THEN '新疆' " + @@ -896,7 +896,7 @@ public class SaleDataSummaryServiceImpl implements DataSummaryService { " (SQ LIKE '%海南%' OR SQ LIKE '%新疆%' OR SQ LIKE '%西藏%') " + " AND DZRQ >= ? " + " AND BKGS = ? " + - " AND LB_1 IN ('石膏板', '轻钢龙骨', '涂料') " + + " AND (LB_1 IN ('石膏板', '轻钢龙骨') OR LB_1 LIKE '%涂料%') " + " GROUP BY " + " BKGS, " + " LB_1, " + @@ -911,7 +911,7 @@ public class SaleDataSummaryServiceImpl implements DataSummaryService { " SELECT " + " BKGS, " + - " LB_1, " + + " CASE WHEN LB_1 LIKE '%涂料%' THEN '涂料' ELSE LB_1 END AS LB_1, " + " '一体化' AS PROVINCE, " + " DATE_FORMAT(DZRQ, '%Y-%m') AS YEARMONTH, " + " SUM(NMNY) AS REVENUE_AMOUNT " + @@ -920,7 +920,7 @@ public class SaleDataSummaryServiceImpl implements DataSummaryService { " (SQ LIKE '%海南%' OR SQ LIKE '%新疆%' OR SQ LIKE '%西藏%') " + " AND DZRQ >= ? " + " AND BKGS = ? " + - " AND LB_1 IN ('石膏板', '轻钢龙骨', '涂料') " + + " AND (LB_1 IN ('石膏板', '轻钢龙骨') OR LB_1 LIKE '%涂料%') " + "GROUP BY " + " BKGS, " + " LB_1, " + @@ -929,7 +929,69 @@ public class SaleDataSummaryServiceImpl implements DataSummaryService { "ORDER BY " + " YEARMONTH ASC, " + " PROVINCE ASC, " + - " LB_1 ASC"; + " LB_1 ASC";*/ + + String querySql = + "SELECT " + + " BKGS, " + + " CASE WHEN LB_1 LIKE '%涂料%' THEN '涂料' ELSE LB_1 END AS LB_1, " + + " CASE " + + " WHEN SQ LIKE '%海南%' THEN '海南' " + + " WHEN SQ LIKE '%新疆%' THEN '新疆' " + + " WHEN SQ LIKE '%西藏%' THEN '西藏' " + + " END AS PROVINCE, " + + " DATE_FORMAT(DZRQ, '%Y-%m') AS YEARMONTH, " + + " SUM(NMNY) AS REVENUE_AMOUNT " + + "FROM BO_EU_BNBM_DATALINKUP_XS_XSL_HZ " + + "WHERE " + + " (SQ LIKE '%海南%' OR SQ LIKE '%新疆%' OR SQ LIKE '%西藏%') " + + " AND DZRQ >= ? " + + " AND BKGS = ? " + + " AND (" + + " LB_1 IN ('石膏板', '轻钢龙骨') " + + " OR (" + + " ? IN ('北新嘉宝莉', '北新涂料') " + + " AND LB_1 LIKE '%涂料%' " + + " ) " + + " ) " + + "GROUP BY " + + " BKGS, " + + " LB_1, " + + " CASE " + + " WHEN SQ LIKE '%海南%' THEN '海南' " + + " WHEN SQ LIKE '%新疆%' THEN '新疆' " + + " WHEN SQ LIKE '%西藏%' THEN '西藏' " + + " END, " + + " DATE_FORMAT(DZRQ, '%Y-%m') " + + "UNION ALL " + + "SELECT " + + " BKGS, " + + " CASE WHEN LB_1 LIKE '%涂料%' THEN '涂料' ELSE LB_1 END AS LB_1, " + + " '一体化' AS PROVINCE, " + + " DATE_FORMAT(DZRQ, '%Y-%m') AS YEARMONTH, " + + " SUM(NMNY) AS REVENUE_AMOUNT " + + "FROM BO_EU_BNBM_DATALINKUP_XS_XSL_HZ " + + "WHERE " + + " (SQ LIKE '%海南%' OR SQ LIKE '%新疆%' OR SQ LIKE '%西藏%') " + + " AND DZRQ >= ? " + + " AND BKGS = ? " + + " AND (" + + " LB_1 IN ('石膏板', '轻钢龙骨') " + + " OR (" + + " ? IN ('北新嘉宝莉', '北新涂料') " + + " AND LB_1 LIKE '%涂料%' " + + " ) " + + " ) " + + "GROUP BY " + + " BKGS, " + + " LB_1, " + + " '一体化', " + + " DATE_FORMAT(DZRQ, '%Y-%m') " + + "ORDER BY " + + " YEARMONTH ASC, " + + " PROVINCE ASC, " + + " LB_1 ASC"; + List rowMaps = DBSql.getMaps(querySql, startDate,bkgs,startDate,bkgs); LOGGER.info("板块公司：{}，本次查询数据：{}",bkgs,rowMaps.size());