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");