Merge branch 'refs/heads/dev_js_20260325'

lidee-core/pom.xml

@@ -97,5 +97,10 @@
             <artifactId>orai18n</artifactId>
             <version>21.1.0.0</version>
         </dependency>
+        <dependency>
+            <groupId>com.github.pagehelper</groupId>
+            <artifactId>pagehelper-spring-boot-starter</artifactId>
+            <version>1.4.7</version>
+        </dependency>
     </dependencies>
 </project>

lidee-core/src/main/java/com/lideeyunji/core/framework/config/aspect/enhancereport/LideeYunJiReportEnhance.java

@@ -11,10 +11,7 @@ import com.lideeyunji.core.framework.config.aspect.enhancereport.enums.RefreshPl
 import com.lideeyunji.core.framework.config.aspect.enhancereport.model.BuildEnhanceReportContext;
 import com.lideeyunji.core.framework.config.aspect.enhancereport.model.EnhanceReportContext;
 import com.lideeyunji.core.framework.config.aspect.enhancereport.model.EnhanceReportParam;
-import com.lideeyunji.core.framework.config.aspect.enhancereport.plugin.ReportAfterAdvicePlugin;
-import com.lideeyunji.core.framework.config.aspect.enhancereport.plugin.ReportBaseAdvicePlugin;
-import com.lideeyunji.core.framework.config.aspect.enhancereport.plugin.ReportBeforeAdvicePlugin;
-import com.lideeyunji.core.framework.config.aspect.enhancereport.plugin.ReportPluginManager;
+import com.lideeyunji.core.framework.config.aspect.enhancereport.plugin.*;
 import com.lideeyunji.core.framework.entity.ReportEntity;
 import com.lideeyunji.core.framework.service.IReportService;
 import com.lideeyunji.core.framework.utils.Func;
@@ -24,7 +21,9 @@ import com.lideeyunji.tool.framework.yunji.tool.spring.SpringUtils;
 import com.lideeyunji.tool.framework.yunji.utils.FuncBase;
 import lombok.extern.slf4j.Slf4j;
 import org.aspectj.lang.JoinPoint;
+import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.annotation.AfterReturning;
+import org.aspectj.lang.annotation.Around;
 import org.aspectj.lang.annotation.Aspect;
 import org.aspectj.lang.annotation.Before;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -140,6 +139,30 @@ public class LideeYunJiReportEnhance extends LideeYunJiBaseEnhance {
         ReportPluginManager.executePlugin(javaClass, context);
     }
 
+    @Around("@annotation(lideeyunJiReportEnhance)")
+    public Object around(ProceedingJoinPoint joinPoint, LideeyunJiReportEnhance lideeyunJiReportEnhance) throws Throwable {
+        //获取参数
+        BuildEnhanceReportContext buildEnhanceContext = this.getContextAndPlugins(joinPoint);
+        if (FuncBase.isEmpty(buildEnhanceContext)) {//没有增强
+            return joinPoint.proceed();
+        }
+
+        //增强列表
+        String javaClass = buildEnhanceContext.getJavaClass();
+        if (Func.isEmpty(javaClass)) {//无增强
+            return joinPoint.proceed();
+        }
+        //有增强，但是增强不是报表增强，直接返回原值
+        ReportBaseAdvicePlugin plugin = ReportPluginManager.getPlugin(javaClass);
+        if (!(plugin instanceof ReportAroundAdvicePlugin)) {
+            return joinPoint.proceed();
+        }
+
+        EnhanceReportContext context = buildEnhanceContext.getContext();
+        //执行增强
+        return ReportPluginManager.executeAroundPlugin(javaClass, context);
+    }
+
     private BuildEnhanceReportContext getContextAndPlugins(JoinPoint joinPoint) {
         Map<String, Object> paramMap = super.getJoinPointParam(joinPoint);
 

lidee-core/src/main/java/com/lideeyunji/core/framework/config/aspect/enhancereport/plugin/ReportAroundAdvicePlugin.java

@@ -0,0 +1,12 @@
+package com.lideeyunji.core.framework.config.aspect.enhancereport.plugin;
+
+import com.lideeyunji.core.framework.config.aspect.enhancereport.model.EnhanceReportContext;
+import com.lideeyunji.tool.framework.yunji.model.ResultDataModel;
+
+/**
+ * 报表统计 环绕增强（报表统计专属）
+ */
+public interface ReportAroundAdvicePlugin extends ReportBaseAdvicePlugin {
+
+    Object executeAround(EnhanceReportContext enhanceContext);
+}

lidee-core/src/main/java/com/lideeyunji/core/framework/config/aspect/enhancereport/plugin/ReportPluginManager.java

@@ -2,6 +2,7 @@
 package com.lideeyunji.core.framework.config.aspect.enhancereport.plugin;
 
 import com.lideeyunji.core.framework.config.aspect.enhancereport.model.EnhanceReportContext;
+import com.lideeyunji.tool.framework.yunji.model.ResultDataModel;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -39,4 +40,8 @@ public class ReportPluginManager {
         plugin.execute(enhanceContext);
     }
 
+    public static Object executeAroundPlugin(String name, EnhanceReportContext enhanceContext) {
+        ReportAroundAdvicePlugin plugin = (ReportAroundAdvicePlugin)plugins.get(name);
+        return plugin.executeAround(enhanceContext);
+    }
 }

lidee-core/src/main/java/com/lideeyunji/core/framework/controller/ByglController.java

@@ -32,7 +32,7 @@ public class ByglController extends BaseController {
             return BaseWebResult.error(FrameErrorCodeConstants.FRAME_OP_ERROR);
         }
         byglByfaService.changeFaState(id, state);
-        return BaseWebResult.success("成功");
+        return BaseWebResult.success("状态修改成功");
     }
 
 

lidee-core/src/main/java/com/lideeyunji/core/framework/controller/NewGrBiSaAggMonthCountController.java

