综合销售情况表-标准品名，点击下钻至销售详细列表

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

@@ -1,13 +1,20 @@
 package com.lideeyunji.core.framework.controller;
 
+import cn.hutool.core.bean.BeanUtil;
+import com.github.pagehelper.Page;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.lideeyunji.core.framework.enhance.example.report.xtsy.zhxsqkPlugin;
 import com.lideeyunji.core.framework.entity.NewGrBiSaAggMonthCount;
 import com.lideeyunji.core.framework.entity.NewGrBiSaAggYearCount;
 import com.lideeyunji.core.framework.params.SaAggParam;
 import com.lideeyunji.core.framework.service.INewGrBiSaAggMonthCountService;
+import com.lideeyunji.core.framework.service.INewGrBiSaAggService;
 import com.lideeyunji.core.framework.service.INewGrBiSaAggYearCountService;
 import com.lideeyunji.core.framework.utils.FuncWeb;
 import com.lideeyunji.tool.framework.common.constant.lideeYunJiBaseConstant;
 import com.lideeyunji.tool.framework.tenant.core.aop.TenantIgnore;
+import com.lideeyunji.tool.framework.yunji.model.ResultDataModel;
 import com.lideeyunji.tool.framework.yunji.model.global.BaseWebResult;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -15,9 +22,11 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import java.text.SimpleDateFormat;
 import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * 综合销售情况月维度Controller
@@ -36,6 +45,9 @@ public class NewGrBiSaAggMonthCountController extends BaseController
     @Autowired
     private INewGrBiSaAggYearCountService newGrBiSaAggYearCountService;
 
+    @Resource
+    INewGrBiSaAggService newGrBiSaAggService;
+
 
     /**
      * 查询综合销售情况月维度-总计
@@ -97,4 +109,16 @@ public class NewGrBiSaAggMonthCountController extends BaseController
 
     }
 
+    @PostMapping("/record")
+    public ResultDataModel getRecord(HttpServletRequest req)
+    {
+        Map<String, Object> params = FuncWeb.getParameterBodyMap(req);
+        Page<Object> page = PageHelper.startPage(Integer.parseInt(params.get("pageNo").toString()), Integer.parseInt(params.get("pageSize").toString()));
+        zhxsqkPlugin.setMonthOrderBy(params, page);
+        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/enhance/example/report/xtsy/zhxsqkPlugin.java

@@ -110,7 +110,7 @@ public class zhxsqkPlugin implements ReportAroundAdvicePlugin {
         }
     }
 
-    private void setMonthOrderBy(Map<String, Object> params, Page<Object> page) {
+    public static void setMonthOrderBy(Map<String, Object> params, Page<Object> page) {
         if(params.containsKey("column")){
             String orderBy = "";
             if ("thisMonthSaQty".equals(params.get("column"))) {

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

@@ -6,6 +6,8 @@ import java.util.List;
 
 @Data
 public class SaAggParam {
+    private String useYear;
+    private String useMonth;
     private String useYearStart;
     private String useYearEnd;
     private String useMonthStart;

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

@@ -148,6 +148,12 @@ public class NewGrBiSaAggServiceImpl extends ServiceImpl<NewGrBiSaAggMapper, New
 
     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("useYearStart")) {
             saAggParam.setUseYearStart(params.get("useYearStart").toString());
         }