From 80ab462118f27b93237b075141eeb853d6db9870 Mon Sep 17 00:00:00 2001 From: llllon Date: Mon, 27 Oct 2025 12:41:23 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E5=90=8C=E6=AD=A5=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=88=A4=E6=96=AD=E6=9D=A1=E4=BB=B6=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0sql=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/SaleDataSyncServiceImpl.class | Bin 44127 -> 44675 bytes .../compileJava/previous-compilation-data.bin | Bin 9396371 -> 9396371 bytes .../service/impl/SaleDataSyncServiceImpl.java | 36 +++++++++++++++--- 3 files changed, 30 insertions(+), 6 deletions(-) diff --git a/com.awspaas.user.apps.bnbm.datalinkup/com.awspaas.user.apps.bnbm.datalinkup/build/classes/java/main/com/awspaas/user/apps/bnbm/datalinkup/service/impl/SaleDataSyncServiceImpl.class b/com.awspaas.user.apps.bnbm.datalinkup/com.awspaas.user.apps.bnbm.datalinkup/build/classes/java/main/com/awspaas/user/apps/bnbm/datalinkup/service/impl/SaleDataSyncServiceImpl.class index 05f4d524289c5e5bf13ae8c054f988215b24dd84..e18c9ee4eb82db7d0e1d4cae5cb382133c903a9e 100644 GIT binary patch delta 11532 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 delta 459 zcmWN=Ni!Az0D$2s%95>6wj?P_nzL)i*a}qk6}C}U?LvJ6PSd_n1ZR8h9@x{Phke0#!NheS$G!DVK(MqF6QBRynq++ z5?;o9yn+RI6$|ki7GW`#U@2b58+a4TupDpUZM=gOSc!MB3ahaOYq1XNu>l*g3GZPu zwqPr^VLRT(2iSoR@ew}8C-@Yf;d6X}FEN0xuoGWn7k1+t?7?2_!+v~=12~B9@I4OU zFn+)h9K|vGh@WsACvXx!;}lNg7yODd7{pne!+8Y1;Q}t=cU;0{T)|abTlYs`AN&{A AZ2$lO 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/SaleDataSyncServiceImpl.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/SaleDataSyncServiceImpl.java index b226d42..76612b6 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/SaleDataSyncServiceImpl.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/SaleDataSyncServiceImpl.java @@ -1350,52 +1350,76 @@ public class SaleDataSyncServiceImpl implements DataSyncService { String querySql; if ("ORACLE".equalsIgnoreCase(DBname)) { + // 构建分组条件 + String groupCondition = ("龙牌".equals(bggs) || "梦牌".equals(bggs)) ? + " AND BKGS = '" + bggs + "' " : ""; + querySql = "SELECT t1.* FROM " + tableName + " t1 " + " JOIN (SELECT TRUNC(TO_DATE(" + timeField + ", 'YYYY-MM-DD'), 'MONTH') AS month_start, " + " MAX(TO_DATE(" + timeField + ", 'YYYY-MM-DD')) AS max_date " + " FROM " + tableName + " WHERE " + conditionBuilder.toString() + " AND TO_DATE(" + timeField + ", 'YYYY-MM-DD') BETWEEN TO_DATE('" + startDate + "', 'YYYY-MM-DD') AND TO_DATE('" + endDate + "', 'YYYY-MM-DD') " + - " AND BKGS = '" + bggs + "' " + // 添加分组条件 + groupCondition + // 使用条件分组 " GROUP BY TRUNC(TO_DATE(" + timeField + ", 'YYYY-MM-DD'), 'MONTH')) t2 " + " ON TO_DATE(t1." + timeField + ", 'YYYY-MM-DD') = t2.max_date " + " WHERE " + conditionBuilder.toString() + " AND TO_DATE(t1." + timeField + ", 'YYYY-MM-DD') BETWEEN TO_DATE('" + startDate + "', 'YYYY-MM-DD') AND TO_DATE('" + endDate + "', 'YYYY-MM-DD')"; } else if ("POSTGRESQL".equalsIgnoreCase(DBname) || "GAUSS".equalsIgnoreCase(DBname)) { + // 构建分组条件 + String groupCondition = ("龙牌".equals(bggs) || "梦牌".equals(bggs)) ? + " AND BKGS = '" + bggs + "' " : ""; + String mainGroupCondition = ("龙牌".equals(bggs) || "梦牌".equals(bggs)) ? + " AND t1.BKGS = '" + bggs + "'" : ""; + querySql = "SELECT t1.* FROM " + tableName + " t1 " + " JOIN (SELECT DATE_TRUNC('MONTH', " + timeField + "::DATE) AS month_start, " + " MAX(" + timeField + "::DATE) AS max_date " + " FROM " + tableName + " WHERE " + conditionBuilder.toString() + " AND " + timeField + "::DATE BETWEEN '" + startDate + "' AND '" + endDate + "' " + - " AND BKGS = '" + bggs + "' " + // 添加分组条件 + groupCondition + // 使用条件分组 " GROUP BY DATE_TRUNC('MONTH', " + timeField + "::DATE)) t2 " + " ON t1." + timeField + "::DATE = t2.max_date " + " WHERE " + conditionBuilder.toString() + " AND t1." + timeField + "::DATE BETWEEN '" + startDate + "' AND '" + endDate + "'" + - " AND t1.BKGS = '" + bggs + "'"; // 添加分组条件; + mainGroupCondition; // 使用条件分组 } else if ("SQLSERVER".equalsIgnoreCase(DBname)) { + // 构建分组条件 + String groupCondition = ("龙牌".equals(bggs) || "梦牌".equals(bggs)) ? + " AND BKGS = '" + bggs + "' " : ""; + String mainGroupCondition = ("龙牌".equals(bggs) || "梦牌".equals(bggs)) ? + " AND t1.BKGS = '" + bggs + "'" : ""; + querySql = "SELECT t1.* FROM " + tableName + " t1 " + " JOIN (SELECT DATEADD(MONTH, DATEDIFF(MONTH, 0, CONVERT(DATE, " + timeField + ")), 0) AS month_start, " + " MAX(CONVERT(DATE, " + timeField + ")) AS max_date " + " FROM " + tableName + " WHERE " + conditionBuilder.toString() + " AND CONVERT(DATE, " + timeField + ") BETWEEN CONVERT(DATE, '" + startDate + "') AND CONVERT(DATE, '" + endDate + "') " + + groupCondition + // 使用条件分组 " GROUP BY DATEADD(MONTH, DATEDIFF(MONTH, 0, CONVERT(DATE, " + timeField + ")), 0)) t2 " + " ON CONVERT(DATE, t1." + timeField + ") = t2.max_date " + " WHERE " + conditionBuilder.toString() + " AND CONVERT(DATE, t1." + timeField + ") BETWEEN CONVERT(DATE, '" + startDate + "') AND CONVERT(DATE, '" + endDate + "')" + - " AND t1.BKGS = '" + bggs + "'"; + mainGroupCondition; // 使用条件分组 } else { // 默认处理（如MySQL） + // 构建分组条件 + String groupCondition = ("龙牌".equals(bggs) || "梦牌".equals(bggs)) ? + " AND BKGS = '" + bggs + "' " : ""; + String mainGroupCondition = ("龙牌".equals(bggs) || "梦牌".equals(bggs)) ? + " AND t1.BKGS = '" + bggs + "'" : ""; + querySql = "SELECT t1.* FROM " + tableName + " t1 " + " JOIN (SELECT DATE_FORMAT(STR_TO_DATE(" + timeField + ", '%Y-%m-%d'), '%Y-%m-01') AS month_start, " + " MAX(STR_TO_DATE(" + timeField + ", '%Y-%m-%d')) AS max_date " + " FROM " + tableName + " WHERE " + conditionBuilder.toString() + " AND STR_TO_DATE(" + timeField + ", '%Y-%m-%d') BETWEEN STR_TO_DATE('" + startDate + "', '%Y-%m-%d') AND STR_TO_DATE('" + endDate + "', '%Y-%m-%d') " + - " AND BKGS = '" + bggs + "' " + // 添加分组条件 + groupCondition + // 使用条件分组 " GROUP BY DATE_FORMAT(STR_TO_DATE(" + timeField + ", '%Y-%m-%d'), '%Y-%m-01')) t2 " + " ON STR_TO_DATE(t1." + timeField + ", '%Y-%m-%d') = t2.max_date " + " WHERE " + conditionBuilder.toString() + " AND STR_TO_DATE(t1." + timeField + ", '%Y-%m-%d') BETWEEN STR_TO_DATE('" + startDate + "', '%Y-%m-%d') AND STR_TO_DATE('" + endDate + "', '%Y-%m-%d')" + - " AND t1.BKGS = '" + bggs + "'"; // 添加分组条件 + mainGroupCondition; // 使用条件分组 } + LOGGER.info("执行查询: {}", querySql); List pageData;