From d3e0d7fb49806ad6f332e9c1025ab50af17c98d0 Mon Sep 17 00:00:00 2001
From: llllon <chunyangli0323@163.com>
Date: Tue, 23 Sep 2025 09:50:45 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81sql=E5=AD=97=E6=AE=B5=E5=80=BC?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/SaleDataSyncServiceImpl.class        | Bin 40126 -> 39881 bytes
 .../compileJava/previous-compilation-data.bin | Bin 9392601 -> 9392601 bytes
 .../service/impl/SaleDataSyncServiceImpl.java |  48 +++++++++---------
 3 files changed, 24 insertions(+), 24 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 9f8dfb8a5a2f62e94547db9abf1997bb04149624..1361e14a15be644c25f850ecdf9a1d9515501b21 100644
GIT binary patch
delta 2637
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

delta 2743
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

diff --git a/com.awspaas.user.apps.bnbm.datalinkup/com.awspaas.user.apps.bnbm.datalinkup/build/tmp/compileJava/previous-compilation-data.bin b/com.awspaas.user.apps.bnbm.datalinkup/com.awspaas.user.apps.bnbm.datalinkup/build/tmp/compileJava/previous-compilation-data.bin
index b49aa0b489b90ff1e4260f3824275b71bd1b3d1f..edabc98f6a8e617029c38a5acf22ce7d3b836af9 100644
GIT binary patch
delta 460
zcmWN=*)kOX0D$2sCu=y$Rz#siMUsRTBwL%MJxhqnPL_(4rJpP*^G{FU8C-PXqH9lJ
z8kfdv=$rYr*Ea*(|Noi`HvaziXDv{+wObwC^mk`3I3pgwgBXGVJcOYbhT#~2kr;)C
zF&bkq7K0dvNAM`dV*(~(5+>s@JdP=tiYG7))A1yp!VJvBEIf^8@GPFgY&?$_@FM15
zE?&Ysyo~vH1q<*h7UDH5!eT7J>v#ii;w>!2GAzg2Sb=x2605KpYp@pY;yt{N5AY$@
zVLdirBR;~%_ynKgGklIO@Fg~3GqzwWzQQ(a#}0gro!EtM@GZW>ZtTHc?8AN>z(E|s
zVSJAxIErI9jvw$Ne!>Zy#LqZ|U+^nV;|$K?9DYM^9vARCF5(g{;|l)3)eV1EHS7b&
CJJekO

delta 460
zcmWN=*)kOX0D$2UWjQ4gNlIBO(W-1&D#{)zmA$kfC0kMshd)GR=D&0685&p3cz`^>
zxp3Em@XdVT&A(CM{p$+}|9Agw#AJm6JF#0!iQB>Wc`*VHU?fK2K|F-f7=y7GhXFi{
zM=&0bVgeq+L`=ftn2afS0#orMrr{|}$J2NQGw>{)!%WP=Y|O!2%)|3|0WV@cUcv$_
z#LIXEui`bljyJFfZ{jU1#u6;WGAzg2Sb>#Th1GZm@8UhI!CJhJ53mmFu>l*g37fG6
zA7U%EVLLv;$M^(0@F_mS=h%r|*o{5di+$LSFYqM};46HMZ}2U?!$BOvVSJAx_yIrS
zD1O2*9LEWq#3}rY)A$8v@GE}9Sq$PF&SMA{a1p`pxP;5Nf<JH-*YGF)`s44~);%r@
B(`x_#

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 f156346..327eec9 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
@@ -1213,43 +1213,43 @@ public class SaleDataSyncServiceImpl implements DataSyncService {
                 String querySql;
                 if ("ORACLE".equalsIgnoreCase(DBname)) {
                     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() +
+                            " 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') " +
-                            "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() +
+                            " 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)) {
                     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 full_date::DATE BETWEEN '"+startDate+"' AND '"+endDate+"' " +
-                            "GROUP BY DATE_TRUNC('MONTH', " + timeField + "::DATE)) t2 " +
-                            "ON t1." + timeField + "::DATE = t2.max_date " +
-                            "WHERE " +conditionBuilder.toString()+
+                            " 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+"' " +
+                            " 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+"'";
                 } else if ("SQLSERVER".equalsIgnoreCase(DBname)) {
                     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() +
+                            " 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 + "') " +
-                            "GROUP BY DATEADD(MONTH, DATEDIFF(MONTH, 0, CONVERT(DATE, " + timeField + ")), 0)) t2 " +
-                            "ON CONVERT(DATE, t1." + timeField + ") = t2.max_date " +
-                            "WHERE " + conditionBuilder.toString() +
+                            " 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 + "')";
                 } else {
                     // 默认处理（如MySQL）
                     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() +
+                            " 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') " +
-                            "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() +
+                            " 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')";
                 }
                 LOGGER.info("执行查询: {}", querySql);