From 73addd665622515836a2213f19ac73ace6214472 Mon Sep 17 00:00:00 2001 From: king Date: Mon, 23 Mar 2026 10:18:49 +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=20=E8=B0=83=E6=95=B4=E6=A0=87=E5=87=86?= =?UTF-8?q?=E5=93=81=E5=90=8D=EF=BC=8C=E8=B0=83=E6=95=B4=E6=A0=87=E5=87=86?= =?UTF-8?q?=E5=93=81=E5=90=8D=E5=88=86=E7=BB=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../example/report/xtsy/zhxsqkLineReportEnhance.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) 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 3339660..8576c87 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 @@ -53,7 +53,7 @@ public class zhxsqkLineReportEnhance implements ReportBeforeAdvicePlugin { executePluginSql.append(" current_year_data.dosage_id, \n"); executePluginSql.append(" current_year_data.dosage_name as dosagename, \n"); } - if (groupFieldList.contains("stdGoodsName")) { //标准品名 + if (groupFieldList.contains("stdGoodsName") || params.containsKey("stdGoodsName")) { //标准品名 executePluginSql.append(" current_year_data.std_goods_name as stdGoodsName, \n"); } executePluginSql.append(" GROUP_CONCAT(DISTINCT current_year_data.province_id ORDER BY current_year_data.province_id SEPARATOR ',') as province_id, \n"); //行政区域ID @@ -188,8 +188,8 @@ public class zhxsqkLineReportEnhance implements ReportBeforeAdvicePlugin { executePluginSql.append(" current_year_data.dosage_id,"); executePluginSql.append(" current_year_data.dosage_name,"); } - if (groupFieldList.contains("stdGoodsName")) { //标准品名 - executePluginSql.append(" current_year_data.std_goods_name as stdGoodsName,"); + if (groupFieldList.contains("stdGoodsName") || params.containsKey("stdGoodsName")) { //标准品名 + executePluginSql.append(" current_year_data.std_goods_name,"); } executePluginSql.deleteCharAt(executePluginSql.length() - 1); @@ -233,7 +233,7 @@ public class zhxsqkLineReportEnhance implements ReportBeforeAdvicePlugin { executePluginSql.append(" current_month.dosage_id, \n"); executePluginSql.append(" current_month.dosage_name as dosagename, \n"); } - if (groupFieldList.contains("stdGoodsName")) { //标准品名 + if (groupFieldList.contains("stdGoodsName") || params.containsKey("stdGoodsName")) { //标准品名 executePluginSql.append(" current_month.std_goods_name as stdGoodsName, \n"); } executePluginSql.append(" SUM(current_month.this_month_sa_qty) as thisMonthSaQty, "); //本月销售数量(件) @@ -424,8 +424,8 @@ public class zhxsqkLineReportEnhance implements ReportBeforeAdvicePlugin { executePluginSql.append(" current_month.dosage_id,"); executePluginSql.append(" current_month.dosage_name,"); } - if (groupFieldList.contains("stdGoodsName")) { //标准品名 - executePluginSql.append(" current_month.std_goods_name as stdGoodsName,"); + if (groupFieldList.contains("stdGoodsName") || params.containsKey("stdGoodsName")) { //标准品名 + executePluginSql.append(" current_month.std_goods_name,"); } executePluginSql.deleteCharAt(executePluginSql.length() - 1);