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 similarity index 99% rename from lidee-core/src/main/java/com/lideeyunji/core/framework/enhance/example/report/xtsy/zhxsqkLineReportEnhance.java rename to lidee-core/src/main/java/com/lideeyunji/core/framework/enhance/example/report/xtsy/ZhxsqkLineReportEnhance.java index 8b05546..e532d41 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 @@ -18,7 +18,7 @@ import java.util.Map; */ @Slf4j @Component("zhxsqkLineReportEnhance") -public class zhxsqkLineReportEnhance implements ReportBeforeAdvicePlugin { +public class ZhxsqkLineReportEnhance implements ReportBeforeAdvicePlugin { @Override public void execute(EnhanceReportContext enhanceContext) { diff --git a/lidee-core/src/main/java/com/lideeyunji/core/framework/enhance/example/report/xtsy/zhxsqkPlugin.java b/lidee-core/src/main/java/com/lideeyunji/core/framework/enhance/example/report/xtsy/ZhxsqkPlugin.java similarity index 99% rename from lidee-core/src/main/java/com/lideeyunji/core/framework/enhance/example/report/xtsy/zhxsqkPlugin.java rename to lidee-core/src/main/java/com/lideeyunji/core/framework/enhance/example/report/xtsy/ZhxsqkPlugin.java index b6d7279..ed5bdd1 100644 --- a/lidee-core/src/main/java/com/lideeyunji/core/framework/enhance/example/report/xtsy/zhxsqkPlugin.java +++ b/lidee-core/src/main/java/com/lideeyunji/core/framework/enhance/example/report/xtsy/ZhxsqkPlugin.java @@ -29,7 +29,7 @@ import java.util.stream.Collectors; */ @Slf4j @Component("zhxsqkPlugin") -public class zhxsqkPlugin implements ReportAroundAdvicePlugin { +public class ZhxsqkPlugin implements ReportAroundAdvicePlugin { @Resource INewGrBiSaAggService newGrBiSaAggService; diff --git a/lidee-core/src/main/java/com/lideeyunji/core/framework/enhance/example/report/xtsy/zhxsqkPluginJx.java b/lidee-core/src/main/java/com/lideeyunji/core/framework/enhance/example/report/xtsy/ZhxsqkPluginJx.java similarity index 98% rename from lidee-core/src/main/java/com/lideeyunji/core/framework/enhance/example/report/xtsy/zhxsqkPluginJx.java rename to lidee-core/src/main/java/com/lideeyunji/core/framework/enhance/example/report/xtsy/ZhxsqkPluginJx.java index e58c141..4e273e3 100644 --- a/lidee-core/src/main/java/com/lideeyunji/core/framework/enhance/example/report/xtsy/zhxsqkPluginJx.java +++ b/lidee-core/src/main/java/com/lideeyunji/core/framework/enhance/example/report/xtsy/ZhxsqkPluginJx.java @@ -25,7 +25,7 @@ import java.util.stream.Collectors; */ @Slf4j @Component("zhxsqkPluginJx") -public class zhxsqkPluginJx implements ReportAroundAdvicePlugin { +public class ZhxsqkPluginJx implements ReportAroundAdvicePlugin { @Resource INewGrBiSaAggYearCountService newGrBiSaAggYearCountService; diff --git a/lidee-core/src/main/java/com/lideeyunji/core/framework/enhance/example/report/xtsy/zhxsqkPluginLxfl.java b/lidee-core/src/main/java/com/lideeyunji/core/framework/enhance/example/report/xtsy/ZhxsqkPluginLxfl.java similarity index 92% rename from lidee-core/src/main/java/com/lideeyunji/core/framework/enhance/example/report/xtsy/zhxsqkPluginLxfl.java rename to lidee-core/src/main/java/com/lideeyunji/core/framework/enhance/example/report/xtsy/ZhxsqkPluginLxfl.java index ceab523..5ccf3ce 100644 --- a/lidee-core/src/main/java/com/lideeyunji/core/framework/enhance/example/report/xtsy/zhxsqkPluginLxfl.java +++ b/lidee-core/src/main/java/com/lideeyunji/core/framework/enhance/example/report/xtsy/ZhxsqkPluginLxfl.java @@ -12,14 +12,14 @@ import javax.annotation.Resource; import java.util.Arrays; import java.util.List; -import static com.lideeyunji.core.framework.enhance.example.report.xtsy.zhxsqkPluginJx.zhxsqkFun; +import static com.lideeyunji.core.framework.enhance.example.report.xtsy.ZhxsqkPluginJx.zhxsqkFun; /** * 报表-综合销售表_剂型-插件 */ @Slf4j @Component("zhxsqkPluginLxfl") -public class zhxsqkPluginLxfl implements ReportAroundAdvicePlugin { +public class ZhxsqkPluginLxfl implements ReportAroundAdvicePlugin { @Resource INewGrBiSaAggYearCountService newGrBiSaAggYearCountService; diff --git a/lidee-core/src/main/java/com/lideeyunji/core/framework/enhance/example/report/xtsy/zhxsqkPluginXslx.java b/lidee-core/src/main/java/com/lideeyunji/core/framework/enhance/example/report/xtsy/ZhxsqkPluginXslx.java similarity index 92% rename from lidee-core/src/main/java/com/lideeyunji/core/framework/enhance/example/report/xtsy/zhxsqkPluginXslx.java rename to lidee-core/src/main/java/com/lideeyunji/core/framework/enhance/example/report/xtsy/ZhxsqkPluginXslx.java index 92b0953..50b48fc 100644 --- a/lidee-core/src/main/java/com/lideeyunji/core/framework/enhance/example/report/xtsy/zhxsqkPluginXslx.java +++ b/lidee-core/src/main/java/com/lideeyunji/core/framework/enhance/example/report/xtsy/ZhxsqkPluginXslx.java @@ -12,14 +12,14 @@ import javax.annotation.Resource; import java.util.Arrays; import java.util.List; -import static com.lideeyunji.core.framework.enhance.example.report.xtsy.zhxsqkPluginJx.zhxsqkFun; +import static com.lideeyunji.core.framework.enhance.example.report.xtsy.ZhxsqkPluginJx.zhxsqkFun; /** * 报表-综合销售表_剂型-插件 */ @Slf4j @Component("zhxsqkPluginXslx") -public class zhxsqkPluginXslx implements ReportAroundAdvicePlugin { +public class ZhxsqkPluginXslx implements ReportAroundAdvicePlugin { @Resource INewGrBiSaAggYearCountService newGrBiSaAggYearCountService; diff --git a/lidee-core/src/main/resources/mapper/framework/NewGrBiSaAggMonthCountMapper.xml b/lidee-core/src/main/resources/mapper/framework/NewGrBiSaAggMonthCountMapper.xml index 3651534..7f970d3 100644 --- a/lidee-core/src/main/resources/mapper/framework/NewGrBiSaAggMonthCountMapper.xml +++ b/lidee-core/src/main/resources/mapper/framework/NewGrBiSaAggMonthCountMapper.xml @@ -313,6 +313,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ELSE (current_month.this_month_sa_qty - yoy_month.yoy_month_sa_qty) / yoy_month.yoy_month_sa_qty * 100 END)<0 THEN CONCAT('🔴 ', ROUND((CASE WHEN yoy_month.yoy_month_sa_qty = 0 THEN IF(current_month.this_month_sa_qty > 0, 100, 0) ELSE (current_month.this_month_sa_qty - yoy_month.yoy_month_sa_qty) / yoy_month.yoy_month_sa_qty * 100 END), 2)) + ELSE '0.00' END AS monthsaqty_yoy, CASE WHEN (CASE WHEN yoy_month.yoy_month_sa_money = 0 THEN IF(current_month.this_month_sa_money > 0, 100, 0) @@ -680,6 +681,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ELSE (current_month.this_month_sa_qty - yoy_month.yoy_month_sa_qty) / yoy_month.yoy_month_sa_qty * 100 END)<0 THEN CONCAT('🔴 ', ROUND((CASE WHEN yoy_month.yoy_month_sa_qty = 0 THEN IF(current_month.this_month_sa_qty > 0, 100, 0) ELSE (current_month.this_month_sa_qty - yoy_month.yoy_month_sa_qty) / yoy_month.yoy_month_sa_qty * 100 END), 2)) + ELSE '0.00' END AS monthsaqty_yoy, CASE WHEN (CASE WHEN yoy_month.yoy_month_sa_money = 0 THEN IF(current_month.this_month_sa_money > 0, 100, 0)