From 8e4b6326b650070eec3f3188540b4e806e60bbeb Mon Sep 17 00:00:00 2001 From: king Date: Mon, 23 Mar 2026 19:12:01 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E7=BB=BC=E5=90=88=E9=94=80=E5=94=AE?= =?UTF-8?q?=E6=83=85=E5=86=B5=E8=A1=A8=20=E8=B0=83=E6=95=B4=E5=90=88?= =?UTF-8?q?=E8=AE=A1=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/framework/entity/NewGrBiSaAggMonthCount.java | 4 ++-- .../core/framework/entity/NewGrBiSaAggYearCount.java | 4 ++-- .../mapper/framework/NewGrBiSaAggMonthCountMapper.xml | 4 ++-- .../mapper/framework/NewGrBiSaAggYearCountMapper.xml | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/lidee-core/src/main/java/com/lideeyunji/core/framework/entity/NewGrBiSaAggMonthCount.java b/lidee-core/src/main/java/com/lideeyunji/core/framework/entity/NewGrBiSaAggMonthCount.java index 4645899..7356f1d 100644 --- a/lidee-core/src/main/java/com/lideeyunji/core/framework/entity/NewGrBiSaAggMonthCount.java +++ b/lidee-core/src/main/java/com/lideeyunji/core/framework/entity/NewGrBiSaAggMonthCount.java @@ -151,10 +151,10 @@ public class NewGrBiSaAggMonthCount implements Serializable @TableField(value = "thissamoney_s") - private BigDecimal thissamoney_s; + private BigDecimal thisMonthSaMoney_s; @TableField(value = "thisprofit_s") - private BigDecimal thisprofit_s; + private BigDecimal thisMonthProfit_s; } diff --git a/lidee-core/src/main/java/com/lideeyunji/core/framework/entity/NewGrBiSaAggYearCount.java b/lidee-core/src/main/java/com/lideeyunji/core/framework/entity/NewGrBiSaAggYearCount.java index 77f8b21..761cb26 100644 --- a/lidee-core/src/main/java/com/lideeyunji/core/framework/entity/NewGrBiSaAggYearCount.java +++ b/lidee-core/src/main/java/com/lideeyunji/core/framework/entity/NewGrBiSaAggYearCount.java @@ -146,9 +146,9 @@ public class NewGrBiSaAggYearCount implements Serializable private BigDecimal thisYearProfitChange; @TableField(value = "this_year_sa_money_s") - private BigDecimal thisYearSaMoney_s; + private BigDecimal thissamoney_s; @TableField(value = "this_year_profit_s") - private BigDecimal thisYearProfit_s; + private BigDecimal thisprofit_s; } diff --git a/lidee-core/src/main/resources/mapper/framework/NewGrBiSaAggMonthCountMapper.xml b/lidee-core/src/main/resources/mapper/framework/NewGrBiSaAggMonthCountMapper.xml index 2151925..8e42906 100644 --- a/lidee-core/src/main/resources/mapper/framework/NewGrBiSaAggMonthCountMapper.xml +++ b/lidee-core/src/main/resources/mapper/framework/NewGrBiSaAggMonthCountMapper.xml @@ -38,8 +38,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - - + + diff --git a/lidee-core/src/main/resources/mapper/framework/NewGrBiSaAggYearCountMapper.xml b/lidee-core/src/main/resources/mapper/framework/NewGrBiSaAggYearCountMapper.xml index c1a5246..a7acbd4 100644 --- a/lidee-core/src/main/resources/mapper/framework/NewGrBiSaAggYearCountMapper.xml +++ b/lidee-core/src/main/resources/mapper/framework/NewGrBiSaAggYearCountMapper.xml @@ -37,8 +37,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - - + + From 4d91edae40396c9c5a86b07d1c45a3647d41968e Mon Sep 17 00:00:00 2001 From: king Date: Tue, 24 Mar 2026 08:21:58 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E7=BB=BC=E5=90=88=E9=94=80=E5=94=AE?= =?UTF-8?q?=E6=83=85=E5=86=B5=E8=A1=A8=20=E8=B0=83=E6=95=B4=E5=90=88?= =?UTF-8?q?=E8=AE=A1=E5=80=BC=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/NewGrBiSaAggMonthCountController.java | 4 ++-- .../enhance/example/report/xtsy/zhxsqkLineReportEnhance.java | 4 ++++ .../mapper/framework/NewGrBiSaAggMonthCountMapper.xml | 4 ++-- .../mapper/framework/NewGrBiSaAggYearCountMapper.xml | 4 ++-- 4 files changed, 10 insertions(+), 6 deletions(-) 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 550f22e..d91d668 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 @@ -45,7 +45,7 @@ public class NewGrBiSaAggMonthCountController extends BaseController { Map params = FuncWeb.getParameterBodyMap(req); SaAggParam saAggParam = new SaAggParam(); - + String groupField = params.get("Group by").toString(); if (params.containsKey("usemonth")){ saAggParam.setUseMonth(params.get("usemonth").toString()); } @@ -71,7 +71,7 @@ public class NewGrBiSaAggMonthCountController extends BaseController if (params.containsKey("stdGoodsName")){ saAggParam.setStdGoodsName(Arrays.asList(params.get("stdGoodsName").toString().split( ","))); } - if (params.containsKey("usemonth")){ + if (params.containsKey("usemonth") || groupField.contains("usemonth")){ List list = newGrBiSaAggMonthCountService.getTotalDetail(saAggParam); return BaseWebResult.success(list); }else{ diff --git a/lidee-core/src/main/java/com/lideeyunji/core/framework/enhance/example/report/xtsy/zhxsqkLineReportEnhance.java b/lidee-core/src/main/java/com/lideeyunji/core/framework/enhance/example/report/xtsy/zhxsqkLineReportEnhance.java index 0f8ede2..f03d75f 100644 --- a/lidee-core/src/main/java/com/lideeyunji/core/framework/enhance/example/report/xtsy/zhxsqkLineReportEnhance.java +++ b/lidee-core/src/main/java/com/lideeyunji/core/framework/enhance/example/report/xtsy/zhxsqkLineReportEnhance.java @@ -3,6 +3,7 @@ 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.ReportBeforeAdvicePlugin; +import com.lideeyunji.tool.framework.exception.lideeYunJiException; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; @@ -22,6 +23,9 @@ public class zhxsqkLineReportEnhance implements ReportBeforeAdvicePlugin { log.info("进入=======>zhxsqkLineReportEnhance=======>execute"); Map params = enhanceContext.getParam().getParams(); if (params.containsKey("Group by")) { + if(params.containsKey("goodsname")){ + throw new lideeYunJiException("在选择维度时，“货品名称”不能有值！"); + } List groupFieldList = Arrays.asList(params.get("Group by").toString().split(",")); String sql; if((groupFieldList.contains("usemonth") || params.containsKey("usemonth"))){ diff --git a/lidee-core/src/main/resources/mapper/framework/NewGrBiSaAggMonthCountMapper.xml b/lidee-core/src/main/resources/mapper/framework/NewGrBiSaAggMonthCountMapper.xml index 8e42906..a34894c 100644 --- a/lidee-core/src/main/resources/mapper/framework/NewGrBiSaAggMonthCountMapper.xml +++ b/lidee-core/src/main/resources/mapper/framework/NewGrBiSaAggMonthCountMapper.xml @@ -48,8 +48,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" SELECT - SUM( this_year_sa_money ) AS this_year_sa_money_s, - SUM( this_year_profit ) AS this_year_profit_s + ROUND(SUM(this_year_sa_money) / 10000, 2) AS this_year_sa_money_s, + ROUND(SUM(this_year_profit) / 10000, 2) AS this_year_profit_s FROM new_gr_bi_sa_agg_year_count and use_year = #{saAggParam.useYear}