From 5173dccafbdf021336c971eb1e96505a6c33ba2f Mon Sep 17 00:00:00 2001 From: yujh_java Date: Mon, 22 Sep 2025 14:14:07 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=87=E8=B4=ADBI=E6=B1=87=E6=80=BB=EF=BC=8C?= =?UTF-8?q?sql=E9=80=BB=E8=BE=91=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/PurchaseDataSummaryServiceImpl.java | 10 ++++------ 1 file changed, 4 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/PurchaseDataSummaryServiceImpl.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/PurchaseDataSummaryServiceImpl.java index bab198f..3c45f6b 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/PurchaseDataSummaryServiceImpl.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/PurchaseDataSummaryServiceImpl.java @@ -353,12 +353,11 @@ public class PurchaseDataSummaryServiceImpl implements DataSummaryService { " MONTH(DJRQ) AS Month " + " FROM BO_EU_DWD_ORDER_RKD_HZ " + " WHERE BKGS = ? " + - " AND DJRQ >= DATE_SUB(?, INTERVAL 2 YEAR) " + + " AND DJRQ >= CONCAT(YEAR(?), '-', LPAD(MONTH(?), 2, '0'), '-01')" + " GROUP BY WLMC, YEAR(DJRQ), MONTH(DJRQ),SLGC " + " ) c " + - " WHERE c.Year IN (YEAR(?), YEAR(?) + 1) " + " ORDER BY c.Year, c.Month"; - List currentMonthData = DBSql.getMaps(currentMonthSql, bkgs, startDate,startDate,startDate); + List currentMonthData = DBSql.getMaps(currentMonthSql, bkgs, startDate,startDate); if (currentMonthData==null){ return; } @@ -430,12 +429,11 @@ public class PurchaseDataSummaryServiceImpl implements DataSummaryService { " MONTH(DJRQ) AS Month " + " FROM BO_EU_DWD_ORDER_RKD_HZ " + " WHERE BKGS = ? " + - " AND DJRQ >= DATE_SUB(?, INTERVAL 2 YEAR) " + + " AND DJRQ >= CONCAT(YEAR(?), '-', LPAD(MONTH(?), 2, '0'), '-01')" + " GROUP BY WLMC, YEAR(DJRQ), MONTH(DJRQ) " + " ) c " + - " WHERE c.Year IN (YEAR(?), YEAR(?) + 1) " + " ORDER BY c.Year, c.Month"; - List currentMonthData = DBSql.getMaps(currentMonthSql, bkgs, startDate,startDate,startDate); + List currentMonthData = DBSql.getMaps(currentMonthSql, bkgs, startDate,startDate); if (currentMonthData==null){ return; }