diff --git a/lidee-core/pom.xml b/lidee-core/pom.xml
index 4719287..a899d1c 100644
--- a/lidee-core/pom.xml
+++ b/lidee-core/pom.xml
@@ -97,5 +97,10 @@
orai18n
21.1.0.0
+
+ com.github.pagehelper
+ pagehelper-spring-boot-starter
+ 1.4.7
+
diff --git a/lidee-core/src/main/java/com/lideeyunji/core/framework/config/aspect/enhancereport/plugin/ReportAroundAdvicePlugin.java b/lidee-core/src/main/java/com/lideeyunji/core/framework/config/aspect/enhancereport/plugin/ReportAroundAdvicePlugin.java
index b0af378..8013d8a 100644
--- a/lidee-core/src/main/java/com/lideeyunji/core/framework/config/aspect/enhancereport/plugin/ReportAroundAdvicePlugin.java
+++ b/lidee-core/src/main/java/com/lideeyunji/core/framework/config/aspect/enhancereport/plugin/ReportAroundAdvicePlugin.java
@@ -8,5 +8,5 @@ import com.lideeyunji.tool.framework.yunji.model.ResultDataModel;
*/
public interface ReportAroundAdvicePlugin extends ReportBaseAdvicePlugin {
- ResultDataModel executeAround(EnhanceReportContext enhanceContext);
+ Object executeAround(EnhanceReportContext enhanceContext);
}
diff --git a/lidee-core/src/main/java/com/lideeyunji/core/framework/config/aspect/enhancereport/plugin/ReportPluginManager.java b/lidee-core/src/main/java/com/lideeyunji/core/framework/config/aspect/enhancereport/plugin/ReportPluginManager.java
index 35df8e0..bca84b8 100644
--- a/lidee-core/src/main/java/com/lideeyunji/core/framework/config/aspect/enhancereport/plugin/ReportPluginManager.java
+++ b/lidee-core/src/main/java/com/lideeyunji/core/framework/config/aspect/enhancereport/plugin/ReportPluginManager.java
@@ -40,7 +40,7 @@ public class ReportPluginManager {
plugin.execute(enhanceContext);
}
- public static ResultDataModel executeAroundPlugin(String name, EnhanceReportContext enhanceContext) {
+ public static Object executeAroundPlugin(String name, EnhanceReportContext enhanceContext) {
ReportAroundAdvicePlugin plugin = (ReportAroundAdvicePlugin)plugins.get(name);
return plugin.executeAround(enhanceContext);
}
diff --git a/lidee-core/src/main/java/com/lideeyunji/core/framework/enhance/example/report/xtsy/zhxsqkPlugin.java b/lidee-core/src/main/java/com/lideeyunji/core/framework/enhance/example/report/xtsy/zhxsqkPlugin.java
index 79461c7..d56e961 100644
--- a/lidee-core/src/main/java/com/lideeyunji/core/framework/enhance/example/report/xtsy/zhxsqkPlugin.java
+++ b/lidee-core/src/main/java/com/lideeyunji/core/framework/enhance/example/report/xtsy/zhxsqkPlugin.java
@@ -1,13 +1,19 @@
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.service.INewGrBiSaAggMonthCountService;
import com.lideeyunji.core.framework.service.INewGrBiSaAggService;
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;
@@ -15,6 +21,7 @@ import org.springframework.stereotype.Component;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
+import java.util.stream.Collectors;
/**
* 报表-系统首页-单表
@@ -25,6 +32,8 @@ public class zhxsqkPlugin implements ReportAroundAdvicePlugin {
@Autowired
INewGrBiSaAggService newGrBiSaAggService;
+ @Autowired
+ INewGrBiSaAggMonthCountService newGrBiSaAggMonthCountService;
@Override
public ResultDataModel executeAround(EnhanceReportContext enhanceContext) {
@@ -36,11 +45,17 @@ public class zhxsqkPlugin implements ReportAroundAdvicePlugin {
throw new lideeYunJiException("在选择维度时,“货品名称”不能有值!");
}
List groupFieldList = Arrays.asList(params.get("Group by").toString().split(","));
- List newGrBiSaAggList = newGrBiSaAggService.selectNewGrBiSaAggGroupMonthList(params, groupFieldList);
-// return ResultDataModel.fomatList(newGrBiSaAggList);
+ PageHelper.startPage(Integer.parseInt(params.get("pageNo").toString()), Integer.parseInt(params.get("pageSize").toString()));
+ List newGrBiSaAggList = newGrBiSaAggMonthCountService.selectNewGrBiSaAggGroupMonthList(params, groupFieldList);
+ PageInfo pageInfo = new PageInfo<>(newGrBiSaAggList);
+ List