From 81c7c96ba246cbe17f33cf8a56d18df4b97a0c1b Mon Sep 17 00:00:00 2001 From: king Date: Fri, 10 Apr 2026 10:17:24 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=BC=E5=90=88=E9=94=80=E5=94=AE=E6=83=85?= =?UTF-8?q?=E5=86=B5=E8=A1=A8-=E6=A0=87=E5=87=86=E5=93=81=E5=90=8D?= =?UTF-8?q?=EF=BC=8C=E7=82=B9=E5=87=BB=E4=B8=8B=E9=92=BB=E8=87=B3=E9=94=80?= =?UTF-8?q?=E5=94=AE=E8=AF=A6=E7=BB=86=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../NewGrBiSaAggMonthCountController.java | 24 +++++++++++++++++++ .../example/report/xtsy/zhxsqkPlugin.java | 2 +- .../core/framework/params/SaAggParam.java | 2 ++ .../service/impl/NewGrBiSaAggServiceImpl.java | 6 +++++ 4 files changed, 33 insertions(+), 1 deletion(-) diff --git a/lidee-core/src/main/java/com/lideeyunji/core/framework/controller/NewGrBiSaAggMonthCountController.java b/lidee-core/src/main/java/com/lideeyunji/core/framework/controller/NewGrBiSaAggMonthCountController.java index 14feb1c..64356fb 100644 --- a/lidee-core/src/main/java/com/lideeyunji/core/framework/controller/NewGrBiSaAggMonthCountController.java +++ b/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 params = FuncWeb.getParameterBodyMap(req); + Page page = PageHelper.startPage(Integer.parseInt(params.get("pageNo").toString()), Integer.parseInt(params.get("pageSize").toString())); + zhxsqkPlugin.setMonthOrderBy(params, page); + List newGrBiSaAggList = newGrBiSaAggService.selectNewGrBiSaAggList(params); + PageInfo pageInfo = new PageInfo<>(newGrBiSaAggList); + List> list = newGrBiSaAggList.stream().map(BeanUtil::beanToMap).collect(Collectors.toList()); + return ResultDataModel.fomat(pageInfo.getTotal(),list); + } + } 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 79857d4..14c626f 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 @@ -110,7 +110,7 @@ public class zhxsqkPlugin implements ReportAroundAdvicePlugin { } } - private void setMonthOrderBy(Map params, Page page) { + public static void setMonthOrderBy(Map params, Page page) { if(params.containsKey("column")){ String orderBy = ""; if ("thisMonthSaQty".equals(params.get("column"))) { diff --git a/lidee-core/src/main/java/com/lideeyunji/core/framework/params/SaAggParam.java b/lidee-core/src/main/java/com/lideeyunji/core/framework/params/SaAggParam.java index 659fb3b..7f543f6 100644 --- a/lidee-core/src/main/java/com/lideeyunji/core/framework/params/SaAggParam.java +++ b/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; diff --git a/lidee-core/src/main/java/com/lideeyunji/core/framework/service/impl/NewGrBiSaAggServiceImpl.java b/lidee-core/src/main/java/com/lideeyunji/core/framework/service/impl/NewGrBiSaAggServiceImpl.java index 115f238..df075e6 100644 --- a/lidee-core/src/main/java/com/lideeyunji/core/framework/service/impl/NewGrBiSaAggServiceImpl.java +++ b/lidee-core/src/main/java/com/lideeyunji/core/framework/service/impl/NewGrBiSaAggServiceImpl.java @@ -148,6 +148,12 @@ public class NewGrBiSaAggServiceImpl extends ServiceImpl 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()); }