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);