From 25873076c69f21c9944585c7c2e011cb4b074737 Mon Sep 17 00:00:00 2001 From: king Date: Thu, 16 Apr 2026 10:16:52 +0800 Subject: [PATCH] =?UTF-8?q?bug=20=E5=A4=84=E7=90=86,=20=E4=BA=A7=E5=93=81?= =?UTF-8?q?=E5=8F=AF=E9=94=80=E5=BA=93=E5=AD=98=20=E5=92=8C=20=E5=BA=93?= =?UTF-8?q?=E5=AD=98=E4=BA=A7=E5=93=81=E5=8D=A0=E6=AF=94=E8=A1=A8=20?= =?UTF-8?q?=E6=8E=92=E5=BA=8F=E5=92=8C=E6=98=BE=E7=A4=BA'-'=E5=86=B2?= =?UTF-8?q?=E7=AA=81=E9=97=AE=E9=A2=98=E5=A4=84=E7=90=86,?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../NewGrBiSaAggMonthCountController.java | 4 +- .../example/report/xtsy/ProuctAvlPlugin.java | 41 +++++++++++++++++++ .../example/report/xtsy/ProuctPlugin.java | 41 +++++++++++++++++++ 3 files changed, 84 insertions(+), 2 deletions(-) create mode 100644 lidee-core/src/main/java/com/lideeyunji/core/framework/enhance/example/report/xtsy/ProuctAvlPlugin.java create mode 100644 lidee-core/src/main/java/com/lideeyunji/core/framework/enhance/example/report/xtsy/ProuctPlugin.java 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 ca1dd86..9c28b96 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 @@ -4,7 +4,7 @@ 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.enhance.example.report.xtsy.ZhxsqkPlugin; import com.lideeyunji.core.framework.entity.NewGrBiSaAgg; import com.lideeyunji.core.framework.entity.NewGrBiSaAggMonthCount; import com.lideeyunji.core.framework.entity.NewGrBiSaAggYearCount; @@ -123,7 +123,7 @@ public class NewGrBiSaAggMonthCountController extends BaseController { 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); + ZhxsqkPlugin.setMonthOrderBy(params, page); List newGrBiSaAggList = newGrBiSaAggService.selectNewGrBiSaAggList(params); PageInfo pageInfo = new PageInfo<>(newGrBiSaAggList); List> list = newGrBiSaAggList.stream().map(BeanUtil::beanToMap).collect(Collectors.toList()); diff --git a/lidee-core/src/main/java/com/lideeyunji/core/framework/enhance/example/report/xtsy/ProuctAvlPlugin.java b/lidee-core/src/main/java/com/lideeyunji/core/framework/enhance/example/report/xtsy/ProuctAvlPlugin.java new file mode 100644 index 0000000..a627662 --- /dev/null +++ b/lidee-core/src/main/java/com/lideeyunji/core/framework/enhance/example/report/xtsy/ProuctAvlPlugin.java @@ -0,0 +1,41 @@ + +package com.lideeyunji.core.framework.enhance.example.report.xtsy; + +import com.lideeyunji.core.framework.config.aspect.enhancereport.model.EnhanceReportContext; +import com.lideeyunji.core.framework.config.aspect.enhancereport.plugin.ReportAfterAdvicePlugin; +import com.lideeyunji.core.framework.utils.Func; +import org.springframework.stereotype.Component; + +import java.util.List; +import java.util.Map; + +/** + * 产品可销库存表- 增强 + */ +@Component("prouctAvlPlugin") +public class ProuctAvlPlugin implements ReportAfterAdvicePlugin { + + @Override + public void execute(EnhanceReportContext enhanceContext) { + List> records = enhanceContext.getResult().getRecords(); + if (Func.isEmpty(records)) { + return; + } + + for(Map record : records){ + if(!record.containsKey("rem")){ + record.put("rem","-"); + } + if(!record.containsKey("thismonthout")){ + record.put("thismonthout","-"); + } + if(!record.containsKey("lastmonthout")){ + record.put("lastmonthout","-"); + } + if(!record.containsKey("thisyearout")){ + record.put("thisyearout","-"); + } + } + + } +} diff --git a/lidee-core/src/main/java/com/lideeyunji/core/framework/enhance/example/report/xtsy/ProuctPlugin.java b/lidee-core/src/main/java/com/lideeyunji/core/framework/enhance/example/report/xtsy/ProuctPlugin.java new file mode 100644 index 0000000..5cd2f77 --- /dev/null +++ b/lidee-core/src/main/java/com/lideeyunji/core/framework/enhance/example/report/xtsy/ProuctPlugin.java @@ -0,0 +1,41 @@ + +package com.lideeyunji.core.framework.enhance.example.report.xtsy; + +import com.lideeyunji.core.framework.config.aspect.enhancereport.model.EnhanceReportContext; +import com.lideeyunji.core.framework.config.aspect.enhancereport.plugin.ReportAfterAdvicePlugin; +import com.lideeyunji.core.framework.utils.Func; +import org.springframework.stereotype.Component; + +import java.util.List; +import java.util.Map; + +/** + * 库存产品占比表- 增强 + */ +@Component("prouctPlugin") +public class ProuctPlugin implements ReportAfterAdvicePlugin { + + @Override + public void execute(EnhanceReportContext enhanceContext) { + List> records = enhanceContext.getResult().getRecords(); + if (Func.isEmpty(records)) { + return; + } + + for(Map record : records){ + if(!record.containsKey("money_prop")){ + record.put("money_prop","-"); + } + if(!record.containsKey("money")){ + record.put("money","-"); + } + if(!record.containsKey("qty")){ + record.put("qty","-"); + } + if(!record.containsKey("qty_prop")){ + record.put("qty_prop","-"); + } + } + + } +}