综合销售情况表 新增标准品名,新增标准品名分组
This commit is contained in:
@@ -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 (params.containsKey("stdGoodsName")) { //标准品名
|
if (groupFieldList.contains("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,7 +188,7 @@ 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 (params.containsKey("stdGoodsName")) { //标准品名
|
if (groupFieldList.contains("stdGoodsName")) { //标准品名
|
||||||
executePluginSql.append(" current_year_data.std_goods_name as stdGoodsName,");
|
executePluginSql.append(" current_year_data.std_goods_name as stdGoodsName,");
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -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 (params.containsKey("stdGoodsName")) { //标准品名
|
if (groupFieldList.contains("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,7 +424,7 @@ 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 (params.containsKey("stdGoodsName")) { //标准品名
|
if (groupFieldList.contains("stdGoodsName")) { //标准品名
|
||||||
executePluginSql.append(" current_month.std_goods_name as stdGoodsName,");
|
executePluginSql.append(" current_month.std_goods_name as stdGoodsName,");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user