From b021d2ef0153b502a756d25c1317b9227fd1cb06 Mon Sep 17 00:00:00 2001 From: king Date: Tue, 10 Mar 2026 14:36:06 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=89=93=E5=8D=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../enhance/example/report/xtsy/zhxsqkLineReportEnhance.java | 1 - 1 file changed, 1 deletion(-) diff --git a/lidee-core/src/main/java/com/lideeyunji/core/framework/enhance/example/report/xtsy/zhxsqkLineReportEnhance.java b/lidee-core/src/main/java/com/lideeyunji/core/framework/enhance/example/report/xtsy/zhxsqkLineReportEnhance.java index af85c6f..3b71213 100644 --- a/lidee-core/src/main/java/com/lideeyunji/core/framework/enhance/example/report/xtsy/zhxsqkLineReportEnhance.java +++ b/lidee-core/src/main/java/com/lideeyunji/core/framework/enhance/example/report/xtsy/zhxsqkLineReportEnhance.java @@ -152,7 +152,6 @@ public class zhxsqkLineReportEnhance implements ReportBeforeAdvicePlugin { executePluginSql.deleteCharAt(executePluginSql.length() - 1); params.put("executePluginSql", executePluginSql.toString()); // params.remove("Group by"); // 原有的逻辑注释了，这里也注释 - System.out.println(params); } } From b6a6ad88e723efa4631f2bc88093babf0a71ca3d Mon Sep 17 00:00:00 2001 From: king Date: Tue, 10 Mar 2026 15:04:48 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=88=86=E7=BB=84SQL=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../report/xtsy/zhxsqkLineReportEnhance.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/lidee-core/src/main/java/com/lideeyunji/core/framework/enhance/example/report/xtsy/zhxsqkLineReportEnhance.java b/lidee-core/src/main/java/com/lideeyunji/core/framework/enhance/example/report/xtsy/zhxsqkLineReportEnhance.java index 3b71213..ca70923 100644 --- a/lidee-core/src/main/java/com/lideeyunji/core/framework/enhance/example/report/xtsy/zhxsqkLineReportEnhance.java +++ b/lidee-core/src/main/java/com/lideeyunji/core/framework/enhance/example/report/xtsy/zhxsqkLineReportEnhance.java @@ -62,8 +62,8 @@ public class zhxsqkLineReportEnhance implements ReportBeforeAdvicePlugin { executePluginSql.append(" CONCAT(ROUND((SELECT SUM(MONTHSAMONEY) FROM yunji_gr_bi_sa_agg)/100000000 ,2), '亿') AS monthsamoney_s, \n"); executePluginSql.append(" CONCAT(ROUND((SELECT SUM(THISSAMONEY) FROM yunji_gr_bi_sa_agg)/100000000,2), '亿') AS thissamoney_s, \n"); executePluginSql.append(" CONCAT(ROUND((SELECT SUM(LASTSAMONEY) FROM yunji_gr_bi_sa_agg)/100000000,2), '亿') AS lastsamoney_s, \n"); - executePluginSql.append(" max(tbl_lgbsa.THISSAQTY) as THISSAQTY, \n"); - executePluginSql.append(" max(tbl_lgbsa.LASTSAQTY) as LASTSAQTY, \n"); + executePluginSql.append(" sum(tbl_lgbsa.THISSAQTY) as THISSAQTY, \n"); //本年销量 + executePluginSql.append(" sum(tbl_lgbsa.LASTSAQTY) as LASTSAQTY, \n"); //上年销量 executePluginSql.append(" -- 数量同比（原有） \n"); executePluginSql.append(" CASE \n"); executePluginSql.append(" WHEN (CASE WHEN sum(tbl_lgbsa.LASTSAQTY) = 0 THEN IF(sum(tbl_lgbsa.THISSAQTY) > 0, 100, 0) \n"); @@ -76,9 +76,9 @@ public class zhxsqkLineReportEnhance implements ReportBeforeAdvicePlugin { executePluginSql.append(" ELSE (sum(tbl_lgbsa.THISSAQTY) - sum(tbl_lgbsa.LASTSAQTY)) / sum(tbl_lgbsa.LASTSAQTY) * 100 END), 2), '%') \n"); executePluginSql.append("ELSE '0.00%' \n"); executePluginSql.append(" END AS saqty_yoy, \n"); - executePluginSql.append(" max(tbl_lgbsa.MONTHSAMONEY) as MONTHSAMONEY, \n"); - executePluginSql.append(" max(tbl_lgbsa.THISSAMONEY) as THISSAMONEY, \n"); - executePluginSql.append(" max(tbl_lgbsa.LASTSAMONEY) as LASTSAMONEY, \n"); + executePluginSql.append(" sum(tbl_lgbsa.MONTHSAMONEY) as MONTHSAMONEY, \n"); //本月销售金额(元) + executePluginSql.append(" sum(tbl_lgbsa.THISSAMONEY) as THISSAMONEY, \n"); //本年销售金额(元) + executePluginSql.append(" sum(tbl_lgbsa.LASTSAMONEY) as LASTSAMONEY, \n"); //上年销售金额(元) executePluginSql.append(" -- 销售金额同比（原有新增） \n"); executePluginSql.append(" CASE \n"); executePluginSql.append(" WHEN (CASE WHEN sum(tbl_lgbsa.LASTSAMONEY) = 0 THEN IF(sum(tbl_lgbsa.THISSAMONEY) > 0, 100, 0) \n"); @@ -91,9 +91,9 @@ public class zhxsqkLineReportEnhance implements ReportBeforeAdvicePlugin { executePluginSql.append(" ELSE (sum(tbl_lgbsa.THISSAMONEY) - sum(tbl_lgbsa.LASTSAMONEY)) / sum(tbl_lgbsa.LASTSAMONEY) * 100 END), 2), '%') \n"); executePluginSql.append(" ELSE '0.00%' \n"); executePluginSql.append(" END AS samoney_yoy, \n"); //销售收入同比 - executePluginSql.append(" max(tbl_lgbsa.MONTHPROFIT) as MONTHPROFIT, \n"); //本月毛利额(元) - executePluginSql.append(" max(tbl_lgbsa.THISPROFIT) as THISPROFIT, \n"); //本年毛利额(元) - executePluginSql.append(" max(tbl_lgbsa.LASTPROFIT) as LASTPROFIT, \n"); //上年毛利额(元) + executePluginSql.append(" sum(tbl_lgbsa.MONTHPROFIT) as MONTHPROFIT, \n"); //本月毛利额(元) + executePluginSql.append(" sum(tbl_lgbsa.THISPROFIT) as THISPROFIT, \n"); //本年毛利额(元) + executePluginSql.append(" sum(tbl_lgbsa.LASTPROFIT) as LASTPROFIT, \n"); //上年毛利额(元) executePluginSql.append(" -- 新增：毛利同比 \n"); executePluginSql.append(" CASE \n"); executePluginSql.append(" -- 正数：红色圆点emoji + 数值 + % \n"); From 8523b80eb3807e7eade50ec6cb0dca08ce9ca36b Mon Sep 17 00:00:00 2001 From: king Date: Tue, 10 Mar 2026 15:38:16 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=88=86=E7=BB=84SQL=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../enhance/example/report/xtsy/zhxsqkLineReportEnhance.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lidee-core/src/main/java/com/lideeyunji/core/framework/enhance/example/report/xtsy/zhxsqkLineReportEnhance.java b/lidee-core/src/main/java/com/lideeyunji/core/framework/enhance/example/report/xtsy/zhxsqkLineReportEnhance.java index ca70923..7ca9aed 100644 --- a/lidee-core/src/main/java/com/lideeyunji/core/framework/enhance/example/report/xtsy/zhxsqkLineReportEnhance.java +++ b/lidee-core/src/main/java/com/lideeyunji/core/framework/enhance/example/report/xtsy/zhxsqkLineReportEnhance.java @@ -114,7 +114,7 @@ public class zhxsqkLineReportEnhance implements ReportBeforeAdvicePlugin { executePluginSql.append(" avg(tbl_lgbsa.PROFITGROWTH) as PROFITGROWTH, \n"); //毛利额增长率 executePluginSql.append(" avg(tbl_lgbsa.THISPROFITRATE) as THISPROFITRATE, \n"); //本年毛利率 executePluginSql.append(" avg(tbl_lgbsa.SAMONEYGROWTH) as SAMONEYGROWTH, \n"); //销售金额增长率 - executePluginSql.append(" max(tbl_lgbsa.LASTPROFITSHARE), \n"); //上年毛利额占比 + executePluginSql.append(" max(tbl_lgbsa.LASTPROFITSHARE) as LASTPROFITSHARE, \n"); //上年毛利额占比 executePluginSql.append(" CONCAT(ROUND(avg(tbl_lgbsa.THISPROFITSHARE) * 100, 2), '%') AS THISPROFITSHARE, \n"); //本年毛利额占比 executePluginSql.append(" CONCAT(ROUND(avg(tbl_lgbsa.MONTHPROFITSHARE) * 100, 2), '%') AS MONTHPROFITSHARE, \n"); //本月毛利额占比 executePluginSql.append(" CONCAT(ROUND(avg(tbl_lgbsa.LASTSAMONEYSHARE) * 100, 2), '%') AS LASTSAMONEYSHARE, \n"); //上年销售金额占比 From affe6bfed561e21c33a9fa23cee7608a01ca9800 Mon Sep 17 00:00:00 2001 From: king Date: Tue, 10 Mar 2026 16:52:34 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=88=86=E7=BB=84SQL=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../report/xtsy/zhxsqkLineReportEnhance.java | 34 +++++++++---------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/lidee-core/src/main/java/com/lideeyunji/core/framework/enhance/example/report/xtsy/zhxsqkLineReportEnhance.java b/lidee-core/src/main/java/com/lideeyunji/core/framework/enhance/example/report/xtsy/zhxsqkLineReportEnhance.java index 7ca9aed..37eeb2f 100644 --- a/lidee-core/src/main/java/com/lideeyunji/core/framework/enhance/example/report/xtsy/zhxsqkLineReportEnhance.java +++ b/lidee-core/src/main/java/com/lideeyunji/core/framework/enhance/example/report/xtsy/zhxsqkLineReportEnhance.java @@ -51,10 +51,10 @@ public class zhxsqkLineReportEnhance implements ReportBeforeAdvicePlugin { executePluginSql.append(" tbl_lgbsa.DOSAGEID, \n"); executePluginSql.append(" tbl_lgbsa.DOSAGENAME, \n"); } - executePluginSql.append(" max(CONCAT(USEYEAR, LPAD(USEMONTH, 2, '0'))) as ny, \n"); //年月 + executePluginSql.append(" MAX(CONCAT(USEYEAR, LPAD(USEMONTH, 2, '0'))) as ny, \n"); //年月 executePluginSql.append(" GROUP_CONCAT(DISTINCT tbl_lgbsa.PROVINCEID ORDER BY tbl_lgbsa.PROVINCEID SEPARATOR ',') as PROVINCEID, \n"); //行政区域ID executePluginSql.append(" GROUP_CONCAT(DISTINCT tbl_lgbsa.PROVINCENAME ORDER BY tbl_lgbsa.PROVINCEID SEPARATOR ',') as PROVINCENAME, \n"); //行政区域名称 - executePluginSql.append(" sum(tbl_lgbsa.MONTHSAQTY) as MONTHSAQTY, \n"); //本月销量 + executePluginSql.append(" SUM(tbl_lgbsa.MONTHSAQTY) as MONTHSAQTY, \n"); //本月销量 executePluginSql.append(" CONCAT(ROUND((SELECT SUM(MONTHSAQTY) FROM yunji_gr_bi_sa_agg)/100000000 ,2), '亿') AS monthsaqty_s, \n"); executePluginSql.append(" CONCAT(ROUND((SELECT SUM(THISSAQTY) FROM yunji_gr_bi_sa_agg)/100000000 ,2), '亿') AS thissaqty_s, \n"); executePluginSql.append(" CONCAT(ROUND((SELECT SUM(LASTSAQTY) FROM yunji_gr_bi_sa_agg)/100000000 ,2), '亿') AS lastsaqty_s, \n"); @@ -62,8 +62,8 @@ public class zhxsqkLineReportEnhance implements ReportBeforeAdvicePlugin { executePluginSql.append(" CONCAT(ROUND((SELECT SUM(MONTHSAMONEY) FROM yunji_gr_bi_sa_agg)/100000000 ,2), '亿') AS monthsamoney_s, \n"); executePluginSql.append(" CONCAT(ROUND((SELECT SUM(THISSAMONEY) FROM yunji_gr_bi_sa_agg)/100000000,2), '亿') AS thissamoney_s, \n"); executePluginSql.append(" CONCAT(ROUND((SELECT SUM(LASTSAMONEY) FROM yunji_gr_bi_sa_agg)/100000000,2), '亿') AS lastsamoney_s, \n"); - executePluginSql.append(" sum(tbl_lgbsa.THISSAQTY) as THISSAQTY, \n"); //本年销量 - executePluginSql.append(" sum(tbl_lgbsa.LASTSAQTY) as LASTSAQTY, \n"); //上年销量 + executePluginSql.append(" SUM(tbl_lgbsa.THISSAQTY) as THISSAQTY, \n"); //本年销量 + executePluginSql.append(" SUM(tbl_lgbsa.LASTSAQTY) as LASTSAQTY, \n"); //上年销量 executePluginSql.append(" -- 数量同比（原有） \n"); executePluginSql.append(" CASE \n"); executePluginSql.append(" WHEN (CASE WHEN sum(tbl_lgbsa.LASTSAQTY) = 0 THEN IF(sum(tbl_lgbsa.THISSAQTY) > 0, 100, 0) \n"); @@ -74,11 +74,11 @@ public class zhxsqkLineReportEnhance implements ReportBeforeAdvicePlugin { executePluginSql.append(" ELSE (sum(tbl_lgbsa.THISSAQTY) - sum(tbl_lgbsa.LASTSAQTY)) / sum(tbl_lgbsa.LASTSAQTY) * 100 END) < 0 THEN \n"); executePluginSql.append(" CONCAT('🔴 ', ROUND((CASE WHEN sum(tbl_lgbsa.LASTSAQTY) = 0 THEN IF(sum(tbl_lgbsa.THISSAQTY) > 0, 100, 0) \n"); executePluginSql.append(" ELSE (sum(tbl_lgbsa.THISSAQTY) - sum(tbl_lgbsa.LASTSAQTY)) / sum(tbl_lgbsa.LASTSAQTY) * 100 END), 2), '%') \n"); - executePluginSql.append("ELSE '0.00%' \n"); + executePluginSql.append(" ELSE '0.00%' \n"); executePluginSql.append(" END AS saqty_yoy, \n"); - executePluginSql.append(" sum(tbl_lgbsa.MONTHSAMONEY) as MONTHSAMONEY, \n"); //本月销售金额(元) - executePluginSql.append(" sum(tbl_lgbsa.THISSAMONEY) as THISSAMONEY, \n"); //本年销售金额(元) - executePluginSql.append(" sum(tbl_lgbsa.LASTSAMONEY) as LASTSAMONEY, \n"); //上年销售金额(元) + executePluginSql.append(" SUM(tbl_lgbsa.MONTHSAMONEY) as MONTHSAMONEY, \n"); //本月销售金额(元) + executePluginSql.append(" SUM(tbl_lgbsa.THISSAMONEY) as THISSAMONEY, \n"); //本年销售金额(元) + executePluginSql.append(" SUM(tbl_lgbsa.LASTSAMONEY) as LASTSAMONEY, \n"); //上年销售金额(元) executePluginSql.append(" -- 销售金额同比（原有新增） \n"); executePluginSql.append(" CASE \n"); executePluginSql.append(" WHEN (CASE WHEN sum(tbl_lgbsa.LASTSAMONEY) = 0 THEN IF(sum(tbl_lgbsa.THISSAMONEY) > 0, 100, 0) \n"); @@ -91,9 +91,9 @@ public class zhxsqkLineReportEnhance implements ReportBeforeAdvicePlugin { executePluginSql.append(" ELSE (sum(tbl_lgbsa.THISSAMONEY) - sum(tbl_lgbsa.LASTSAMONEY)) / sum(tbl_lgbsa.LASTSAMONEY) * 100 END), 2), '%') \n"); executePluginSql.append(" ELSE '0.00%' \n"); executePluginSql.append(" END AS samoney_yoy, \n"); //销售收入同比 - executePluginSql.append(" sum(tbl_lgbsa.MONTHPROFIT) as MONTHPROFIT, \n"); //本月毛利额(元) - executePluginSql.append(" sum(tbl_lgbsa.THISPROFIT) as THISPROFIT, \n"); //本年毛利额(元) - executePluginSql.append(" sum(tbl_lgbsa.LASTPROFIT) as LASTPROFIT, \n"); //上年毛利额(元) + executePluginSql.append(" SUM(tbl_lgbsa.MONTHPROFIT) as MONTHPROFIT, \n"); //本月毛利额(元) + executePluginSql.append(" SUM(tbl_lgbsa.THISPROFIT) as THISPROFIT, \n"); //本年毛利额(元) + executePluginSql.append(" SUM(tbl_lgbsa.LASTPROFIT) as LASTPROFIT, \n"); //上年毛利额(元) executePluginSql.append(" -- 新增：毛利同比 \n"); executePluginSql.append(" CASE \n"); executePluginSql.append(" -- 正数：红色圆点emoji + 数值 + % \n"); @@ -109,12 +109,12 @@ public class zhxsqkLineReportEnhance implements ReportBeforeAdvicePlugin { executePluginSql.append(" -- 0值：直接显示 \n"); executePluginSql.append(" ELSE '0.00%' \n"); executePluginSql.append(" END AS profit_yoy, \n"); //毛利同比 - executePluginSql.append(" sum(tbl_lgbsa.MONTHCOST) as MONTHCOST, \n"); //本月销售成本(元) - executePluginSql.append(" avg(tbl_lgbsa.PROFITCHANGE) as PROFITCHANGE, \n"); //毛利变动(元) - executePluginSql.append(" avg(tbl_lgbsa.PROFITGROWTH) as PROFITGROWTH, \n"); //毛利额增长率 - executePluginSql.append(" avg(tbl_lgbsa.THISPROFITRATE) as THISPROFITRATE, \n"); //本年毛利率 - executePluginSql.append(" avg(tbl_lgbsa.SAMONEYGROWTH) as SAMONEYGROWTH, \n"); //销售金额增长率 - executePluginSql.append(" max(tbl_lgbsa.LASTPROFITSHARE) as LASTPROFITSHARE, \n"); //上年毛利额占比 + executePluginSql.append(" SUM(tbl_lgbsa.MONTHCOST) as MONTHCOST, \n"); //本月销售成本(元) + executePluginSql.append(" ROUND(avg(tbl_lgbsa.PROFITCHANGE), 2) as PROFITCHANGE, \n"); //毛利变动(元) + executePluginSql.append(" ROUND(avg(tbl_lgbsa.PROFITGROWTH), 2) as PROFITGROWTH, \n"); //毛利额增长率 + executePluginSql.append(" ROUND(avg(tbl_lgbsa.THISPROFITRATE), 2) as THISPROFITRATE, \n"); //本年毛利率 + executePluginSql.append(" ROUND(avg(tbl_lgbsa.SAMONEYGROWTH), 2) as SAMONEYGROWTH, \n"); //销售金额增长率 + executePluginSql.append(" ROUND(avg(tbl_lgbsa.LASTPROFITSHARE) * 100, 2) as LASTPROFITSHARE, \n"); //上年毛利额占比 executePluginSql.append(" CONCAT(ROUND(avg(tbl_lgbsa.THISPROFITSHARE) * 100, 2), '%') AS THISPROFITSHARE, \n"); //本年毛利额占比 executePluginSql.append(" CONCAT(ROUND(avg(tbl_lgbsa.MONTHPROFITSHARE) * 100, 2), '%') AS MONTHPROFITSHARE, \n"); //本月毛利额占比 executePluginSql.append(" CONCAT(ROUND(avg(tbl_lgbsa.LASTSAMONEYSHARE) * 100, 2), '%') AS LASTSAMONEYSHARE, \n"); //上年销售金额占比