admin/gr_report_java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
chy
2026-03-23 11:10:48 +08:00
parent de990a6f3f 5316629d5f
commit 6871480945
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lidee-core/src/main/java/com/lideeyunji/core/framework/enhance/example/report/xtsy/zhxsqkLineReportEnhance.java
View File

@@ -53,7 +53,7 @@ public class zhxsqkLineReportEnhance implements ReportBeforeAdvicePlugin {
executePluginSql.append(" current_year_data.dosage_id, \n"); executePluginSql.append(" current_year_data.dosage_id, \n");
executePluginSql.append(" current_year_data.dosage_name as dosagename, \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(" 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 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_id,");
executePluginSql.append(" current_year_data.dosage_name,"); executePluginSql.append(" current_year_data.dosage_name,");
} }
if (groupFieldList.contains("stdGoodsName")) { //标准品名 if (groupFieldList.contains("stdGoodsName") || params.containsKey("stdGoodsName")) { //标准品名
executePluginSql.append(" current_year_data.std_goods_name as stdGoodsName,"); executePluginSql.append(" current_year_data.std_goods_name,");
} }
executePluginSql.deleteCharAt(executePluginSql.length() - 1); 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_id, \n");
executePluginSql.append(" current_month.dosage_name as dosagename, \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(" current_month.std_goods_name as stdGoodsName, \n");
} }
executePluginSql.append(" SUM(current_month.this_month_sa_qty) as thisMonthSaQty, "); //本月销售数量(件) 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_id,");
executePluginSql.append(" current_month.dosage_name,"); executePluginSql.append(" current_month.dosage_name,");
} }
if (groupFieldList.contains("stdGoodsName")) { //标准品名 if (groupFieldList.contains("stdGoodsName") || params.containsKey("stdGoodsName")) { //标准品名
executePluginSql.append(" current_month.std_goods_name as stdGoodsName,"); executePluginSql.append(" current_month.std_goods_name,");
} }
executePluginSql.deleteCharAt(executePluginSql.length() - 1); executePluginSql.deleteCharAt(executePluginSql.length() - 1);