@@ -45,36 +45,42 @@ public class NewGrBiSaAggMonthCountController extends BaseController
     public BaseWebResult getTotalDetail(HttpServletRequest req)
     {
         Map<String, Object> params = FuncWeb.getParameterBodyMap(req);
-        String groupField = params.containsKey("Group by") ? "usemonth" :params.get("Group by").toString();
+        String groupField = params.containsKey("Group by") ? params.get("Group by").toString() : "useMonth";
         SaAggParam saAggParam = new SaAggParam();
-        if (params.containsKey("usemonth")){
-            saAggParam.setUseMonth(params.get("usemonth").toString());
+        if (params.containsKey("useMonth")){
+            saAggParam.setUseMonth(params.get("useMonth").toString());
         }
-        if(params.containsKey("useyear")){
-            saAggParam.setUseYear(params.get("useyear").toString());
+        if(params.containsKey("useYear")){
+            saAggParam.setUseYear(params.get("useYear").toString());
         }else{
             saAggParam.setUseYear(new SimpleDateFormat("yyyy").format(new Date()));
         }
-        if(params.containsKey("customname")){
-            saAggParam.setCustomName(Arrays.asList(params.get("customname").toString().split(",")));
+        if(params.containsKey("customName")){
+            saAggParam.setCustomName(Arrays.asList(params.get("customName").toString().split(",")));
         }
-        if (params.containsKey("zonename")){
-            saAggParam.setZoneName(Arrays.asList(params.get("zonename").toString().split( ",")));
+        if (params.containsKey("zoneName")){
+            saAggParam.setZoneName(Arrays.asList(params.get("zoneName").toString().split( ",")));
         }
-        if (params.containsKey("saletypename")){
-            saAggParam.setSaleTypeName(Arrays.asList(params.get("saletypename").toString().split( ",")));
+        if (params.containsKey("saleTypeName")){
+            saAggParam.setSaleTypeName(Arrays.asList(params.get("saleTypeName").toString().split( ",")));
         }
 
-        if (params.containsKey("salername")){
-            saAggParam.setSalerName(Arrays.asList(params.get("salername").toString().split( ",")));
+        if (params.containsKey("salerName")){
+            saAggParam.setSalerName(Arrays.asList(params.get("salerName").toString().split( ",")));
         }
-        if (params.containsKey("dosagename")){
-            saAggParam.setDosageName(Arrays.asList(params.get("dosagename").toString().split( ",")));
+        if (params.containsKey("dosageName")){
+            saAggParam.setDosageName(Arrays.asList(params.get("dosageName").toString().split( ",")));
         }
         if (params.containsKey("stdGoodsName")){
             saAggParam.setStdGoodsName(Arrays.asList(params.get("stdGoodsName").toString().split( ",")));
         }
-        if (params.containsKey("usemonth") || groupField.contains("usemonth")){
+        if (params.containsKey("goodsName")){
+            saAggParam.setGoodsName(Arrays.asList(params.get("goodsName").toString().split( ",")));
+        }
+        if (params.containsKey("provinceName")){
+            saAggParam.setProvinceName(Arrays.asList(params.get("provinceName").toString().split( ",")));
+        }
+        if (params.containsKey("useMonth") || groupField.contains("useMonth")){
             List<NewGrBiSaAggMonthCount> list = newGrBiSaAggMonthCountService.getTotalDetail(saAggParam);
             return BaseWebResult.success(list);
         }else{

lidee-core/src/main/java/com/lideeyunji/core/framework/enhance/example/report/xtsy/zhxsqkLineReportEnhance.java

@@ -30,37 +30,37 @@ public class zhxsqkLineReportEnhance implements ReportBeforeAdvicePlugin {
             }
             List<String> groupFieldList = Arrays.asList(params.get("Group by").toString().split(","));
             String sql;
-            if(!params.containsKey("useyear")){
-                params.put("useyear", new SimpleDateFormat("yyyy").format(new Date()));
+            if(!params.containsKey("useYear")){
+                params.put("useYear", new SimpleDateFormat("yyyy").format(new Date()));
             }
-            if((groupFieldList.contains("usemonth") || params.containsKey("usemonth"))){
+            if((groupFieldList.contains("useMonth") || params.containsKey("useMonth"))){
                 sql = geroupMonthSql(params, groupFieldList);
             }else {
                 StringBuilder executePluginSql = new StringBuilder();
                 executePluginSql.append(" SELECT \n");
-                executePluginSql.append(" current_year_data.use_year as useyear, \n");
+                executePluginSql.append(" current_year_data.use_year as useYear, \n");
                 if (groupFieldList.contains("customname") || params.containsKey("customname")) {   //客户名称
                     executePluginSql.append(" current_year_data.custom_id as customid, \n");
-                    executePluginSql.append(" current_year_data.custom_name as customname, \n");
+                    executePluginSql.append(" current_year_data.custom_name as customName, \n");
                 }
-                if(groupFieldList.contains("useyear") || params.containsKey("useyear")){
+                if(groupFieldList.contains("useYear") || params.containsKey("useYear")){
                     executePluginSql.append("  current_year_data.use_year as ny, \n");  //年月
                 }
-                if (groupFieldList.contains("zonename") || params.containsKey("zonename")) { //业务区域
+                if (groupFieldList.contains("zoneName") || params.containsKey("zoneName")) { //业务区域
                     executePluginSql.append("  current_year_data.zone_id, \n");
-                    executePluginSql.append("  current_year_data.zone_name as zonename, \n");
+                    executePluginSql.append("  current_year_data.zone_name as zoneName, \n");
                 }
-                if (groupFieldList.contains("saletypename") || params.containsKey("saletypename")) { //销售类型
+                if (groupFieldList.contains("saleTypeName") || params.containsKey("saleTypeName")) { //销售类型
                     executePluginSql.append("  current_year_data.sale_type_id, \n");
-                    executePluginSql.append("  current_year_data.sale_type_name as saletypename, \n");
+                    executePluginSql.append("  current_year_data.sale_type_name as saleTypeName, \n");
                 }
-                if (groupFieldList.contains("salername") || params.containsKey("salername")) {  //业务员
+                if (groupFieldList.contains("salerName") || params.containsKey("salerName")) {  //业务员
                     executePluginSql.append("  current_year_data.saler_id, \n");
-                    executePluginSql.append("  current_year_data.saler_name as salername, \n");
+                    executePluginSql.append("  current_year_data.saler_name as salerName, \n");
                 }
-                if (groupFieldList.contains("dosagename") || params.containsKey("dosagename")) { //剂型
+                if (groupFieldList.contains("dosageName") || params.containsKey("dosageName")) { //剂型
                     executePluginSql.append("  current_year_data.dosage_id, \n");
-                    executePluginSql.append("  current_year_data.dosage_name as dosagename, \n");
+                    executePluginSql.append("  current_year_data.dosage_name as dosageName, \n");
                 }
                 if (groupFieldList.contains("stdGoodsName") || params.containsKey("stdGoodsName")) {  //标准品名
                     executePluginSql.append("  current_year_data.std_goods_name as stdGoodsName, \n");
@@ -134,7 +134,7 @@ public class zhxsqkLineReportEnhance implements ReportBeforeAdvicePlugin {
                 executePluginSql.append(" FROM \n");
                 executePluginSql.append(" (SELECT use_year                                                                  , \n");
                 executePluginSql.append("         use_year                                                                  AS ny, \n");
-                if (groupFieldList.contains("customname") || params.containsKey("customname")) {   //客户名称
+                if (groupFieldList.contains("customName") || params.containsKey("customName")) {   //客户名称
                     executePluginSql.append(" custom_id, \n");
                     executePluginSql.append(" custom_name , \n");
                 }
@@ -143,20 +143,20 @@ public class zhxsqkLineReportEnhance implements ReportBeforeAdvicePlugin {
                     executePluginSql.append("  std_goods_name, \n");
                 }
 
-                if (groupFieldList.contains("zonename") || params.containsKey("zonename")) { //业务区域
+                if (groupFieldList.contains("zoneName") || params.containsKey("zoneName")) { //业务区域
                     executePluginSql.append("  zone_id, \n");
                     executePluginSql.append("  zone_name, \n");
                 }
-                if (groupFieldList.contains("saletypename") || params.containsKey("saletypename")) { //销售类型
+                if (groupFieldList.contains("saleTypeName") || params.containsKey("saleTypeName")) { //销售类型
                     executePluginSql.append("  sale_type_id, \n");
                     executePluginSql.append("  sale_type_name, \n");
                 }
-                if (groupFieldList.contains("dosagename") || params.containsKey("dosagename")) { //剂型
+                if (groupFieldList.contains("dosageName") || params.containsKey("dosageName")) { //剂型
                     executePluginSql.append("  dosage_id, \n");
                     executePluginSql.append("  dosage_name, \n");
                 }
 
-                if (groupFieldList.contains("salername") || params.containsKey("salername")) {  //业务员
+                if (groupFieldList.contains("salerName") || params.containsKey("salerName")) {  //业务员
                     executePluginSql.append("  saler_id, \n");
                     executePluginSql.append("  saler_name, \n");
                 }
@@ -170,27 +170,27 @@ public class zhxsqkLineReportEnhance implements ReportBeforeAdvicePlugin {
                 appendWhere(params,executePluginSql);
                 executePluginSql.append("  GROUP BY use_year,");
 
-                if (groupFieldList.contains("customname") || params.containsKey("customname")) {   //客户名称
+                if (groupFieldList.contains("customName") || params.containsKey("customName")) {   //客户名称
                     executePluginSql.append(" custom_id,");
                     executePluginSql.append(" custom_name,");
                 }
                 if (groupFieldList.contains("stdGoodsName") || params.containsKey("stdGoodsName")) {  //标准品名
                     executePluginSql.append("  std_goods_name,");
                 }
-                if (groupFieldList.contains("zonename") || params.containsKey("zonename")) { //业务区域
+                if (groupFieldList.contains("zoneName") || params.containsKey("zoneName")) { //业务区域
                     executePluginSql.append("  zone_id,");
                     executePluginSql.append("  zone_name,");
                 }
-                if (groupFieldList.contains("saletypename") || params.containsKey("saletypename")) { //销售类型
+                if (groupFieldList.contains("saleTypeName") || params.containsKey("saleTypeName")) { //销售类型
                     executePluginSql.append("  sale_type_id,");
                     executePluginSql.append("  sale_type_name,");
                 }
-                if (groupFieldList.contains("dosagename") || params.containsKey("dosagename")) { //剂型
+                if (groupFieldList.contains("dosageName") || params.containsKey("dosageName")) { //剂型
                     executePluginSql.append("  dosage_id,");
                     executePluginSql.append("  dosage_name,");
                 }
 
-                if (groupFieldList.contains("salername") || params.containsKey("salername")) {  //业务员
+                if (groupFieldList.contains("salerName") || params.containsKey("salerName")) {  //业务员
                     executePluginSql.append("  saler_id,");
                     executePluginSql.append("  saler_name,");
                 }
@@ -210,12 +210,12 @@ public class zhxsqkLineReportEnhance implements ReportBeforeAdvicePlugin {
                 executePluginSql.append("         SUM(this_year_cost)     AS last_year_cost,  \n");
                 executePluginSql.append("         SUM(this_year_profit)   AS last_year_profit  \n");
                 executePluginSql.append(" FROM new_gr_bi_sa_agg_year_count  \n");
-                if(params.containsKey("useyear")){
-                    params.put("useyear", Integer.parseInt(params.get("useyear").toString()) - 1);
+                if(params.containsKey("useYear")){
+                    params.put("useYear", Integer.parseInt(params.get("useYear").toString()) - 1);
                 }
                 appendWhere(params, executePluginSql);
-                if(params.containsKey("useyear")){
-                    params.put("useyear", Integer.parseInt(params.get("useyear").toString() ) + 1);
+                if(params.containsKey("useYear")){
+                    params.put("useYear", Integer.parseInt(params.get("useYear").toString() ) + 1);
                 }
                 executePluginSql.append("    GROUP BY use_year,");
 //                executePluginSql.append("         custom_id,  \n");
@@ -227,23 +227,23 @@ public class zhxsqkLineReportEnhance implements ReportBeforeAdvicePlugin {
                 appendGroupByField(params, groupFieldList,executePluginSql);
                 executePluginSql.append("         ) AS last_year_data  \n");
                 executePluginSql.append("       ON last_year_data.use_year = current_year_data.use_year - 1  \n");
-                if (groupFieldList.contains("customname") || params.containsKey("customname")) {   //客户名称
+                if (groupFieldList.contains("customName") || params.containsKey("customName")) {   //客户名称
                     executePluginSql.append("       AND current_year_data.custom_id = last_year_data.custom_id \n");
                 }
                 if (groupFieldList.contains("stdGoodsName") || params.containsKey("stdGoodsName")) {  //标准品名
                     executePluginSql.append("       AND current_year_data.std_goods_name = last_year_data.std_goods_name \n");
                 }
-                if (groupFieldList.contains("zonename") || params.containsKey("zonename")) { //业务区域
+                if (groupFieldList.contains("zoneName") || params.containsKey("zoneName")) { //业务区域
                     executePluginSql.append("       AND current_year_data.zone_id = last_year_data.zone_id \n");
                 }
 //        executePluginSql.append("       AND current_month.province_id = last_year_data.province_id \n");
-                if (groupFieldList.contains("saletypename") || params.containsKey("saletypename")) { //销售类型
+                if (groupFieldList.contains("saleTypeName") || params.containsKey("saleTypeName")) { //销售类型
                     executePluginSql.append("       AND current_year_data.sale_type_id = last_year_data.sale_type_id \n");
                 }
-                if (groupFieldList.contains("dosagename") || params.containsKey("dosagename")) { //剂型
+                if (groupFieldList.contains("dosageName") || params.containsKey("dosageName")) { //剂型
                     executePluginSql.append("       AND current_year_data.dosage_id = last_year_data.dosage_id \n");
                 }
-                if (groupFieldList.contains("salername") || params.containsKey("salername")) {  //业务员
+                if (groupFieldList.contains("salerName") || params.containsKey("salerName")) {  //业务员
                     executePluginSql.append("       AND current_year_data.saler_id = last_year_data.saler_id \n");
                 }
 //                executePluginSql.append("       ON current_year_data.std_goods_name = last_year_data.std_goods_name  \n");
@@ -261,29 +261,29 @@ public class zhxsqkLineReportEnhance implements ReportBeforeAdvicePlugin {
                 executePluginSql.append(" ON total_year_data.use_year = current_year_data.use_year  \n");
 
 //                executePluginSql.append(" GROUP BY \n");
-//                if (groupFieldList.contains("customname") || params.containsKey("customname")) {
+//                if (groupFieldList.contains("customName") || params.containsKey("customName")) {
 //                    executePluginSql.append(" current_year_data.custom_id,");
 //                    executePluginSql.append(" current_year_data.custom_name,");
 //                }
-//                if (groupFieldList.contains("useyear") || params.containsKey("useyear")) {
+//                if (groupFieldList.contains("useYear") || params.containsKey("useYear")) {
 //                    executePluginSql.append(" current_year_data.use_year,");
 //                }
-//                if (groupFieldList.contains("usemonth") || params.containsKey("usemonth")) {
+//                if (groupFieldList.contains("useMonth") || params.containsKey("useMonth")) {
 //                    executePluginSql.append(" current_year_data.use_month,");
 //                }
-//                if (groupFieldList.contains("zonename") || params.containsKey("zonename")) {
+//                if (groupFieldList.contains("zoneName") || params.containsKey("zoneName")) {
 //                    executePluginSql.append("  current_year_data.zone_id,");
 //                    executePluginSql.append("  current_year_data.zone_name,");
 //                }
-//                if (groupFieldList.contains("saletypename") || params.containsKey("saletypename")) {
+//                if (groupFieldList.contains("saleTypeName") || params.containsKey("saleTypeName")) {
 //                    executePluginSql.append("  current_year_data.sale_type_id,");
 //                    executePluginSql.append("  current_year_data.sale_type_name,");
 //                }
-//                if (groupFieldList.contains("salername") || params.containsKey("salername")) {
+//                if (groupFieldList.contains("salerName") || params.containsKey("salerName")) {
 //                    executePluginSql.append("  current_year_data.saler_id,");
 //                    executePluginSql.append("  current_year_data.saler_name,");
 //                }
-//                if (groupFieldList.contains("dosagename") || params.containsKey("dosagename")) {
+//                if (groupFieldList.contains("dosageName") || params.containsKey("dosageName")) {
 //                    executePluginSql.append("  current_year_data.dosage_id,");
 //                    executePluginSql.append("  current_year_data.dosage_name,");
 //                }
@@ -303,34 +303,34 @@ public class zhxsqkLineReportEnhance implements ReportBeforeAdvicePlugin {
     private String geroupMonthSql(Map<String, Object> params, List<String> groupFieldList) {
         StringBuilder executePluginSql = new StringBuilder();
         executePluginSql.append("select");
-        if (groupFieldList.contains("usemonth") || params.containsKey("usemonth")) { //月
-            executePluginSql.append(" current_month.use_year as useyear,");
-            executePluginSql.append(" current_month.use_month as usemonth, \n");
-            if(groupFieldList.contains("useyear") || params.containsKey("useyear")){
+        if (groupFieldList.contains("useMonth") || params.containsKey("useMonth")) { //月
+            executePluginSql.append(" current_month.use_year as useYear,");
+            executePluginSql.append(" current_month.use_month as useMonth, \n");
+            if(groupFieldList.contains("useYear") || params.containsKey("useYear")){
                 executePluginSql.append(" current_month.ny, \n");  //年月
             }else{
                 executePluginSql.append("  LPAD(current_month.use_month, 2, '0') as ny, \n");
             }
         }
-        if (groupFieldList.contains("customname") || params.containsKey("customname")) {   //客户名称
+        if (groupFieldList.contains("customName") || params.containsKey("customName")) {   //客户名称
             executePluginSql.append(" current_month.custom_id as customid, \n");
-            executePluginSql.append(" current_month.custom_name as customname, \n");
+            executePluginSql.append(" current_month.custom_name as customName, \n");
         }
-        if (groupFieldList.contains("zonename") || params.containsKey("zonename")) { //业务区域
+        if (groupFieldList.contains("zoneName") || params.containsKey("zoneName")) { //业务区域
             executePluginSql.append("  current_month.zone_id, \n");
-            executePluginSql.append("  current_month.zone_name as zonename, \n");
+            executePluginSql.append("  current_month.zone_name as zoneName, \n");
         }
-        if (groupFieldList.contains("saletypename") || params.containsKey("saletypename")) { //销售类型
+        if (groupFieldList.contains("saleTypeName") || params.containsKey("saleTypeName")) { //销售类型
             executePluginSql.append("  current_month.sale_type_id, \n");
-            executePluginSql.append("  current_month.sale_type_name as saletypename, \n");
+            executePluginSql.append("  current_month.sale_type_name as saleTypeName, \n");
         }
-        if (groupFieldList.contains("salername") || params.containsKey("salername")) {  //业务员
+        if (groupFieldList.contains("salerName") || params.containsKey("salerName")) {  //业务员
             executePluginSql.append("  current_month.saler_id, \n");
-            executePluginSql.append("  current_month.saler_name as salername, \n");
+            executePluginSql.append("  current_month.saler_name as salerName, \n");
         }
-        if (groupFieldList.contains("dosagename") || params.containsKey("dosagename")) { //剂型
+        if (groupFieldList.contains("dosageName") || params.containsKey("dosageName")) { //剂型
             executePluginSql.append("  current_month.dosage_id, \n");
-            executePluginSql.append("  current_month.dosage_name as dosagename, \n");
+            executePluginSql.append("  current_month.dosage_name as dosageName, \n");
         }
         if (groupFieldList.contains("stdGoodsName") || params.containsKey("stdGoodsName")) {  //标准品名
             executePluginSql.append("  current_month.std_goods_name as stdGoodsName, \n");
@@ -409,7 +409,7 @@ public class zhxsqkLineReportEnhance implements ReportBeforeAdvicePlugin {
         executePluginSql.append("       use_year AS use_year, \n");
         executePluginSql.append("       use_month AS use_month, \n");
 
-        if (groupFieldList.contains("customname") || params.containsKey("customname")) {   //客户名称
+        if (groupFieldList.contains("customName") || params.containsKey("customName")) {   //客户名称
             executePluginSql.append(" custom_id, \n");
             executePluginSql.append(" custom_name , \n");
         }
@@ -418,20 +418,20 @@ public class zhxsqkLineReportEnhance implements ReportBeforeAdvicePlugin {
             executePluginSql.append("  std_goods_name, \n");
         }
 
-        if (groupFieldList.contains("zonename") || params.containsKey("zonename") ) { //业务区域
+        if (groupFieldList.contains("zoneName") || params.containsKey("zoneName") ) { //业务区域
             executePluginSql.append("  zone_id, \n");
             executePluginSql.append("  zone_name, \n");
         }
-        if (groupFieldList.contains("saletypename") || params.containsKey("saletypename")) { //销售类型
+        if (groupFieldList.contains("saleTypeName") || params.containsKey("saleTypeName")) { //销售类型
             executePluginSql.append("  sale_type_id, \n");
             executePluginSql.append("  sale_type_name, \n");
         }
-        if (groupFieldList.contains("dosagename") || params.containsKey("dosagename")) { //剂型
+        if (groupFieldList.contains("dosageName") || params.containsKey("dosageName")) { //剂型
             executePluginSql.append("  dosage_id, \n");
             executePluginSql.append("  dosage_name, \n");
         }
 
-        if (groupFieldList.contains("salername") || params.containsKey("salername")) {  //业务员
+        if (groupFieldList.contains("salerName") || params.containsKey("salerName")) {  //业务员
             executePluginSql.append("  saler_id, \n");
             executePluginSql.append("  saler_name, \n");
         }
@@ -447,27 +447,27 @@ public class zhxsqkLineReportEnhance implements ReportBeforeAdvicePlugin {
         appendWhere(params, executePluginSql);
         executePluginSql.append("     GROUP BY use_year,use_month,");
 
-        if (groupFieldList.contains("customname") || params.containsKey("customname")) {   //客户名称
+        if (groupFieldList.contains("customName") || params.containsKey("customName")) {   //客户名称
             executePluginSql.append(" custom_id,");
             executePluginSql.append(" custom_name,");
         }
         if (groupFieldList.contains("stdGoodsName") || params.containsKey("stdGoodsName")) {  //标准品名
             executePluginSql.append("  std_goods_name,");
         }
-        if (groupFieldList.contains("zonename") || params.containsKey("zonename")) { //业务区域
+        if (groupFieldList.contains("zoneName") || params.containsKey("zoneName")) { //业务区域
             executePluginSql.append("  zone_id,");
             executePluginSql.append("  zone_name,");
         }
-        if (groupFieldList.contains("saletypename") || params.containsKey("saletypename")) { //销售类型
+        if (groupFieldList.contains("saleTypeName") || params.containsKey("saleTypeName")) { //销售类型
             executePluginSql.append("  sale_type_id,");
             executePluginSql.append("  sale_type_name,");
         }
-        if (groupFieldList.contains("dosagename") || params.containsKey("dosagename")) { //剂型
+        if (groupFieldList.contains("dosageName") || params.containsKey("dosageName")) { //剂型
             executePluginSql.append("  dosage_id,");
             executePluginSql.append("  dosage_name,");
         }
 
-        if (groupFieldList.contains("salername") || params.containsKey("salername")) {  //业务员
+        if (groupFieldList.contains("salerName") || params.containsKey("salerName")) {  //业务员
             executePluginSql.append("  saler_id,");
             executePluginSql.append("  saler_name,");
         }
@@ -489,23 +489,23 @@ public class zhxsqkLineReportEnhance implements ReportBeforeAdvicePlugin {
         executePluginSql.append("       ON last_month_data.use_year = current_month.use_year - (current_month.use_month = 1)\n");
         executePluginSql.append("       AND last_month_data.use_month = IF(current_month.use_month = 1, 12, current_month.use_month - 1)\n");
 
-        if (groupFieldList.contains("customname") || params.containsKey("customname") ) {   //客户名称
+        if (groupFieldList.contains("customName") || params.containsKey("customName") ) {   //客户名称
             executePluginSql.append("       AND current_month.custom_id = last_month_data.custom_id \n");
         }
         if (groupFieldList.contains("stdGoodsName") || params.containsKey("stdGoodsName")) {  //标准品名
             executePluginSql.append("       AND current_month.std_goods_name = last_month_data.std_goods_name \n");
         }
-        if (groupFieldList.contains("zonename") || params.containsKey("zonename")) { //业务区域
+        if (groupFieldList.contains("zoneName") || params.containsKey("zoneName")) { //业务区域
             executePluginSql.append("       AND current_month.zone_id = last_month_data.zone_id \n");
         }
 //        executePluginSql.append("       AND current_month.province_id = last_month_data.province_id \n");
-        if (groupFieldList.contains("saletypename") || params.containsKey("saletypename")) { //销售类型
+        if (groupFieldList.contains("saleTypeName") || params.containsKey("saleTypeName")) { //销售类型
             executePluginSql.append("       AND current_month.sale_type_id = last_month_data.sale_type_id \n");
         }
-        if (groupFieldList.contains("dosagename") || params.containsKey("dosagename")) { //剂型
+        if (groupFieldList.contains("dosageName") || params.containsKey("dosageName")) { //剂型
             executePluginSql.append("       AND current_month.dosage_id = last_month_data.dosage_id \n");
         }
-        if (groupFieldList.contains("salername") || params.containsKey("salername")) {  //业务员
+        if (groupFieldList.contains("salerName") || params.containsKey("salerName")) {  //业务员
             executePluginSql.append("       AND current_month.saler_id = last_month_data.saler_id \n");
         }
         executePluginSql.append("   LEFT JOIN (SELECT use_year, \n");
@@ -524,12 +524,12 @@ public class zhxsqkLineReportEnhance implements ReportBeforeAdvicePlugin {
         executePluginSql.append("       SUM(this_month_cost)     as yoy_month_cost,     \n");  // 同比月销售成本
         executePluginSql.append("       SUM(this_month_profit)   AS yoy_month_profit    \n");  // 同比月毛利额
         executePluginSql.append("   FROM new_gr_bi_sa_agg_month_count ");
-        if(params.containsKey("useyear")){
-            params.put("useyear", Integer.parseInt(params.get("useyear").toString()) - 1);
+        if(params.containsKey("useYear")){
+            params.put("useYear", Integer.parseInt(params.get("useYear").toString()) - 1);
         }
         appendWhere(params, executePluginSql);
-        if(params.containsKey("useyear")){
-            params.put("useyear", Integer.parseInt(params.get("useyear").toString() ) + 1);
+        if(params.containsKey("useYear")){
+            params.put("useYear", Integer.parseInt(params.get("useYear").toString() ) + 1);
         }
         executePluginSql.append("   GROUP BY use_year,use_month,");
         appendGroupByField(params, groupFieldList, executePluginSql);
@@ -538,20 +538,20 @@ public class zhxsqkLineReportEnhance implements ReportBeforeAdvicePlugin {
         if (groupFieldList.contains("stdGoodsName") || params.containsKey("stdGoodsName")) {  //标准品名
             executePluginSql.append("   AND yoy_month.std_goods_name = current_month.std_goods_name \n");
         }
-        if (groupFieldList.contains("zonename") || params.containsKey("zonename")) { //业务区域
+        if (groupFieldList.contains("zoneName") || params.containsKey("zoneName")) { //业务区域
             executePluginSql.append("   AND yoy_month.zone_id = current_month.zone_id \n");
         }
 //        executePluginSql.append("   AND yoy_month.province_id = current_month.province_id \n");
-        if (groupFieldList.contains("saletypename") || params.containsKey("saletypename")) { //销售类型
+        if (groupFieldList.contains("saleTypeName") || params.containsKey("saleTypeName")) { //销售类型
             executePluginSql.append("   AND yoy_month.sale_type_id = current_month.sale_type_id \n");
         }
-        if (groupFieldList.contains("dosagename") || params.containsKey("dosagename")) { //剂型
+        if (groupFieldList.contains("dosageName") || params.containsKey("dosageName")) { //剂型
             executePluginSql.append("   AND yoy_month.dosage_id = current_month.dosage_id \n");
         }
-        if (groupFieldList.contains("customname") || params.containsKey("customname")) {   //客户名称
+        if (groupFieldList.contains("customName") || params.containsKey("customName")) {   //客户名称
             executePluginSql.append("   AND yoy_month.custom_id = current_month.custom_id \n");
         }
-        if (groupFieldList.contains("salername") || params.containsKey("salername")) {  //业务员
+        if (groupFieldList.contains("salerName") || params.containsKey("salerName")) {  //业务员
             executePluginSql.append("   AND yoy_month.saler_id = current_month.saler_id \n");
         }
         executePluginSql.append("   LEFT JOIN (\n");
@@ -564,36 +564,36 @@ public class zhxsqkLineReportEnhance implements ReportBeforeAdvicePlugin {
         executePluginSql.append("       use_year\n");
         executePluginSql.append("   ) total_month_data ON total_month_data.use_year = current_month.use_year \n");
 //        executePluginSql.append("    AND total_month_data.use_month = current_month.use_month \n");
-        if(params.containsKey("useyear")){
-            executePluginSql.append(" where current_month.use_year = " + params.get("useyear"));
-            if(params.containsKey("usemonth")){
-                executePluginSql.append(" and current_month.use_month = " + params.get("usemonth"));
+        if(params.containsKey("useYear")){
+            executePluginSql.append(" where current_month.use_year = " + params.get("useYear"));
+            if(params.containsKey("useMonth")){
+                executePluginSql.append(" and current_month.use_month = " + params.get("useMonth"));
             }
         }
 //        executePluginSql.append(" GROUP BY \n");
-//        if (groupFieldList.contains("customname") || params.containsKey("customname")) {
+//        if (groupFieldList.contains("customName") || params.containsKey("customName")) {
 //            executePluginSql.append(" current_month.custom_id,");
 //            executePluginSql.append(" current_month.custom_name,");
 //        }
-//        if (groupFieldList.contains("useyear") || params.containsKey("useyear")) {
+//        if (groupFieldList.contains("useYear") || params.containsKey("useYear")) {
 //            executePluginSql.append(" current_month.use_year,");
 //        }
-//        if (groupFieldList.contains("usemonth") || params.containsKey("usemonth")) {
+//        if (groupFieldList.contains("useMonth") || params.containsKey("useMonth")) {
 //            executePluginSql.append(" current_month.use_month,");
 //        }
-//        if (groupFieldList.contains("zonename") || params.containsKey("zonename")) {
+//        if (groupFieldList.contains("zoneName") || params.containsKey("zoneName")) {
 //            executePluginSql.append("  current_month.zone_id,");
 //            executePluginSql.append("  current_month.zone_name,");
 //        }
-//        if (groupFieldList.contains("saletypename") || params.containsKey("saletypename")) {
+//        if (groupFieldList.contains("saleTypeName") || params.containsKey("saleTypeName")) {
 //            executePluginSql.append("  current_month.sale_type_id,");
 //            executePluginSql.append("  current_month.sale_type_name,");
 //        }
-//        if (groupFieldList.contains("salername") || params.containsKey("salername")) {
+//        if (groupFieldList.contains("salerName") || params.containsKey("salerName")) {
 //            executePluginSql.append("  current_month.saler_id,");
 //            executePluginSql.append("  current_month.saler_name,");
 //        }
-//        if (groupFieldList.contains("dosagename") || params.containsKey("dosagename")) {
+//        if (groupFieldList.contains("dosageName") || params.containsKey("dosageName")) {
 //            executePluginSql.append("  current_month.dosage_id,");
 //            executePluginSql.append("  current_month.dosage_name,");
 //        }
@@ -607,7 +607,7 @@ public class zhxsqkLineReportEnhance implements ReportBeforeAdvicePlugin {
     }
 
     private void appendGroupByField(Map<String, Object> params, List<String> groupFieldList, StringBuilder executePluginSql) {
-        if (groupFieldList.contains("customname") || params.containsKey("customname")) {   //客户名称
+        if (groupFieldList.contains("customName") || params.containsKey("customName")) {   //客户名称
             executePluginSql.append(" custom_id,");
         }
 
@@ -615,68 +615,68 @@ public class zhxsqkLineReportEnhance implements ReportBeforeAdvicePlugin {
             executePluginSql.append("  std_goods_name,");
         }
 
-        if (groupFieldList.contains("zonename") || params.containsKey("zonename")) { //业务区域
+        if (groupFieldList.contains("zoneName") || params.containsKey("zoneName")) { //业务区域
             executePluginSql.append("  zone_id,");
         }
-        if (groupFieldList.contains("saletypename") || params.containsKey("saletypename")) { //销售类型
+        if (groupFieldList.contains("saleTypeName") || params.containsKey("saleTypeName")) { //销售类型
             executePluginSql.append("  sale_type_id,");
         }
-        if (groupFieldList.contains("dosagename") || params.containsKey("dosagename")) { //剂型
+        if (groupFieldList.contains("dosageName") || params.containsKey("dosageName")) { //剂型
             executePluginSql.append("  dosage_id,");
         }
 
-        if (groupFieldList.contains("salername") || params.containsKey("salername")) {  //业务员
+        if (groupFieldList.contains("salerName") || params.containsKey("salerName")) {  //业务员
             executePluginSql.append("  saler_id,");
         }
         executePluginSql.deleteCharAt(executePluginSql.length() - 1);
     }
 
     private void appendSelectField(Map<String, Object> params, List<String> groupFieldList, StringBuilder executePluginSql) {
-        if (groupFieldList.contains("customname") || params.containsKey("customname")) {   //客户名称
+        if (groupFieldList.contains("customName") || params.containsKey("customName")) {   //客户名称
             executePluginSql.append(" custom_id, \n");
         }
         if (groupFieldList.contains("stdGoodsName") || params.containsKey("stdGoodsName")) {  //标准品名
             executePluginSql.append(" std_goods_name, \n");
         }
-        if (groupFieldList.contains("zonename") || params.containsKey("zonename")) { //业务区域
+        if (groupFieldList.contains("zoneName") || params.containsKey("zoneName")) { //业务区域
             executePluginSql.append(" zone_id, \n");
         }
-        if (groupFieldList.contains("saletypename") || params.containsKey("saletypename")) { //销售类型
+        if (groupFieldList.contains("saleTypeName") || params.containsKey("saleTypeName")) { //销售类型
             executePluginSql.append(" sale_type_id, \n");
         }
-        if (groupFieldList.contains("dosagename") || params.containsKey("dosagename")) { //剂型
+        if (groupFieldList.contains("dosageName") || params.containsKey("dosageName")) { //剂型
             executePluginSql.append(" dosage_id, \n");
         }
-        if (groupFieldList.contains("salername") || params.containsKey("salername")) {  //业务员
+        if (groupFieldList.contains("salerName") || params.containsKey("salerName")) {  //业务员
             executePluginSql.append(" saler_id, \n");
         }
     }
 
     private void appendWhere(Map<String, Object> params, StringBuilder executePluginSql) {
         executePluginSql.append(" where");
-        if (params.containsKey("useyear")) {
-            executePluginSql.append(" use_year = '").append(Integer.parseInt(params.get("useyear").toString())).append("'");
+        if (params.containsKey("useYear")) {
+            executePluginSql.append(" use_year = '").append(Integer.parseInt(params.get("useYear").toString())).append("'");
         }
-        if (params.containsKey("usemonth")) {
-            executePluginSql.append(" AND use_month = '").append(Integer.parseInt(params.get("usemonth").toString())).append("'");
+        if (params.containsKey("useMonth")) {
+            executePluginSql.append(" AND use_month = '").append(Integer.parseInt(params.get("useMonth").toString())).append("'");
         }
-        if (params.containsKey("customname")) {
-            executePluginSql.append(" AND custom_name IN ('").append(params.get("customname").toString().replaceAll(",", "','")).append("')");
+        if (params.containsKey("customName")) {
+            executePluginSql.append(" AND custom_name IN ('").append(params.get("customName").toString().replaceAll(",", "','")).append("')");
         }
         if (params.containsKey("stdGoodsName")) {
             executePluginSql.append(" AND std_goods_name IN ('").append(params.get("stdGoodsName").toString().replaceAll(",", "','")).append("')");
         }
-        if (params.containsKey("zonename")) {
-            executePluginSql.append(" AND zone_name IN ('").append(params.get("zonename").toString().replaceAll(",", "','")).append("')");
+        if (params.containsKey("zoneName")) {
+            executePluginSql.append(" AND zone_name IN ('").append(params.get("zoneName").toString().replaceAll(",", "','")).append("')");
         }
-        if (params.containsKey("saletypename")) {
-            executePluginSql.append(" AND sale_type_name IN ('").append(params.get("saletypename").toString().replaceAll(",", "','")).append("')");
+        if (params.containsKey("saleTypeName")) {
+            executePluginSql.append(" AND sale_type_name IN ('").append(params.get("saleTypeName").toString().replaceAll(",", "','")).append("')");
         }
-        if (params.containsKey("dosagename")) {
-            executePluginSql.append(" AND dosage_name IN ('").append(params.get("dosagename").toString().replaceAll(",", "','")).append("')");
+        if (params.containsKey("dosageName")) {
+            executePluginSql.append(" AND dosage_name IN ('").append(params.get("dosageName").toString().replaceAll(",", "','")).append("')");
         }
-        if (params.containsKey("salername")) {
-            executePluginSql.append(" AND saler_name IN ('").append(params.get("salername").toString().replaceAll(",", "','")).append("')");
+        if (params.containsKey("salerName")) {
+            executePluginSql.append(" AND saler_name IN ('").append(params.get("salerName").toString().replaceAll(",", "','")).append("')");
         }
 
     }

lidee-core/src/main/java/com/lideeyunji/core/framework/enhance/example/report/xtsy/zhxsqkPlugin.java

@@ -1,21 +1,76 @@
 
 package com.lideeyunji.core.framework.enhance.example.report.xtsy;
 
+import cn.hutool.core.bean.BeanUtil;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import com.lideeyunji.core.framework.config.aspect.enhancereport.model.EnhanceReportContext;
+import com.lideeyunji.core.framework.config.aspect.enhancereport.plugin.ReportAroundAdvicePlugin;
 import com.lideeyunji.core.framework.config.aspect.enhancereport.plugin.ReportBeforeAdvicePlugin;
+import com.lideeyunji.core.framework.entity.NewGrBiSaAgg;
+import com.lideeyunji.core.framework.entity.NewGrBiSaAggMonthCount;
+import com.lideeyunji.core.framework.entity.NewGrBiSaAggYearCount;
+import com.lideeyunji.core.framework.service.INewGrBiSaAggMonthCountService;
+import com.lideeyunji.core.framework.service.INewGrBiSaAggService;
+import com.lideeyunji.core.framework.service.INewGrBiSaAggYearCountService;
+import com.lideeyunji.tool.framework.exception.lideeYunJiException;
+import com.lideeyunji.tool.framework.yunji.model.ResultDataModel;
+import com.lideeyunji.tool.framework.yunji.model.global.BaseWebResult;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
+import javax.annotation.Resource;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
 /**
  * 报表-系统首页-单表
  */
 @Slf4j
 @Component("zhxsqkPlugin")
-public class zhxsqkPlugin implements ReportBeforeAdvicePlugin {
+public class zhxsqkPlugin implements ReportAroundAdvicePlugin {
 
+    @Resource
+    INewGrBiSaAggService newGrBiSaAggService;
+
+    @Resource
+    INewGrBiSaAggMonthCountService newGrBiSaAggMonthCountService;
+
+    @Resource
+    INewGrBiSaAggYearCountService newGrBiSaAggYearCountService;
 
     @Override
-    public void execute(EnhanceReportContext enhanceContext) {
+    public ResultDataModel executeAround(EnhanceReportContext enhanceContext) {
+        log.info("进入=======>zhxsqkLineReportEnhance=======>execute");
+        Map<String, Object> params = enhanceContext.getParam().getParams();
 
+        if (params.containsKey("Group by")) {
+            if (params.containsKey("goodsName")) {
+                throw new lideeYunJiException("在选择维度时，“货品名称”不能有值！");
+            }
+            List<String> groupFieldList = Arrays.asList(params.get("Group by").toString().split(","));
+            PageHelper.startPage(Integer.parseInt(params.get("pageNo").toString()), Integer.parseInt(params.get("pageSize").toString()));
+            if((groupFieldList.contains("useMonth") || params.containsKey("useMonth"))){
+                List<NewGrBiSaAggMonthCount> newGrBiSaAggList = newGrBiSaAggMonthCountService.selectNewGrBiSaAggGroupMonthList(params, groupFieldList);
+                PageInfo<NewGrBiSaAggMonthCount> pageInfo =  new PageInfo<>(newGrBiSaAggList);
+                List<Map<String, Object>> list = newGrBiSaAggList.stream().map(BeanUtil::beanToMap).collect(Collectors.toList());
+                return ResultDataModel.fomat(pageInfo.getTotal(),list);
+            }else{
+                List<NewGrBiSaAggYearCount> newGrBiSaAggList = newGrBiSaAggYearCountService.selectNewGrBiSaAggGroupYearList(params, groupFieldList);
+                PageInfo<NewGrBiSaAggYearCount> pageInfo =  new PageInfo<>(newGrBiSaAggList);
+                List<Map<String, Object>> list = newGrBiSaAggList.stream().map(BeanUtil::beanToMap).collect(Collectors.toList());
+                return ResultDataModel.fomat(pageInfo.getTotal(),list);
+            }
+
+        }else {
+            PageHelper.startPage(Integer.parseInt(params.get("pageNo").toString()), Integer.parseInt(params.get("pageSize").toString()));
+            List<NewGrBiSaAggMonthCount> newGrBiSaAggList = newGrBiSaAggService.selectNewGrBiSaAggList(params);
+            PageInfo<NewGrBiSaAggMonthCount> pageInfo =  new PageInfo<>(newGrBiSaAggList);
+            List<Map<String, Object>> list = newGrBiSaAggList.stream().map(BeanUtil::beanToMap).collect(Collectors.toList());
+            return ResultDataModel.fomat(pageInfo.getTotal(),list);
+        }
     }
 }

lidee-core/src/main/java/com/lideeyunji/core/framework/entity/NewGrBiSaAgg.java

@@ -74,7 +74,7 @@ public class NewGrBiSaAgg implements Serializable
 
 
     @TableField(value = "province_id")
-    private Long provinceId;
+    private String provinceId;
 
 
     @TableField(value = "province_name")

lidee-core/src/main/java/com/lideeyunji/core/framework/entity/NewGrBiSaAggMonthCount.java

@@ -27,6 +27,10 @@ public class NewGrBiSaAggMonthCount implements Serializable
     private String useYear;
 
 
+    @TableField(value = "ny")
+    private String ny;
+
+
     @TableField(value = "use_month")
     private Long useMonth;
 
@@ -67,7 +71,7 @@ public class NewGrBiSaAggMonthCount implements Serializable
 
 
     @TableField(value = "province_id")
-    private Long provinceId;
+    private String provinceId;
 
 
     @TableField(value = "province_name")
@@ -156,5 +160,19 @@ public class NewGrBiSaAggMonthCount implements Serializable
     @TableField(value = "thisprofit_s")
     private BigDecimal thisMonthProfit_s;
 
+    @TableField(value = "monthsaqty_yoy")
+    private String monthsaqty_yoy;
+
+    @TableField(value = "monthsamoney_yoy")
+    private String monthsamoney_yoy;
+
+    @TableField(value = "lastMonthSaMoney_yoy")
+    private String lastMonthSaMoney_yoy;
+
+    @TableField(value = "this_month_cost_yoy")
+    private String this_month_cost_yoy;
+
+    @TableField(value = "monthprofit_yoy")
+    private String monthprofit_yoy;
 
 }

lidee-core/src/main/java/com/lideeyunji/core/framework/entity/NewGrBiSaAggYearCount.java

@@ -25,6 +25,8 @@ public class NewGrBiSaAggYearCount implements Serializable
     @TableField(value = "use_year")
     private String useYear;
 
+    @TableField(value = "ny")
+    private String ny;
 
     @TableField(value = "zone_id")
     private Long zoneId;
@@ -135,15 +137,15 @@ public class NewGrBiSaAggYearCount implements Serializable
 
 
     @TableField(value = "this_year_sa_money_growth")
-    private BigDecimal thisYearSaMoneyGrowth;
+    private String thisYearSaMoneyGrowth;
 
 
     @TableField(value = "this_year_profit_growth")
-    private BigDecimal thisYearProfitGrowth;
+    private String thisYearProfitGrowth;
 
 
     @TableField(value = "this_year_profit_change")
-    private BigDecimal thisYearProfitChange;
+    private String thisYearProfitChange;
 
     @TableField(value = "this_year_sa_money_s")
     private BigDecimal thissamoney_s;
@@ -151,4 +153,17 @@ public class NewGrBiSaAggYearCount implements Serializable
     @TableField(value = "this_year_profit_s")
     private BigDecimal thisprofit_s;
 
+
+    @TableField(value = "saqty_yoy")
+    private String saqty_yoy;
+
+    @TableField(value = "samoney_yoy")
+    private String samoney_yoy;
+
+    @TableField(value = "profit_yoy")
+    private String profit_yoy;
+
+    @TableField(value = "thisprofitshare")
+    private String thisprofitshare;
+
 }

lidee-core/src/main/java/com/lideeyunji/core/framework/mapper/NewGrBiSaAggMapper.java

@@ -1,10 +1,16 @@
 package com.lideeyunji.core.framework.mapper;
 
 import java.util.List;
+import java.util.Map;
 
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import com.lideeyunji.core.framework.entity.GrBiSaAgg;
 import com.lideeyunji.core.framework.entity.NewGrBiSaAgg;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.lideeyunji.core.framework.entity.NewGrBiSaAggMonthCount;
+import com.lideeyunji.core.framework.params.SaAggParam;
+import com.lideeyunji.tool.framework.permission.core.annotation.DataPermission;
 import org.apache.ibatis.annotations.Param;
 
 /**
@@ -61,10 +67,12 @@ public interface NewGrBiSaAggMapper extends BaseMapper<NewGrBiSaAgg>
     /**
      * 查询综合销售情况明细列表
      * 
-     * @param newGrBiSaAgg 综合销售情况明细
+     * @param saAggParam 综合销售情况明细参数
      * @return 综合销售情况明细集合
      */
-    public List<NewGrBiSaAgg> selectNewGrBiSaAggList(NewGrBiSaAgg newGrBiSaAgg);
+    @DataPermission(enable = false)
+    @DS(value = "#dataSourceType")
+    public List<NewGrBiSaAggMonthCount> selectNewGrBiSaAggList(@Param("dataSourceType") String dataSourceType, @Param("saAggParam")SaAggParam saAggParam);
 
     /**
      * 新增综合销售情况明细

lidee-core/src/main/java/com/lideeyunji/core/framework/mapper/NewGrBiSaAggMonthCountMapper.java

@@ -1,11 +1,14 @@
 package com.lideeyunji.core.framework.mapper;
 
 import java.util.List;
+import java.util.Map;
 
 import com.baomidou.dynamic.datasource.annotation.DS;
+import com.lideeyunji.core.framework.entity.NewGrBiSaAgg;
 import com.lideeyunji.core.framework.entity.NewGrBiSaAggMonthCount;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.lideeyunji.core.framework.params.SaAggParam;
+import com.lideeyunji.tool.framework.permission.core.annotation.DataPermission;
 import org.apache.ibatis.annotations.Param;
 
 /**
@@ -66,4 +69,15 @@ public interface NewGrBiSaAggMonthCountMapper extends BaseMapper<NewGrBiSaAggMon
 
     @DS(value = "#dataSourceType")
     List<NewGrBiSaAggMonthCount> getTotalDetail(@Param("dataSourceType") String dataSourceType, @Param("saAggParam") SaAggParam saAggParam);
+
+    /**
+     * 批量查询综合销售情况明细列表 -月度
+     *
+     * @param saAggParam 综合销售情况明细参数
+     * @return 综合销售情况明细集合
+     */
+    @DataPermission(enable = false)
+    @DS(value = "#dataSourceType")
+    public List<NewGrBiSaAggMonthCount> selectNewGrBiSaAggGroupMonthList(@Param("dataSourceType") String dataSourceType, @Param("saAggParam") SaAggParam saAggParam, @Param("params") Map<String, Object> params, @Param("groupFieldList")List<String> groupFieldList);
+
 }

lidee-core/src/main/java/com/lideeyunji/core/framework/mapper/NewGrBiSaAggYearCountMapper.java

@@ -1,11 +1,14 @@
 package com.lideeyunji.core.framework.mapper;
 
 import java.util.List;
+import java.util.Map;
 
 import com.baomidou.dynamic.datasource.annotation.DS;
+import com.lideeyunji.core.framework.entity.NewGrBiSaAggMonthCount;
 import com.lideeyunji.core.framework.entity.NewGrBiSaAggYearCount;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.lideeyunji.core.framework.params.SaAggParam;
+import com.lideeyunji.tool.framework.permission.core.annotation.DataPermission;
 import org.apache.ibatis.annotations.Param;
 
 /**
@@ -67,4 +70,15 @@ public interface NewGrBiSaAggYearCountMapper extends BaseMapper<NewGrBiSaAggYear
 
     @DS(value = "#dataSourceType")
     List<NewGrBiSaAggYearCount> getTotalDetail(@Param("dataSourceType") String dataSourceType,@Param("saAggParam") SaAggParam saAggParam);
+
+    /**
+     * 批量查询综合销售情况明细列表 -月度
+     *
+     * @param saAggParam 综合销售情况明细参数
+     * @return 综合销售情况明细集合
+     */
+    @DataPermission(enable = false)
+    @DS(value = "#dataSourceType")
+    public List<NewGrBiSaAggYearCount> selectNewGrBiSaAggGroupYearList(@Param("dataSourceType") String dataSourceType, @Param("saAggParam") SaAggParam saAggParam, @Param("params") Map<String, Object> params, @Param("groupFieldList")List<String> groupFieldList);
+
 }

lidee-core/src/main/java/com/lideeyunji/core/framework/params/SaAggParam.java

@@ -14,6 +14,8 @@ public class SaAggParam {
     private List<String> salerName;
     private List<String> dosageName;
     private List<String> stdGoodsName;
+    private List<String> goodsName;
+    private List<String> provinceName;
 
     private List<String> groupFieldList;
 }

lidee-core/src/main/java/com/lideeyunji/core/framework/service/INewGrBiSaAggMonthCountService.java

@@ -1,6 +1,9 @@
 package com.lideeyunji.core.framework.service;
 
 import java.util.List;
+import java.util.Map;
+
+import com.lideeyunji.core.framework.entity.NewGrBiSaAgg;
 import com.lideeyunji.core.framework.entity.NewGrBiSaAggMonthCount;
 import com.lideeyunji.core.framework.params.SaAggParam;
 
@@ -61,4 +64,8 @@ public interface INewGrBiSaAggMonthCountService
     public int deleteNewGrBiSaAggMonthCountById(Long id);
 
     List<NewGrBiSaAggMonthCount> getTotalDetail(SaAggParam saAggParam);
+
+
+    public List<NewGrBiSaAggMonthCount> selectNewGrBiSaAggGroupMonthList(Map<String, Object> params, List<String> groupFieldList);
+
 }

lidee-core/src/main/java/com/lideeyunji/core/framework/service/INewGrBiSaAggService.java

@@ -1,7 +1,10 @@
 package com.lideeyunji.core.framework.service;
 
 import java.util.List;
+import java.util.Map;
+
 import com.lideeyunji.core.framework.entity.NewGrBiSaAgg;
+import com.lideeyunji.core.framework.entity.NewGrBiSaAggMonthCount;
 import org.apache.ibatis.annotations.Param;
 
 /**
@@ -25,10 +28,10 @@ public interface INewGrBiSaAggService
     /**
      * 查询综合销售情况明细列表
      * 
-     * @param newGrBiSaAgg 综合销售情况明细
+     * @param params 综合销售情况明细
      * @return 综合销售情况明细集合
      */
-    public List<NewGrBiSaAgg> selectNewGrBiSaAggList(NewGrBiSaAgg newGrBiSaAgg);
+    public List<NewGrBiSaAggMonthCount> selectNewGrBiSaAggList(Map<String, Object> params);
 
     /**
      * 新增综合销售情况明细

lidee-core/src/main/java/com/lideeyunji/core/framework/service/INewGrBiSaAggYearCountService.java

@@ -1,6 +1,9 @@
 package com.lideeyunji.core.framework.service;
 
 import java.util.List;
+import java.util.Map;
+
+import com.lideeyunji.core.framework.entity.NewGrBiSaAggMonthCount;
 import com.lideeyunji.core.framework.entity.NewGrBiSaAggYearCount;
 import com.lideeyunji.core.framework.params.SaAggParam;
 
@@ -61,4 +64,6 @@ public interface INewGrBiSaAggYearCountService
     public int deleteNewGrBiSaAggYearCountById(Long id);
 
     List<NewGrBiSaAggYearCount> getTotalDetail(SaAggParam saAggParam);
+
+    public List<NewGrBiSaAggYearCount> selectNewGrBiSaAggGroupYearList(Map<String, Object> params, List<String> groupFieldList);
 }

lidee-core/src/main/java/com/lideeyunji/core/framework/service/impl/NewGrBiSaAggMonthCountServiceImpl.java

@@ -2,7 +2,10 @@ package com.lideeyunji.core.framework.service.impl;
 
 import java.util.Collections;
 import java.util.List;
+import java.util.Map;
+
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.lideeyunji.core.framework.entity.NewGrBiSaAgg;
 import com.lideeyunji.core.framework.params.SaAggParam;
 import com.lideeyunji.tool.framework.common.constant.lideeYunJiBaseConstant;
 import org.springframework.stereotype.Service;
@@ -91,8 +94,14 @@ public class NewGrBiSaAggMonthCountServiceImpl extends ServiceImpl<NewGrBiSaAggM
         return this.baseMapper.deleteNewGrBiSaAggMonthCountById(id);
     }
 
-    @Override
     public List<NewGrBiSaAggMonthCount> getTotalDetail(SaAggParam saAggParam) {
         return this.baseMapper.getTotalDetail(lideeYunJiBaseConstant.DS_ERP_BI_DATA, saAggParam);
     }
+
+
+    @Override
+    public List<NewGrBiSaAggMonthCount> selectNewGrBiSaAggGroupMonthList(Map<String, Object> params, List<String> groupFieldList){
+        SaAggParam saAggParam = NewGrBiSaAggServiceImpl.createParam(params);
+        return this.baseMapper.selectNewGrBiSaAggGroupMonthList(lideeYunJiBaseConstant.DS_ERP_BI_DATA, saAggParam,params, groupFieldList);
+    }
 }

lidee-core/src/main/java/com/lideeyunji/core/framework/service/impl/NewGrBiSaAggServiceImpl.java

@@ -1,16 +1,23 @@
 package com.lideeyunji.core.framework.service.impl;
 
 import java.time.LocalDateTime;
+import java.util.Arrays;
 import java.util.List;
+import java.util.Map;
 
 import cn.hutool.core.collection.CollUtil;
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.dynamic.datasource.annotation.DSTransactional;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.plugins.IgnoreStrategy;
+import com.baomidou.mybatisplus.core.plugins.InterceptorIgnoreHelper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.lideeyunji.core.framework.entity.GrBiSaAgg;
+import com.lideeyunji.core.framework.entity.NewGrBiSaAggMonthCount;
+import com.lideeyunji.core.framework.params.SaAggParam;
 import com.lideeyunji.core.framework.service.INewGrBiSaAggMonthCountService;
 import com.lideeyunji.core.framework.service.INewGrBiSaAggYearCountService;
+import com.lideeyunji.tool.framework.common.constant.lideeYunJiBaseConstant;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Service;
@@ -128,14 +135,44 @@ public class NewGrBiSaAggServiceImpl extends ServiceImpl<NewGrBiSaAggMapper, New
     /**
      * 查询综合销售情况明细列表
      * 
-     * @param newGrBiSaAgg 综合销售情况明细
+     * @param params 综合销售情况明细
      * @return 综合销售情况明细
      */
     @Override
-    public List<NewGrBiSaAgg> selectNewGrBiSaAggList(NewGrBiSaAgg newGrBiSaAgg)
+    public List<NewGrBiSaAggMonthCount> selectNewGrBiSaAggList(Map<String, Object> params)
     {
+        SaAggParam saAggParam = createParam(params);
+        return this.baseMapper.selectNewGrBiSaAggList(lideeYunJiBaseConstant.DS_ERP_BI_DATA, saAggParam);
+    }
 
-        return this.baseMapper.selectNewGrBiSaAggList(newGrBiSaAgg);
+
+    public static SaAggParam createParam(Map<String, Object> params) {
+        SaAggParam saAggParam = new SaAggParam();
+        if (params.containsKey("useYear")) {
+            saAggParam.setUseYear(params.get("useYear").toString());
+        }
+        if (params.containsKey("useMonth")) {
+            saAggParam.setUseMonth(params.get("useMonth").toString());
+        }
+        if (params.containsKey("customName")) {
+            saAggParam.setCustomName(Arrays.asList(params.get("customName").toString().split( ",")));
+        }
+        if (params.containsKey("stdGoodsName")) {
+            saAggParam.setStdGoodsName(Arrays.asList(params.get("stdGoodsName").toString().split( ",")));
+        }
+        if (params.containsKey("zoneName")) {
+            saAggParam.setZoneName(Arrays.asList(params.get("zoneName").toString().split( ",")));
+        }
+        if (params.containsKey("saletypeName")) {
+            saAggParam.setSaleTypeName(Arrays.asList(params.get("saletypeName").toString().split( ",")));
+        }
+        if (params.containsKey("dosageName")) {
+            saAggParam.setDosageName(Arrays.asList(params.get("dosageName").toString().split( ",")));
+        }
+        if (params.containsKey("salerName")) {
+            saAggParam.setSalerName(Arrays.asList(params.get("salerName").toString().split( ",")));
+        }
+        return saAggParam;
     }
 
     /**

lidee-core/src/main/java/com/lideeyunji/core/framework/service/impl/NewGrBiSaAggYearCountServiceImpl.java

@@ -2,7 +2,10 @@ package com.lideeyunji.core.framework.service.impl;
 
 import java.util.Collections;
 import java.util.List;
+import java.util.Map;
+
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.lideeyunji.core.framework.entity.NewGrBiSaAggMonthCount;
 import com.lideeyunji.core.framework.params.SaAggParam;
 import com.lideeyunji.tool.framework.common.constant.lideeYunJiBaseConstant;
 import org.springframework.stereotype.Service;
@@ -95,4 +98,10 @@ public class NewGrBiSaAggYearCountServiceImpl extends ServiceImpl<NewGrBiSaAggYe
     public List<NewGrBiSaAggYearCount> getTotalDetail(SaAggParam saAggParam) {
         return this.baseMapper.getTotalDetail(lideeYunJiBaseConstant.DS_ERP_BI_DATA, saAggParam);
     }
+
+    @Override
+    public List<NewGrBiSaAggYearCount> selectNewGrBiSaAggGroupYearList(Map<String, Object> params, List<String> groupFieldList){
+        SaAggParam saAggParam = NewGrBiSaAggServiceImpl.createParam(params);
+        return this.baseMapper.selectNewGrBiSaAggGroupYearList(lideeYunJiBaseConstant.DS_ERP_BI_DATA, saAggParam,params, groupFieldList);
+    }
 }

lidee-core/src/main/resources/mapper/framework/NewGrBiSaAggMapper.xml

@@ -28,6 +28,50 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="thisMonthProfit"    column="this_month_profit"    />
     </resultMap>
 
+    <resultMap type="com.lideeyunji.core.framework.entity.NewGrBiSaAggMonthCount" id="NewGrBiSaAggMonthCountResult">
+        <result property="id"    column="id"    />
+        <result property="ny"    column="ny"    />
+        <result property="useYear"    column="use_year"    />
+        <result property="useMonth"    column="use_month"    />
+        <result property="zoneId"    column="zone_id"    />
+        <result property="zoneName"    column="zone_name"    />
+        <result property="saleTypeId"    column="sale_type_id"    />
+        <result property="saleTypeName"    column="sale_type_name"    />
+        <result property="customId"    column="custom_id"    />
+        <result property="customName"    column="custom_name"    />
+        <result property="dosageId"    column="dosage_id"    />
+        <result property="dosageName"    column="dosage_name"    />
+        <result property="stdGoodsName"    column="std_goods_name"    />
+        <result property="provinceId"    column="province_id"    />
+        <result property="provinceName"    column="province_name"    />
+        <result property="salerId"    column="saler_id"    />
+        <result property="salerName"    column="saler_name"    />
+        <result property="thisMonthSaQty"    column="this_month_sa_qty"    />
+        <result property="lastMonthSaQty"    column="last_month_sa_qty"    />
+        <result property="yoyMonthSaQty"    column="yoy_month_sa_qty"    />
+        <result property="thisMonthSaMoney"    column="this_month_sa_money"    />
+        <result property="lastMonthSaMoney"    column="last_month_sa_money"    />
+        <result property="yoyMonthSaMoney"    column="yoy_month_sa_money"    />
+        <result property="thisMonthProfit"    column="this_month_profit"    />
+        <result property="lastMonthProfit"    column="last_month_profit"    />
+        <result property="yoyMonthProfit"    column="yoy_month_profit"    />
+        <result property="thisMonthCost"    column="this_month_cost"    />
+        <result property="lastMonthCost"    column="last_month_cost"    />
+        <result property="yoyMonthCost"    column="yoy_month_cost"    />
+        <result property="thisMonthProfitRate"    column="this_month_profit_rate"    />
+        <result property="lastMonthProfitRate"    column="last_month_profit_rate"    />
+        <result property="lastMonthProfitShare"    column="last_month_profit_share"    />
+        <result property="thisMonthSaMoneyShare"    column="this_month_sa_money_share"    />
+        <result property="thisMonthProfitShare"    column="this_month_profit_share"    />
+        <result property="thisMonthSaMoney_s"    column="thissamoney_s"    />
+        <result property="thisMonthProfit_s"    column="thisprofit_s"    />
+        <result property="monthsaqty_yoy"    column="monthsaqty_yoy"    />
+        <result property="monthsamoney_yoy"    column="monthsamoney_yoy"    />
+        <result property="lastMonthSaMoney_yoy"    column="lastMonthSaMoney_yoy"    />
+        <result property="this_month_cost_yoy"    column="this_month_cost_yoy"    />
+        <result property="monthprofit_yoy"    column="monthprofit_yoy"    />
+    </resultMap>
+
     <sql id="selectNewGrBiSaAggVo">
         select id, use_year, use_month, zone_id, zone_name, sale_type_id, sale_type_name, custom_id, custom_name, dosage_id, dosage_name, goods_id, goods_name, province_id, province_name, saler_id, saler_name, this_month_sa_qty, this_month_sa_money, this_month_cost, this_month_profit from new_gr_bi_sa_agg
     </sql>
@@ -511,29 +555,146 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 END,
             this_year_profit_change = ( this_year_profit - last_year_profit);
     </update>
-    <select id="selectNewGrBiSaAggList" parameterType="com.lideeyunji.core.framework.entity.NewGrBiSaAgg" resultMap="NewGrBiSaAggResult">
-        <include refid="selectNewGrBiSaAggVo"/>
+    <select id="selectNewGrBiSaAggList"  resultMap="NewGrBiSaAggMonthCountResult">
+        SELECT
+            ANY_VALUE (tbl_lgbsa.id) id,
+            tbl_lgbsa.use_year,
+            tbl_lgbsa.use_month,
+            CONCAT(tbl_lgbsa.use_year, LPAD(tbl_lgbsa.use_month, 2, '0')) AS ny,
+            tbl_lgbsa.zone_id,
+            tbl_lgbsa.zone_name,
+            tbl_lgbsa.sale_type_id,
+            tbl_lgbsa.sale_type_name,
+            tbl_lgbsa.custom_id,
+            tbl_lgbsa.custom_name,
+            tbl_lgbsa.dosage_id,
+            tbl_lgbsa.dosage_name,
+            tbl_lgbsa.goods_id,
+            tbl_lgbsa.goods_name,
+            tbl_lgbsa.std_goods_name,
+            tbl_lgbsa.province_id,
+            tbl_lgbsa.province_name,
+            tbl_lgbsa.saler_id,
+            tbl_lgbsa.saler_name,
+            tbl_lgbsa.this_month_sa_qty AS this_month_sa_qty,
+            ROUND(tbl_lgbsa.this_month_sa_money / 10000, 2) AS this_month_sa_money, -- 本月销售金额(元)
+            ROUND(tbl_lgbsa.this_month_cost / 10000, 2) AS this_month_cost,
+            ROUND(tbl_lgbsa.this_month_profit / 10000, 2) AS this_month_profit,
+            tbl_lgbsa.last_month_sa_qty as last_month_sa_qty,
+            ROUND(tbl_lgbsa.last_month_sa_money  / 10000, 2) as last_month_sa_money,
+            ROUND(tbl_lgbsa.last_month_profit / 10000, 2) as last_month_profit,
+            ROUND(tbl_lgbsa.last_month_cost / 10000, 2) as last_month_cost,
+            ROUND(tbl_lgbsa.yoy_month_sa_qty/ 10000, 2) as yoy_month_sa_qty,
+            ROUND(tbl_lgbsa.yoy_month_sa_money / 10000, 2) as yoy_month_sa_money,
+            ROUND(tbl_lgbsa.yoy_month_profit / 10000, 2)  as yoy_month_profit,
+            ROUND(tbl_lgbsa.yoy_month_cost / 10000, 2)    as yoy_month_cost,
+#             CONCAT(ROUND((SELECT SUM(MONTHSAQTY) FROM yunji_gr_bi_sa_agg)/100000000 ,2), '亿') AS monthsaqty_s,
+#             CONCAT(ROUND((SELECT SUM(THISSAQTY) FROM yunji_gr_bi_sa_agg)/100000000 ,2), '亿') AS thissaqty_s,
+#             CONCAT(ROUND((SELECT SUM(LASTSAQTY) FROM yunji_gr_bi_sa_agg)/100000000 ,2), '亿') AS lastsaqty_s,
+#             -- 原本带CAST的字段，简化写法（CONCAT会自动转为字符串）
+#             CONCAT(ROUND((SELECT SUM(MONTHSAMONEY) FROM yunji_gr_bi_sa_agg)/100000000 ,2), '亿') AS monthsamoney_s,
+#             CONCAT(ROUND((SELECT SUM(THISSAMONEY) FROM yunji_gr_bi_sa_agg)/100000000,2), '亿') AS thissamoney_s,
+#             CONCAT(ROUND((SELECT SUM(LASTSAMONEY) FROM yunji_gr_bi_sa_agg)/100000000,2), '亿') AS lastsamoney_s,
+            CASE
+            WHEN (CASE WHEN tbl_lgbsa.yoy_month_sa_qty = 0 THEN IF(tbl_lgbsa.this_month_sa_qty > 0, 100, 0)
+            ELSE (tbl_lgbsa.this_month_sa_qty - tbl_lgbsa.yoy_month_sa_qty) / tbl_lgbsa.yoy_month_sa_qty * 100 END) > 0 THEN
+            CONCAT('🟢 ', ROUND((CASE WHEN tbl_lgbsa.yoy_month_sa_qty = 0 THEN IF(tbl_lgbsa.this_month_sa_qty > 0, 100, 0)
+            ELSE (tbl_lgbsa.this_month_sa_qty - tbl_lgbsa.yoy_month_sa_qty) / tbl_lgbsa.yoy_month_sa_qty * 100 END), 2))
+            WHEN (CASE WHEN tbl_lgbsa.yoy_month_sa_qty = 0 THEN IF(tbl_lgbsa.this_month_sa_qty > 0, 100, 0)
+            ELSE (tbl_lgbsa.this_month_sa_qty - tbl_lgbsa.yoy_month_sa_qty) / tbl_lgbsa.yoy_month_sa_qty * 100 END)&lt;0 THEN
+            CONCAT('🔴 ', ROUND((CASE WHEN tbl_lgbsa.yoy_month_sa_qty = 0 THEN IF(tbl_lgbsa.this_month_sa_qty > 0, 100, 0)
+            ELSE (tbl_lgbsa.this_month_sa_qty - tbl_lgbsa.yoy_month_sa_qty) / tbl_lgbsa.yoy_month_sa_qty * 100 END), 2))
+            ELSE '0.00'
+            END AS monthsaqty_yoy,
+
+            -- 数量同比（原有）
+            CASE
+            WHEN (CASE WHEN tbl_lgbsa.yoy_month_sa_money = 0 THEN IF(tbl_lgbsa.this_month_sa_money > 0, 100, 0)
+            ELSE (tbl_lgbsa.this_month_sa_money - tbl_lgbsa.yoy_month_sa_money) / tbl_lgbsa.yoy_month_sa_money * 100 END) > 0 THEN
+            CONCAT('🟢 ', ROUND((CASE WHEN tbl_lgbsa.yoy_month_sa_money = 0 THEN IF(tbl_lgbsa.this_month_sa_money > 0, 100, 0)
+            ELSE (tbl_lgbsa.this_month_sa_money - tbl_lgbsa.yoy_month_sa_money) / tbl_lgbsa.yoy_month_sa_money * 100 END), 2))
+            WHEN (CASE WHEN tbl_lgbsa.yoy_month_sa_money = 0 THEN IF(tbl_lgbsa.this_month_sa_money > 0, 100, 0)
+            ELSE (tbl_lgbsa.this_month_sa_money - tbl_lgbsa.yoy_month_sa_money) / tbl_lgbsa.yoy_month_sa_money * 100 END)&lt;0 THEN
+            CONCAT('🔴 ', ROUND((CASE WHEN tbl_lgbsa.yoy_month_sa_money = 0 THEN IF(tbl_lgbsa.this_month_sa_money > 0, 100, 0)
+            ELSE (tbl_lgbsa.this_month_sa_money - tbl_lgbsa.yoy_month_sa_money) / tbl_lgbsa.yoy_month_sa_money * 100 END), 2))
+            ELSE '0.00'
+            END AS monthsamoney_yoy,
+            CASE WHEN (CASE WHEN tbl_lgbsa.yoy_month_profit = 0 THEN IF(tbl_lgbsa.yoy_month_profit > 0, 100, 0)
+            ELSE (tbl_lgbsa.yoy_month_profit - tbl_lgbsa.yoy_month_profit) / tbl_lgbsa.yoy_month_profit * 100 END) > 0 THEN
+            CONCAT('🟢 ', ROUND((CASE WHEN tbl_lgbsa.yoy_month_profit = 0 THEN IF(tbl_lgbsa.yoy_month_profit > 0, 100, 0)
+            ELSE (tbl_lgbsa.yoy_month_profit - tbl_lgbsa.yoy_month_profit) / tbl_lgbsa.yoy_month_profit * 100 END), 2))
+            WHEN (CASE WHEN tbl_lgbsa.yoy_month_profit = 0 THEN IF(tbl_lgbsa.yoy_month_profit > 0, 100, 0)
+            ELSE (tbl_lgbsa.yoy_month_profit - tbl_lgbsa.yoy_month_profit) / tbl_lgbsa.yoy_month_profit * 100 END)&lt;0 THEN
+            CONCAT('🔴 ', ROUND((CASE WHEN tbl_lgbsa.yoy_month_profit = 0 THEN IF(tbl_lgbsa.yoy_month_profit > 0, 100, 0)
+            ELSE (tbl_lgbsa.yoy_month_profit - tbl_lgbsa.yoy_month_profit) / tbl_lgbsa.yoy_month_profit * 100 END), 2))
+            ELSE '0.00'
+            END AS monthprofit_yoy,
+            CASE
+            WHEN (CASE WHEN tbl_lgbsa.last_month_sa_money = 0 THEN IF(tbl_lgbsa.this_month_sa_money > 0, 100, 0)
+            ELSE (tbl_lgbsa.this_month_sa_money - tbl_lgbsa.last_month_sa_money) / tbl_lgbsa.last_month_sa_money * 100 END) > 0 THEN
+            CONCAT('🟢 ', ROUND((CASE WHEN tbl_lgbsa.last_month_sa_money = 0 THEN IF(tbl_lgbsa.this_month_sa_money > 0, 100, 0)
+            ELSE (tbl_lgbsa.this_month_sa_money - tbl_lgbsa.last_month_sa_money) / tbl_lgbsa.last_month_sa_money * 100 END), 2))
+            WHEN (CASE WHEN tbl_lgbsa.last_month_sa_money = 0 THEN IF(tbl_lgbsa.this_month_sa_money > 0, 100, 0)
+            ELSE (tbl_lgbsa.this_month_sa_money - tbl_lgbsa.last_month_sa_money) / tbl_lgbsa.last_month_sa_money * 100 END)&lt;0 THEN
+            CONCAT('🔴 ', ROUND((CASE WHEN tbl_lgbsa.last_month_sa_money = 0 THEN IF(tbl_lgbsa.this_month_sa_money > 0, 100, 0)
+            ELSE (tbl_lgbsa.this_month_sa_money - tbl_lgbsa.last_month_sa_money) / tbl_lgbsa.last_month_sa_money * 100 END), 2))
+            ELSE '0.00'
+            END AS lastMonthSaMoney_yoy,  -- 本月销售金额增长率
+            ROUND(tbl_lgbsa.this_month_profit_rate * 100, 2) AS this_month_sa_money_share,
+            ROUND(tbl_lgbsa.this_month_sa_money_share * 100, 2) AS this_month_profit_share
+        FROM
+        new_gr_bi_sa_agg tbl_lgbsa
         <where>
-            <if test="useYear != null  and useYear != ''"> and use_year = #{useYear}</if>
-            <if test="useMonth != null "> and use_month = #{useMonth}</if>
-            <if test="zoneId != null "> and zone_id = #{zoneId}</if>
-            <if test="zoneName != null  and zoneName != ''"> and zone_name like concat('%', #{zoneName}, '%')</if>
-            <if test="saleTypeId != null "> and sale_type_id = #{saleTypeId}</if>
-            <if test="saleTypeName != null  and saleTypeName != ''"> and sale_type_name like concat('%', #{saleTypeName}, '%')</if>
-            <if test="customId != null "> and custom_id = #{customId}</if>
-            <if test="customName != null  and customName != ''"> and custom_name like concat('%', #{customName}, '%')</if>
-            <if test="dosageId != null "> and dosage_id = #{dosageId}</if>
-            <if test="dosageName != null  and dosageName != ''"> and dosage_name like concat('%', #{dosageName}, '%')</if>
-            <if test="goodsId != null "> and goods_id = #{goodsId}</if>
-            <if test="goodsName != null  and goodsName != ''"> and goods_name like concat('%', #{goodsName}, '%')</if>
-            <if test="provinceId != null "> and province_id = #{provinceId}</if>
-            <if test="provinceName != null  and provinceName != ''"> and province_name like concat('%', #{provinceName}, '%')</if>
-            <if test="salerId != null "> and saler_id = #{salerId}</if>
-            <if test="salerName != null  and salerName != ''"> and saler_name like concat('%', #{salerName}, '%')</if>
-            <if test="thisMonthSaQty != null "> and this_month_sa_qty = #{thisMonthSaQty}</if>
-            <if test="thisMonthSaMoney != null "> and this_month_sa_money = #{thisMonthSaMoney}</if>
-            <if test="thisMonthCost != null "> and this_month_cost = #{thisMonthCost}</if>
-            <if test="thisMonthProfit != null "> and this_month_profit = #{thisMonthProfit}</if>
+            <if test="saAggParam.useYear != null  and saAggParam.useYear != ''"> and use_year = #{saAggParam.useYear}</if>
+            <if test="saAggParam.useMonth != null "> and use_month = #{saAggParam.useMonth}</if>
+            <!--<if test="zoneId != null "> and zone_id = #{zoneId}</if>-->
+            <if test="saAggParam.zoneName != null  and saAggParam.zoneName != ''"> and zone_name in
+                <foreach collection="saAggParam.zoneName" item="name" open="(" separator="," close=")">
+                    #{name}
+                </foreach>
+            </if>
+<!--            <if test="saleTypeId != null "> and sale_type_id = #{saleTypeId}</if>-->
+            <if test="saAggParam.saleTypeName != null  and saAggParam.saleTypeName != ''"> and sale_type_name in
+                <foreach collection="saAggParam.saleTypeName" item="name" open="(" separator="," close=")">
+                    #{name}
+                </foreach>
+            </if>
+            <!--<if test="customId != null "> and custom_id = #{customId}</if>-->
+            <if test="saAggParam.customName != null  and saAggParam.customName != ''"> and custom_name in
+                <foreach collection="saAggParam.customName" item="name" open="(" separator="," close=")">
+                    #{name}
+                </foreach>
+            </if>
+            <!--<if test="dosageId != null "> and dosage_id = #{dosageId}</if>-->
+            <if test="saAggParam.dosageName != null  and saAggParam.dosageName != ''"> and dosage_name in
+                <foreach collection="saAggParam.dosageName" item="name" open="(" separator="," close=")">
+                    #{name}
+                </foreach>
+            </if>
+            <!--<if test="goodsId != null "> and goods_id = #{goodsId}</if>-->
+            <if test="saAggParam.goodsName != null  and saAggParam.goodsName != ''"> and goods_name in
+                <foreach collection="saAggParam.goodsName" item="name" open="(" separator="," close=")">
+                    #{name}
+                </foreach>
+            </if>
+            <!--<if test="provinceId != null "> and province_id = #{provinceId}</if>-->
+            <if test="saAggParam.provinceName != null  and saAggParam.provinceName != ''"> and province_name in
+                <foreach collection="saAggParam.provinceName" item="name" open="(" separator="," close=")">
+                    #{name}
+                </foreach>
+            </if>
+            <!--<if test="salerId != null "> and saler_id = #{salerId}</if>-->
+            <if test="saAggParam.salerName != null  and saAggParam.salerName != ''"> and saler_name in
+                <foreach collection="saAggParam.salerName" item="name" open="(" separator="," close=")">
+                    #{name}
+                </foreach>
+            </if>
+
+            <if test="saAggParam.stdGoodsName != null  and saAggParam.stdGoodsName != ''"> and std_goods_name in
+                <foreach collection="saAggParam.stdGoodsName" item="name" open="(" separator="," close=")">
+                    #{name}
+                </foreach>
+            </if>
         </where>
     </select>
 

lidee-core/src/main/resources/mapper/framework/NewGrBiSaAggMonthCountMapper.xml

@@ -6,6 +6,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     
     <resultMap type="com.lideeyunji.core.framework.entity.NewGrBiSaAggMonthCount" id="NewGrBiSaAggMonthCountResult">
         <result property="id"    column="id"    />
+        <result property="ny"    column="ny"    />
         <result property="useYear"    column="use_year"    />
         <result property="useMonth"    column="use_month"    />
         <result property="zoneId"    column="zone_id"    />
@@ -40,6 +41,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="thisMonthProfitShare"    column="this_month_profit_share"    />
         <result property="thisMonthSaMoney_s"    column="thissamoney_s"    />
         <result property="thisMonthProfit_s"    column="thisprofit_s"    />
+        <result property="monthsaqty_yoy"    column="monthsaqty_yoy"    />
+        <result property="monthsamoney_yoy"    column="monthsamoney_yoy"    />
+        <result property="lastMonthSaMoney_yoy"    column="lastMonthSaMoney_yoy"    />
+        <result property="this_month_cost_yoy"    column="this_month_cost_yoy"    />
+        <result property="monthprofit_yoy"    column="monthprofit_yoy"    />
     </resultMap>
 
     <sql id="selectNewGrBiSaAggMonthCountVo">
@@ -239,4 +245,483 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{id}
         </foreach>
     </delete>
+
+    <select id="selectNewGrBiSaAggGroupMonthList" resultMap="NewGrBiSaAggMonthCountResult">
+        select
+        <if test="groupFieldList.contains('useMonth') || params.containsKey('useMonth')">
+            current_month.use_month ,
+            <choose>
+                <when test="groupFieldList.contains('useYear') || params.containsKey('useYear')">
+                    current_month.use_year,
+                    current_month.ny as ny,
+                </when>
+                <otherwise>
+                    LPAD(current_month.use_month, 2, '0') as ny,
+                </otherwise>
+            </choose>
+        </if>
+        <if test="groupFieldList.contains('customName') || params.containsKey('customName')">
+            current_month.custom_id,
+            current_month.custom_name,
+        </if>
+        <if test="groupFieldList.contains('zoneName') || params.containsKey('zoneName')">
+            current_month.zone_id,
+            current_month.zone_name,
+        </if>
+        <if test="groupFieldList.contains('saleTypeName') || params.containsKey('saleTypeName')">
+            current_month.sale_type_id,
+            current_month.sale_type_name,
+        </if>
+        <if test="groupFieldList.contains('salerName') || params.containsKey('salerName')">
+            current_month.saler_id,
+            current_month.saler_name,
+        </if>
+        <if test="groupFieldList.contains('dosageName') || params.containsKey('dosageName')">
+            current_month.dosage_id,
+            current_month.dosage_name,
+        </if>
+        <if test="groupFieldList.contains('stdGoodsName') || params.containsKey('stdGoodsName')">
+            current_month.std_goods_name,
+        </if>
+        current_month.this_month_sa_qty AS this_month_sa_qty,
+        ROUND(current_month.this_month_sa_money / 10000, 2) AS this_month_sa_money,
+        ROUND(current_month.this_month_profit / 10000, 2) AS this_month_profit,
+        ROUND(current_month.this_month_cost / 10000, 2) AS this_month_cost,
+        last_month_data.last_month_sa_qty AS last_month_sa_qty,
+        ROUND(last_month_data.last_month_sa_money / 10000, 2) AS last_month_sa_money,
+        ROUND(last_month_data.last_month_profit / 10000, 2) AS last_month_profit,
+        ROUND(last_month_data.last_month_cost / 10000, 2) AS last_month_cost,
+        ROUND(yoy_month.yoy_month_sa_qty / 10000, 2) AS yoy_month_sa_qty,
+        ROUND(yoy_month.yoy_month_sa_money / 10000, 2) AS yoy_month_sa_money,
+        ROUND(yoy_month.yoy_month_profit / 10000, 2) AS yoy_month_profit,
+        ROUND(yoy_month.yoy_month_cost / 10000, 2) AS yoy_month_cost,
+        CASE  WHEN (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) > 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))
+        WHEN (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)&lt;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))
+        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)
+        ELSE (current_month.this_month_sa_money - yoy_month.yoy_month_sa_money) / yoy_month.yoy_month_sa_money * 100 END) > 0 THEN
+        CONCAT('🟢 ', ROUND((CASE WHEN yoy_month.yoy_month_sa_money = 0 THEN IF(current_month.this_month_sa_money > 0, 100, 0)
+        ELSE (current_month.this_month_sa_money - yoy_month.yoy_month_sa_money) / yoy_month.yoy_month_sa_money * 100 END), 2))
+        WHEN (CASE WHEN yoy_month.yoy_month_sa_money = 0 THEN IF(current_month.this_month_sa_money > 0, 100, 0)
+        ELSE (current_month.this_month_sa_money - yoy_month.yoy_month_sa_money) / yoy_month.yoy_month_sa_money * 100 END)&lt;0 THEN
+        CONCAT('🔴 ', ROUND((CASE WHEN yoy_month.yoy_month_sa_money = 0 THEN IF(current_month.this_month_sa_money > 0, 100, 0)
+        ELSE (current_month.this_month_sa_money - yoy_month.yoy_month_sa_money) / yoy_month.yoy_month_sa_money * 100 END), 2))
+        ELSE '0.00'
+        END AS monthsamoney_yoy,
+
+        CASE  WHEN (CASE WHEN last_month_data.last_month_sa_money = 0 THEN IF(current_month.this_month_sa_money > 0, 100, 0)
+        ELSE (current_month.this_month_sa_money - last_month_data.last_month_sa_money) / last_month_data.last_month_sa_money * 100 END) > 0 THEN
+        CONCAT('🟢 ', ROUND((CASE WHEN last_month_data.last_month_sa_money = 0 THEN IF(current_month.this_month_sa_money > 0, 100, 0)
+        ELSE (current_month.this_month_sa_money - last_month_data.last_month_sa_money) / last_month_data.last_month_sa_money * 100 END), 2))
+        WHEN (CASE WHEN last_month_data.last_month_sa_money = 0 THEN IF(current_month.this_month_sa_money > 0, 100, 0)
+        ELSE (current_month.this_month_sa_money - last_month_data.last_month_sa_money) / last_month_data.last_month_sa_money * 100 END)&lt;0 THEN
+        CONCAT('🔴 ', ROUND((CASE WHEN last_month_data.last_month_sa_money = 0 THEN IF(current_month.this_month_sa_money > 0, 100, 0)
+        ELSE (current_month.this_month_sa_money - last_month_data.last_month_sa_money) / last_month_data.last_month_sa_money * 100 END), 2))
+        ELSE '0.00'
+        END AS lastMonthSaMoney_yoy,
+
+        CASE WHEN (CASE WHEN yoy_month.yoy_month_cost = 0 THEN IF(current_month.this_month_cost > 0, 100, 0)
+        ELSE (current_month.this_month_cost - yoy_month.yoy_month_cost) / yoy_month.yoy_month_cost * 100 END) > 0 THEN
+        CONCAT('🟢 ', ROUND((CASE WHEN yoy_month.yoy_month_cost = 0 THEN IF(current_month.this_month_cost > 0, 100, 0)
+        ELSE (current_month.this_month_cost - yoy_month.yoy_month_cost) / yoy_month.yoy_month_cost * 100 END), 2))
+        WHEN (CASE WHEN yoy_month.yoy_month_cost = 0 THEN IF(current_month.this_month_cost > 0, 100, 0)
+        ELSE (current_month.this_month_cost - yoy_month.yoy_month_cost) / yoy_month.yoy_month_cost * 100 END)&lt;0 THEN
+        CONCAT('🔴 ', ROUND((CASE WHEN yoy_month.yoy_month_cost = 0 THEN IF(current_month.this_month_cost > 0, 100, 0)
+        ELSE (current_month.this_month_cost - yoy_month.yoy_month_cost) / yoy_month.yoy_month_cost * 100 END), 2))
+        ELSE '0.00'
+        END AS this_month_cost_yoy,
+
+        CASE WHEN (CASE WHEN yoy_month.yoy_month_profit = 0 THEN IF(current_month.this_month_profit > 0, 100, 0)
+        ELSE (current_month.this_month_profit - yoy_month.yoy_month_profit) / yoy_month.yoy_month_profit * 100 END) > 0 THEN
+        CONCAT('🟢 ', ROUND((CASE WHEN yoy_month.yoy_month_profit = 0 THEN IF(current_month.this_month_profit > 0, 100, 0)
+        ELSE (current_month.this_month_profit - yoy_month.yoy_month_profit) / yoy_month.yoy_month_profit * 100 END), 2))
+        WHEN (CASE WHEN yoy_month.yoy_month_profit = 0 THEN IF(current_month.this_month_profit > 0, 100, 0)
+        ELSE (current_month.this_month_profit - yoy_month.yoy_month_profit) / yoy_month.yoy_month_profit * 100 END)&lt;0 THEN
+        CONCAT('🔴 ', ROUND((CASE WHEN yoy_month.yoy_month_profit = 0 THEN IF(current_month.this_month_profit > 0, 100, 0)
+        ELSE (current_month.this_month_profit - yoy_month.yoy_month_profit) / yoy_month.yoy_month_profit * 100 END), 2))
+        ELSE '0.00'
+        END AS monthprofit_yoy,
+
+        COALESCE (ROUND( current_month.this_month_sa_money/total_month_data.this_month_sa_money_sum * 100, 2), 0 ) as this_month_sa_money_share,
+        COALESCE (ROUND( current_month.this_month_profit/total_month_data.this_month_profit_sum * 100, 2), 0 ) as this_month_profit_share
+        FROM ( SELECT
+        <if test="groupFieldList.contains('useYear') || params.containsKey('useYear')">
+            use_year,
+        </if>
+        use_month,
+        <if test="groupFieldList.contains('customName') || params.containsKey('customName')">
+            custom_id,
+            custom_name ,
+        </if>
+
+        <if test="groupFieldList.contains('stdGoodsName') || params.containsKey('stdGoodsName')">
+            std_goods_name,
+        </if>
+
+        <if test="groupFieldList.contains('zoneName') || params.containsKey('zoneName')">
+            zone_id,
+            zone_name,
+        </if>
+        <if test="groupFieldList.contains('saleTypeName') || params.containsKey('saleTypeName')">
+            sale_type_id,
+            sale_type_name,
+        </if>
+        <if test="groupFieldList.contains('dosageName') || params.containsKey('dosageName')">
+            dosage_id,
+            dosage_name,
+        </if>
+
+        <if test="groupFieldList.contains('salerName') || params.containsKey('salerName')">
+            saler_id,
+            saler_name,
+        </if>
+        CONCAT(MAX(use_year), LPAD(MAX(use_month), 2, '0')) AS ny,
+        sum(this_month_sa_qty) AS this_month_sa_qty,
+        sum(this_month_sa_money) AS this_month_sa_money,
+        sum(this_month_cost) AS this_month_cost,
+        sum(this_month_profit) AS this_month_profit
+        FROM
+        new_gr_bi_sa_agg_month_count
+        <where>
+            <if test="saAggParam.useYear != null  and saAggParam.useYear != ''"> and use_year = #{saAggParam.useYear}</if>
+            <if test="saAggParam.useMonth != null  and saAggParam.useMonth != ''"> and use_month = #{saAggParam.useMonth}</if>
+            <if test="saAggParam.zoneName != null  and saAggParam.zoneName != ''"> and zone_name in
+                <foreach collection="saAggParam.zoneName" item="name" open="(" separator="," close=")">
+                    #{name}
+                </foreach>
+            </if>
+            <if test="saAggParam.saleTypeName != null  and saAggParam.saleTypeName != ''"> and sale_type_name in
+                <foreach collection="saAggParam.saleTypeName" item="name" open="(" separator="," close=")">
+                    #{name}
+                </foreach>
+            </if>
+            <if test="saAggParam.customName != null  and saAggParam.customName != ''"> and custom_name in
+                <foreach collection="saAggParam.customName" item="name" open="(" separator="," close=")">
+                    #{name}
+                </foreach>
+            </if>
+            <if test="saAggParam.dosageName != null  and saAggParam.dosageName != ''"> and dosage_name in
+                <foreach collection="saAggParam.dosageName" item="name" open="(" separator="," close=")">
+                    #{name}
+                </foreach>
+            </if>
+            <if test="saAggParam.goodsName != null  and saAggParam.goodsName != ''"> and goods_name in
+                <foreach collection="saAggParam.goodsName" item="name" open="(" separator="," close=")">
+                    #{name}
+                </foreach>
+            </if>
+            <if test="saAggParam.provinceName != null  and saAggParam.provinceName != ''"> and province_name in
+                <foreach collection="saAggParam.provinceName" item="name" open="(" separator="," close=")">
+                    #{name}
+                </foreach>
+            </if>
+            <if test="saAggParam.salerName != null  and saAggParam.salerName != ''"> and saler_name in
+                <foreach collection="saAggParam.salerName" item="name" open="(" separator="," close=")">
+                    #{name}
+                </foreach>
+            </if>
+
+            <if test="saAggParam.stdGoodsName != null  and saAggParam.stdGoodsName != ''"> and std_goods_name in
+                <foreach collection="saAggParam.stdGoodsName" item="name" open="(" separator="," close=")">
+                    #{name}
+                </foreach>
+            </if>
+        </where>
+        GROUP BY
+        <trim suffixOverrides=",">
+            <if test="groupFieldList.contains('useYear') || params.containsKey('useYear')">
+                use_year,
+            </if>
+            use_month,
+            <if test="groupFieldList.contains('customName') || params.containsKey('customName')">
+                custom_id,
+                custom_name ,
+            </if>
+            <if test="groupFieldList.contains('stdGoodsName') || params.containsKey('stdGoodsName')">
+                std_goods_name,
+            </if>
+            <if test="groupFieldList.contains('zoneName') || params.containsKey('zoneName')">
+                zone_id,
+                zone_name,
+            </if>
+            <if test="groupFieldList.contains('saleTypeName') || params.containsKey('saleTypeName')">
+                sale_type_id,
+                sale_type_name,
+            </if>
+            <if test="groupFieldList.contains('dosageName') || params.containsKey('dosageName')">
+                dosage_id,
+                dosage_name,
+            </if>
+            <if test="groupFieldList.contains('salerName') || params.containsKey('salerName')">
+                saler_id,
+                saler_name,
+            </if>
+        </trim>
+        ) AS current_month
+        LEFT JOIN (
+        SELECT
+        <if test="groupFieldList.contains('useYear') || params.containsKey('useYear')">
+            use_year,
+        </if>
+        use_month,
+        <if test="groupFieldList.contains('customName') || params.containsKey('customName')">
+            custom_id,
+        </if>
+        <if test="groupFieldList.contains('stdGoodsName') || params.containsKey('stdGoodsName')">
+            std_goods_name,
+        </if>
+        <if test="groupFieldList.contains('zoneName') || params.containsKey('zoneName')">
+            zone_id,
+        </if>
+        <if test="groupFieldList.contains('saleTypeName') || params.containsKey('saleTypeName')">
+            sale_type_id,
+        </if>
+        <if test="groupFieldList.contains('dosageName') || params.containsKey('dosageName')">
+            dosage_id,
+        </if>
+        <if test="groupFieldList.contains('salerName') || params.containsKey('salerName')">
+            saler_id,
+        </if>
+        SUM(this_month_sa_qty) AS last_month_sa_qty,
+        SUM(this_month_sa_money) AS last_month_sa_money,
+        SUM(this_month_cost) AS last_month_cost,
+        SUM(this_month_profit) AS last_month_profit
+        FROM new_gr_bi_sa_agg_month_count
+        GROUP BY
+        <trim suffixOverrides=",">
+            <if test="groupFieldList.contains('useYear') || params.containsKey('useYear')">
+                use_year,
+            </if>
+            use_month,
+            <if test="groupFieldList.contains('customName') || params.containsKey('customName')">
+                custom_id,
+            </if>
+            <if test="groupFieldList.contains('stdGoodsName') || params.containsKey('stdGoodsName')">
+                std_goods_name,
+            </if>
+            <if test="groupFieldList.contains('zoneName') || params.containsKey('zoneName')">
+                zone_id,
+            </if>
+            <if test="groupFieldList.contains('saleTypeName') || params.containsKey('saleTypeName')">
+                sale_type_id,
+            </if>
+            <if test="groupFieldList.contains('dosageName') || params.containsKey('dosageName')">
+                dosage_id,
+            </if>
+            <if test="groupFieldList.contains('salerName') || params.containsKey('salerName')">
+                saler_id,
+            </if>
+        </trim>
+        ) AS last_month_data
+        ON last_month_data.use_month = IF(current_month.use_month = 1, 12, current_month.use_month - 1)
+        <if test="groupFieldList.contains('useYear') || params.containsKey('useYear')">
+            AND last_month_data.use_year = current_month.use_year - (current_month.use_month = 1)
+        </if>
+        <if test="groupFieldList.contains('customName') || params.containsKey('customName')">
+            AND current_month.custom_id = last_month_data.custom_id
+        </if>
+        <if test="groupFieldList.contains('stdGoodsName') || params.containsKey('stdGoodsName')">
+            AND current_month.std_goods_name = last_month_data.std_goods_name
+        </if>
+        <if test="groupFieldList.contains('zoneName') || params.containsKey('zoneName')">
+            AND current_month.zone_id = last_month_data.zone_id
+        </if>
+        <if test="groupFieldList.contains('saleTypeName') || params.containsKey('saleTypeName')">
+            AND current_month.sale_type_id = last_month_data.sale_type_id
+        </if>
+        <if test="groupFieldList.contains('dosageName') || params.containsKey('dosageName')">
+            AND current_month.dosage_id = last_month_data.dosage_id
+        </if>
+        <if test="groupFieldList.contains('salerName') || params.containsKey('salerName')">
+            AND current_month.saler_id = last_month_data.saler_id
+        </if>
+        LEFT JOIN (
+        SELECT
+        <if test="groupFieldList.contains('useYear') || params.containsKey('useYear')">
+            use_year,
+        </if>
+        use_month,
+        <if test="groupFieldList.contains('customName') || params.containsKey('customName')">
+            custom_id,
+        </if>
+        <if test="groupFieldList.contains('stdGoodsName') || params.containsKey('stdGoodsName')">
+            std_goods_name,
+        </if>
+        <if test="groupFieldList.contains('zoneName') || params.containsKey('zoneName')">
+            zone_id,
+        </if>
+        <if test="groupFieldList.contains('saleTypeName') || params.containsKey('saleTypeName')">
+            sale_type_id,
+        </if>
+        <if test="groupFieldList.contains('dosageName') || params.containsKey('dosageName')">
+            dosage_id,
+        </if>
+        <if test="groupFieldList.contains('salerName') || params.containsKey('salerName')">
+            saler_id,
+        </if>
+        SUM(this_month_sa_qty) AS yoy_month_sa_qty,
+        SUM(this_month_sa_money) AS yoy_month_sa_money,
+        SUM(this_month_cost) as yoy_month_cost,
+        SUM(this_month_profit) AS yoy_month_profit
+        FROM new_gr_bi_sa_agg_month_count
+        <where>
+            <if test="saAggParam.useYear != null  and saAggParam.useYear != ''"> and use_year = #{saAggParam.useYear }- 1</if>
+            <if test="saAggParam.useMonth != null and saAggParam.useMonth != ''"> and use_month = #{saAggParam.useMonth}</if>
+            <if test="saAggParam.zoneName != null  and saAggParam.zoneName != ''"> and zone_name in
+                <foreach collection="saAggParam.zoneName" item="name" open="(" separator="," close=")">
+                    #{name}
+                </foreach>
+            </if>
+            <if test="saAggParam.saleTypeName != null  and saAggParam.saleTypeName != ''"> and sale_type_name in
+                <foreach collection="saAggParam.saleTypeName" item="name" open="(" separator="," close=")">
+                    #{name}
+                </foreach>
+            </if>
+            <if test="saAggParam.customName != null  and saAggParam.customName != ''"> and custom_name in
+                <foreach collection="saAggParam.customName" item="name" open="(" separator="," close=")">
+                    #{name}
+                </foreach>
+            </if>
+            <if test="saAggParam.dosageName != null  and saAggParam.dosageName != ''"> and dosage_name in
+                <foreach collection="saAggParam.dosageName" item="name" open="(" separator="," close=")">
+                    #{name}
+                </foreach>
+            </if>
+            <if test="saAggParam.goodsName != null  and saAggParam.goodsName != ''"> and goods_name in
+                <foreach collection="saAggParam.goodsName" item="name" open="(" separator="," close=")">
+                    #{name}
+                </foreach>
+            </if>
+            <if test="saAggParam.provinceName != null  and saAggParam.provinceName != ''"> and province_name in
+                <foreach collection="saAggParam.provinceName" item="name" open="(" separator="," close=")">
+                    #{name}
+                </foreach>
+            </if>
+            <if test="saAggParam.salerName != null  and saAggParam.salerName != ''"> and saler_name in
+                <foreach collection="saAggParam.salerName" item="name" open="(" separator="," close=")">
+                    #{name}
+                </foreach>
+            </if>
+
+            <if test="saAggParam.stdGoodsName != null  and saAggParam.stdGoodsName != ''"> and std_goods_name in
+                <foreach collection="saAggParam.stdGoodsName" item="name" open="(" separator="," close=")">
+                    #{name}
+                </foreach>
+            </if>
+        </where>
+        GROUP BY
+        <trim suffixOverrides=",">
+            <if test="groupFieldList.contains('useYear') || params.containsKey('useYear')">
+                use_year,
+            </if>
+            use_month,
+            <if test="groupFieldList.contains('customName') || params.containsKey('customName')">
+                custom_id,
+            </if>
+            <if test="groupFieldList.contains('stdGoodsName') || params.containsKey('stdGoodsName')">
+                std_goods_name,
+            </if>
+            <if test="groupFieldList.contains('zoneName') || params.containsKey('zoneName')">
+                zone_id,
+            </if>
+            <if test="groupFieldList.contains('saleTypeName') || params.containsKey('saleTypeName')">
+                sale_type_id,
+            </if>
+            <if test="groupFieldList.contains('dosageName') || params.containsKey('dosageName')">
+                dosage_id,
+            </if>
+            <if test="groupFieldList.contains('salerName') || params.containsKey('salerName')">
+                saler_id,
+            </if>
+        </trim>
+        ) yoy_month  ON
+        <trim prefixOverrides="and">
+
+            <if test="groupFieldList.contains('useYear') || params.containsKey('useYear')">
+                and yoy_month.use_year = current_month.use_year - 1
+            </if>
+            and yoy_month.use_month = current_month.use_month
+            <if test="groupFieldList.contains('customName') || params.containsKey('customName')">
+                AND yoy_month.custom_id = current_month.custom_id
+            </if>
+            <if test="groupFieldList.contains('stdGoodsName') || params.containsKey('stdGoodsName')">
+                AND yoy_month.std_goods_name = current_month.std_goods_name
+            </if>
+            <if test="groupFieldList.contains('zoneName') || params.containsKey('zoneName')">
+                AND yoy_month.zone_id = current_month.zone_id
+            </if>
+            <if test="groupFieldList.contains('saleTypeName') || params.containsKey('saleTypeName')">
+                AND yoy_month.sale_type_id = current_month.sale_type_id
+            </if>
+            <if test="groupFieldList.contains('dosageName') || params.containsKey('dosageName')">
+                AND yoy_month.dosage_id = current_month.dosage_id
+            </if>
+            <if test="groupFieldList.contains('salerName') || params.containsKey('salerName')">
+                AND yoy_month.saler_id = current_month.saler_id
+            </if>
+        </trim>
+
+        LEFT JOIN (
+        SELECT
+        use_year,
+        SUM( this_month_sa_money ) AS this_month_sa_money_sum,
+        SUM(this_month_profit) AS this_month_profit_sum
+        FROM new_gr_bi_sa_agg
+        GROUP BY
+        use_year
+        ) total_month_data ON total_month_data.use_year = current_month.use_year
+        <where>
+            <if test="saAggParam.useYear != null  and saAggParam.useYear != ''"> and current_month.use_year = #{saAggParam.useYear}</if>
+            <if test="saAggParam.useMonth != null  and saAggParam.useMonth != ''"> and current_month.use_month = #{saAggParam.useMonth}</if>
+            <if test="saAggParam.zoneName != null  and saAggParam.zoneName != ''"> and current_month.zone_name in
+                <foreach collection="saAggParam.zoneName" item="name" open="(" separator="," close=")">
+                    #{name}
+                </foreach>
+            </if>
+            <if test="saAggParam.saleTypeName != null  and saAggParam.saleTypeName != ''"> and current_month.sale_type_name in
+                <foreach collection="saAggParam.saleTypeName" item="name" open="(" separator="," close=")">
+                    #{name}
+                </foreach>
+            </if>
+            <if test="saAggParam.customName != null  and saAggParam.customName != ''"> and current_month.custom_name in
+                <foreach collection="saAggParam.customName" item="name" open="(" separator="," close=")">
+                    #{name}
+                </foreach>
+            </if>
+            <if test="saAggParam.dosageName != null  and saAggParam.dosageName != ''"> and current_month.dosage_name in
+                <foreach collection="saAggParam.dosageName" item="name" open="(" separator="," close=")">
+                    #{name}
+                </foreach>
+            </if>
+            <if test="saAggParam.goodsName != null  and saAggParam.goodsName != ''"> and current_month.goods_name in
+                <foreach collection="saAggParam.goodsName" item="name" open="(" separator="," close=")">
+                    #{name}
+                </foreach>
+            </if>
+            <if test="saAggParam.provinceName != null  and saAggParam.provinceName != ''"> and current_month.province_name in
+                <foreach collection="saAggParam.provinceName" item="name" open="(" separator="," close=")">
+                    #{name}
+                </foreach>
+            </if>
+            <if test="saAggParam.salerName != null  and saAggParam.salerName != ''"> and current_month.saler_name in
+                <foreach collection="saAggParam.salerName" item="name" open="(" separator="," close=")">
+                    #{name}
+                </foreach>
+            </if>
+
+            <if test="saAggParam.stdGoodsName != null  and saAggParam.stdGoodsName != ''"> and current_month.std_goods_name in
+                <foreach collection="saAggParam.stdGoodsName" item="name" open="(" separator="," close=")">
+                    #{name}
+                </foreach>
+            </if>
+        </where>
+    </select>
+
 </mapper>

lidee-core/src/main/resources/mapper/framework/NewGrBiSaAggYearCountMapper.xml

@@ -7,6 +7,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <resultMap type="com.lideeyunji.core.framework.entity.NewGrBiSaAggYearCount" id="NewGrBiSaAggYearCountResult">
         <result property="id"    column="id"    />
         <result property="useYear"    column="use_year"    />
+        <result property="ny"    column="ny"    />
         <result property="zoneId"    column="zone_id"    />
         <result property="zoneName"    column="zone_name"    />
         <result property="saleTypeId"    column="sale_type_id"    />
@@ -39,6 +40,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="thisYearProfitChange"    column="this_year_profit_change"    />
         <result property="thissamoney_s"    column="this_year_sa_money_s"    />
         <result property="thisprofit_s"    column="this_year_profit_s"    />
+        <result property="saqty_yoy"    column="saqty_yoy"    />
+        <result property="samoney_yoy"    column="samoney_yoy"    />
+        <result property="profit_yoy"    column="profit_yoy"    />
+        <result property="thisprofitshare"    column="thisprofitshare"    />
     </resultMap>
 
     <sql id="selectNewGrBiSaAggYearCountVo">
@@ -71,13 +76,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 <foreach collection="saAggParam.stdGoodsName" item="field" separator=","  open="(" close=")">#{field}</foreach>
             </if>
         </where>
-<!--        <if test="saAggParam.groupFieldList != null and saAggParam.groupFieldList.size() > 0">-->
-<!--            &lt;!&ndash; 这里根据前端传入的参数拼接动态的 GROUP BY 子句 &ndash;&gt;-->
-<!--            GROUP BY-->
-<!--            <foreach item="field" collection="saAggParam.groupFieldList" separator=",">-->
-<!--                #{field}-->
-<!--            </foreach>-->
-<!--        </if>-->
     </select>
 
     <select id="selectNewGrBiSaAggYearCountList" parameterType="com.lideeyunji.core.framework.entity.NewGrBiSaAggYearCount" resultMap="NewGrBiSaAggYearCountResult">
@@ -241,4 +239,315 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{id}
         </foreach>
     </delete>
+    
+    <select id="selectNewGrBiSaAggGroupYearList" resultMap="NewGrBiSaAggYearCountResult">
+         SELECT
+         current_year_data.use_year,
+        <if test="groupFieldList.contains('useYear') || params.containsKey('useYear')">
+                current_year_data.ny as ny,
+        </if>
+        <if test="groupFieldList.contains('customName') || params.containsKey('customName')">
+            current_year_data.custom_id,
+            current_year_data.custom_name,
+        </if>
+        <if test="groupFieldList.contains('zoneName') || params.containsKey('zoneName')">
+            current_year_data.zone_id,
+            current_year_data.zone_name,
+        </if>
+        <if test="groupFieldList.contains('saleTypeName') || params.containsKey('saleTypeName')">
+            current_year_data.sale_type_id,
+            current_year_data.sale_type_name,
+        </if>
+        <if test="groupFieldList.contains('salerName') || params.containsKey('salerName')">
+            current_year_data.saler_id,
+            current_year_data.saler_name,
+        </if>
+        <if test="groupFieldList.contains('dosageName') || params.containsKey('dosageName')">
+            current_year_data.dosage_id,
+            current_year_data.dosage_name,
+        </if>
+        <if test="groupFieldList.contains('stdGoodsName') || params.containsKey('stdGoodsName')">
+            current_year_data.std_goods_name,
+        </if>
+
+         current_year_data.this_year_sa_qty AS this_year_sa_qty,
+         ROUND(current_year_data.this_year_sa_money / 10000, 2) AS this_year_sa_money,
+         ROUND(current_year_data.this_year_profit / 10000, 2) AS this_year_profit,
+         ROUND(current_year_data.this_year_cost / 10000, 2) AS this_year_cost,
+         last_year_data.last_year_sa_qty AS last_year_sa_qty,
+         ROUND(last_year_data.last_year_sa_money / 10000, 2) AS last_year_sa_money,
+         ROUND(last_year_data.last_year_profit / 10000, 2) AS last_year_profit,
+         ROUND(last_year_data.last_year_cost / 10000, 2) AS last_year_cost,
+
+         COALESCE(ROUND(current_year_data.this_year_sa_money / total_year_data.this_year_sa_money_sum * 100, 2), 0) AS this_year_sa_money_share,
+         COALESCE (ROUND(current_year_data.this_year_profit/total_year_data.this_year_profit_sum * 100, 2), 0 ) as thisprofitshare,
+         CASE
+         WHEN (CASE WHEN last_year_data.last_year_sa_qty = 0 THEN IF(current_year_data.this_year_sa_qty > 0, 100, 0)
+                    ELSE (current_year_data.this_year_sa_qty - last_year_data.last_year_sa_qty) / last_year_data.last_year_sa_qty * 100 END) > 0 THEN
+             CONCAT('🟢 ', ROUND((CASE WHEN last_year_data.last_year_sa_qty = 0 THEN IF(current_year_data.this_year_sa_qty > 0, 100, 0)
+                                      ELSE (current_year_data.this_year_sa_qty - last_year_data.last_year_sa_qty) / last_year_data.last_year_sa_qty * 100 END), 2))
+         WHEN (CASE WHEN last_year_data.last_year_sa_qty = 0 THEN IF(current_year_data.this_year_sa_qty > 0, 100, 0)
+                    ELSE (current_year_data.this_year_sa_qty - last_year_data.last_year_sa_qty) / last_year_data.last_year_sa_qty * 100 END) &lt; 0 THEN
+             CONCAT('🔴 ', ROUND((CASE WHEN last_year_data.last_year_sa_qty = 0 THEN IF(current_year_data.this_year_sa_qty > 0, 100, 0)
+                                      ELSE (current_year_data.this_year_sa_qty - last_year_data.last_year_sa_qty) / last_year_data.last_year_sa_qty * 100 END), 2))
+         ELSE '0.00'
+         END AS saqty_yoy,
+         CASE
+         WHEN (CASE WHEN last_year_data.last_year_sa_money = 0 THEN IF(current_year_data.this_year_sa_money > 0, 100, 0)
+                    ELSE (current_year_data.this_year_sa_money - last_year_data.last_year_sa_money) / last_year_data.last_year_sa_money * 100 END) > 0 THEN
+             CONCAT('🟢 ', ROUND((CASE WHEN last_year_data.last_year_sa_money = 0 THEN IF(current_year_data.this_year_sa_money > 0, 100, 0)
+                                      ELSE (current_year_data.this_year_sa_money - last_year_data.last_year_sa_money) / last_year_data.last_year_sa_money * 100 END), 2))
+         WHEN (CASE WHEN last_year_data.last_year_sa_money = 0 THEN IF(current_year_data.this_year_sa_money > 0, 100, 0)
+                    ELSE (current_year_data.this_year_sa_money - last_year_data.last_year_sa_money) / last_year_data.last_year_sa_money * 100 END) &lt; 0 THEN
+             CONCAT('🔴 ', ROUND((CASE WHEN last_year_data.last_year_sa_money = 0 THEN IF(current_year_data.this_year_sa_money > 0, 100, 0)
+                                      ELSE (current_year_data.this_year_sa_money - last_year_data.last_year_sa_money) / last_year_data.last_year_sa_money * 100 END), 2))
+         ELSE '0.00'
+         END AS samoney_yoy,
+         CASE
+         WHEN (CASE WHEN last_year_data.last_year_profit = 0 THEN IF(current_year_data.this_year_profit > 0, 100, 0)
+                    ELSE (current_year_data.this_year_profit - last_year_data.last_year_profit) / last_year_data.last_year_profit * 100 END) > 0 THEN
+             CONCAT('🟢 ', ROUND((CASE WHEN last_year_data.last_year_profit = 0 THEN IF(current_year_data.this_year_profit > 0, 100, 0)
+                                      ELSE (current_year_data.this_year_profit - last_year_data.last_year_profit) / last_year_data.last_year_profit * 100 END), 2))
+         WHEN (CASE WHEN last_year_data.last_year_profit = 0 THEN IF(current_year_data.this_year_profit > 0, 100, 0)
+                    ELSE (current_year_data.this_year_profit - last_year_data.last_year_profit) / last_year_data.last_year_profit * 100 END) &lt; 0 THEN
+             CONCAT('🔴 ', ROUND((CASE WHEN last_year_data.last_year_profit = 0 THEN IF(current_year_data.this_year_profit > 0, 100, 0)
+                                      ELSE (current_year_data.this_year_profit - last_year_data.last_year_profit) / last_year_data.last_year_profit * 100 END), 2))
+         ELSE '0.00'
+         END AS profit_yoy,
+         CASE
+         WHEN (CASE WHEN last_year_data.last_year_sa_money = 0 THEN IF(current_year_data.this_year_sa_money > 0, 100, 0)
+                    ELSE (current_year_data.this_year_sa_money - last_year_data.last_year_sa_money) / last_year_data.last_year_sa_money * 100 END) > 0 THEN
+             CONCAT('🟢 ', ROUND((CASE WHEN last_year_data.last_year_sa_money = 0 THEN IF(current_year_data.this_year_sa_money > 0, 100, 0)
+                                      ELSE (current_year_data.this_year_sa_money - last_year_data.last_year_sa_money) / last_year_data.last_year_sa_money * 100 END), 2))
+         WHEN (CASE WHEN last_year_data.last_year_sa_money = 0 THEN IF(current_year_data.this_year_sa_money > 0, 100, 0)
+                    ELSE (current_year_data.this_year_sa_money - last_year_data.last_year_sa_money) / last_year_data.last_year_sa_money * 100 END) &lt; 0 THEN
+             CONCAT('🔴 ', ROUND((CASE WHEN last_year_data.last_year_sa_money = 0 THEN IF(current_year_data.this_year_sa_money > 0, 100, 0)
+                                      ELSE (current_year_data.this_year_sa_money - last_year_data.last_year_sa_money) / last_year_data.last_year_sa_money * 100 END), 2))
+         ELSE '0.00'
+         END AS this_year_sa_money_growth
+         FROM
+             (SELECT use_year ,
+            use_year AS ny,
+            <if test="groupFieldList.contains('customName') || params.containsKey('customName')">
+                custom_id,
+                custom_name ,
+            </if>
+            <if test="groupFieldList.contains('stdGoodsName') || params.containsKey('stdGoodsName')">
+                std_goods_name,
+            </if>
+            <if test="groupFieldList.contains('zoneName') || params.containsKey('zoneName')">
+                zone_id,
+                zone_name,
+            </if>
+            <if test="groupFieldList.contains('saleTypeName') || params.containsKey('saleTypeName')">
+                sale_type_id,
+                sale_type_name,
+            </if>
+            <if test="groupFieldList.contains('dosageName') || params.containsKey('dosageName')">
+                dosage_id,
+                dosage_name,
+            </if>
+            <if test="groupFieldList.contains('salerName') || params.containsKey('salerName')">
+                saler_id,
+                saler_name,
+            </if>
+            GROUP_CONCAT(DISTINCT province_id ORDER BY province_id SEPARATOR ',') AS province_id,
+            GROUP_CONCAT(DISTINCT province_name ORDER BY province_name SEPARATOR ',') AS province_name,
+            sum(this_year_sa_qty) AS this_year_sa_qty,
+            sum(this_year_sa_money) AS this_year_sa_money,
+            sum(this_year_cost) AS this_year_cost,
+            sum(this_year_profit) AS this_year_profit
+            FROM new_gr_bi_sa_agg_year_count
+            <where>
+                <if test="saAggParam.useYear != null  and saAggParam.useYear != ''"> and use_year = #{saAggParam.useYear}</if>
+                <if test="saAggParam.zoneName != null  and saAggParam.zoneName != ''"> and zone_name in
+                    <foreach collection="saAggParam.zoneName" item="name" open="(" separator="," close=")">
+                        #{name}
+                    </foreach>
+                </if>
+                <if test="saAggParam.saleTypeName != null  and saAggParam.saleTypeName != ''"> and sale_type_name in
+                    <foreach collection="saAggParam.saleTypeName" item="name" open="(" separator="," close=")">
+                        #{name}
+                    </foreach>
+                </if>
+                <if test="saAggParam.customName != null  and saAggParam.customName != ''"> and custom_name in
+                    <foreach collection="saAggParam.customName" item="name" open="(" separator="," close=")">
+                        #{name}
+                    </foreach>
+                </if>
+                <if test="saAggParam.dosageName != null  and saAggParam.dosageName != ''"> and dosage_name in
+                    <foreach collection="saAggParam.dosageName" item="name" open="(" separator="," close=")">
+                        #{name}
+                    </foreach>
+                </if>
+                <if test="saAggParam.goodsName != null  and saAggParam.goodsName != ''"> and goods_name in
+                    <foreach collection="saAggParam.goodsName" item="name" open="(" separator="," close=")">
+                        #{name}
+                    </foreach>
+                </if>
+                <if test="saAggParam.provinceName != null  and saAggParam.provinceName != ''"> and province_name in
+                    <foreach collection="saAggParam.provinceName" item="name" open="(" separator="," close=")">
+                        #{name}
+                    </foreach>
+                </if>
+                <if test="saAggParam.salerName != null  and saAggParam.salerName != ''"> and saler_name in
+                    <foreach collection="saAggParam.salerName" item="name" open="(" separator="," close=")">
+                        #{name}
+                    </foreach>
+                </if>
+
+                <if test="saAggParam.stdGoodsName != null  and saAggParam.stdGoodsName != ''"> and std_goods_name in
+                    <foreach collection="saAggParam.stdGoodsName" item="name" open="(" separator="," close=")">
+                        #{name}
+                    </foreach>
+                </if>
+            </where>
+            GROUP BY
+            <trim suffixOverrides=",">
+                use_year,
+                <if test="groupFieldList.contains('customName') || params.containsKey('customName')">
+                    custom_id,
+                    custom_name ,
+                </if>
+                <if test="groupFieldList.contains('stdGoodsName') || params.containsKey('stdGoodsName')">
+                    std_goods_name,
+                </if>
+                <if test="groupFieldList.contains('zoneName') || params.containsKey('zoneName')">
+                    zone_id,
+                    zone_name,
+                </if>
+                <if test="groupFieldList.contains('saleTypeName') || params.containsKey('saleTypeName')">
+                    sale_type_id,
+                    sale_type_name,
+                </if>
+                <if test="groupFieldList.contains('dosageName') || params.containsKey('dosageName')">
+                    dosage_id,
+                    dosage_name,
+                </if>
+                <if test="groupFieldList.contains('salerName') || params.containsKey('salerName')">
+                    saler_id,
+                    saler_name,
+                </if>
+            </trim>
+
+            )  as current_year_data
+         LEFT JOIN (SELECT use_year,
+                <if test="groupFieldList.contains('customName') || params.containsKey('customName')">
+                    custom_id,
+                </if>
+                <if test="groupFieldList.contains('stdGoodsName') || params.containsKey('stdGoodsName')">
+                    std_goods_name,
+                </if>
+                <if test="groupFieldList.contains('zoneName') || params.containsKey('zoneName')">
+                    zone_id,
+                </if>
+                <if test="groupFieldList.contains('saleTypeName') || params.containsKey('saleTypeName')">
+                    sale_type_id,
+                </if>
+                <if test="groupFieldList.contains('dosageName') || params.containsKey('dosageName')">
+                    dosage_id,
+                </if>
+                <if test="groupFieldList.contains('salerName') || params.containsKey('salerName')">
+                    saler_id,
+                </if>
+                 SUM(this_year_sa_qty)   AS last_year_sa_qty, 
+                 SUM(this_year_sa_money) AS last_year_sa_money, 
+                 SUM(this_year_cost)     AS last_year_cost, 
+                 SUM(this_year_profit)   AS last_year_profit 
+                 FROM new_gr_bi_sa_agg_year_count
+
+                <where>
+                    <if test="saAggParam.useYear != null  and saAggParam.useYear != ''"> and use_year = #{saAggParam.useYear} -1</if>
+                    <if test="saAggParam.zoneName != null  and saAggParam.zoneName != ''"> and zone_name in
+                        <foreach collection="saAggParam.zoneName" item="name" open="(" separator="," close=")">
+                            #{name}
+                        </foreach>
+                    </if>
+                    <if test="saAggParam.saleTypeName != null  and saAggParam.saleTypeName != ''"> and sale_type_name in
+                        <foreach collection="saAggParam.saleTypeName" item="name" open="(" separator="," close=")">
+                            #{name}
+                        </foreach>
+                    </if>
+                    <if test="saAggParam.customName != null  and saAggParam.customName != ''"> and custom_name in
+                        <foreach collection="saAggParam.customName" item="name" open="(" separator="," close=")">
+                            #{name}
+                        </foreach>
+                    </if>
+                    <if test="saAggParam.dosageName != null  and saAggParam.dosageName != ''"> and dosage_name in
+                        <foreach collection="saAggParam.dosageName" item="name" open="(" separator="," close=")">
+                            #{name}
+                        </foreach>
+                    </if>
+                    <if test="saAggParam.goodsName != null  and saAggParam.goodsName != ''"> and goods_name in
+                        <foreach collection="saAggParam.goodsName" item="name" open="(" separator="," close=")">
+                            #{name}
+                        </foreach>
+                    </if>
+                    <if test="saAggParam.provinceName != null  and saAggParam.provinceName != ''"> and province_name in
+                        <foreach collection="saAggParam.provinceName" item="name" open="(" separator="," close=")">
+                            #{name}
+                        </foreach>
+                    </if>
+                    <if test="saAggParam.salerName != null  and saAggParam.salerName != ''"> and saler_name in
+                        <foreach collection="saAggParam.salerName" item="name" open="(" separator="," close=")">
+                            #{name}
+                        </foreach>
+                    </if>
+
+                    <if test="saAggParam.stdGoodsName != null  and saAggParam.stdGoodsName != ''"> and std_goods_name in
+                        <foreach collection="saAggParam.stdGoodsName" item="name" open="(" separator="," close=")">
+                            #{name}
+                        </foreach>
+                    </if>
+                </where>
+            GROUP BY
+                <trim suffixOverrides=",">
+                    use_year,
+                    <if test="groupFieldList.contains('customName') || params.containsKey('customName')">
+                        custom_id,
+                    </if>
+                    <if test="groupFieldList.contains('stdGoodsName') || params.containsKey('stdGoodsName')">
+                        std_goods_name,
+                    </if>
+                    <if test="groupFieldList.contains('zoneName') || params.containsKey('zoneName')">
+                        zone_id,
+                    </if>
+                    <if test="groupFieldList.contains('saleTypeName') || params.containsKey('saleTypeName')">
+                        sale_type_id,
+                    </if>
+                    <if test="groupFieldList.contains('dosageName') || params.containsKey('dosageName')">
+                        dosage_id,
+                    </if>
+                    <if test="groupFieldList.contains('salerName') || params.containsKey('salerName')">
+                        saler_id,
+                    </if>
+                </trim>
+
+                 ) AS last_year_data 
+               ON last_year_data.use_year = current_year_data.use_year - 1 
+                <if test="groupFieldList.contains('customName') || params.containsKey('customName')">
+                       AND current_year_data.custom_id = last_year_data.custom_id
+                </if>
+                <if test="groupFieldList.contains('stdGoodsName') || params.containsKey('stdGoodsName')">
+                       AND current_year_data.std_goods_name = last_year_data.std_goods_name
+                </if>
+                <if test="groupFieldList.contains('zoneName') || params.containsKey('zoneName')">
+                       AND current_year_data.zone_id = last_year_data.zone_id
+                </if>
+                <if test="groupFieldList.contains('saleTypeName') || params.containsKey('saleTypeName')">
+                       AND current_year_data.sale_type_id = last_year_data.sale_type_id
+                </if>
+                <if test="groupFieldList.contains('dosageName') || params.containsKey('dosageName')">
+                       AND current_year_data.dosage_id = last_year_data.dosage_id
+                </if>
+                <if test="groupFieldList.contains('salerName') || params.containsKey('salerName')">
+                       AND current_year_data.saler_id = last_year_data.saler_id
+                </if>
+         LEFT JOIN (SELECT use_year, 
+                       SUM(this_year_sa_money) AS this_year_sa_money_sum, 
+                       SUM(this_year_profit)   AS this_year_profit_sum 
+                   FROM new_gr_bi_sa_agg_year_count 
+                   GROUP BY use_year) as total_year_data 
+         ON total_year_data.use_year = current_year_data.use_year 
+    </select>
 </mapper>