diff --git a/lidee-admin/src/main/resources/application-local.yaml b/lidee-admin/src/main/resources/application-local.yaml index 7710c33..5c75254 100644 --- a/lidee-admin/src/main/resources/application-local.yaml +++ b/lidee-admin/src/main/resources/application-local.yaml @@ -47,4 +47,8 @@ lideeyunji: yunji: # 低代码平台 debug: true #是否开启调试模式 saveReqLog: false # 是否保存请求日志 - saveOpLog: false # 是否保存操作日志 \ No newline at end of file + saveOpLog: false # 是否保存操作日志 + +logging: + level: + com.lideeyunji.core.framework.mapper: debug \ No newline at end of file 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 22ff000..c33eb9a 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,31 +45,31 @@ public class NewGrBiSaAggMonthCountController extends BaseController public BaseWebResult getTotalDetail(HttpServletRequest req) { Map params = FuncWeb.getParameterBodyMap(req); - String groupField = params.containsKey("Group by") ? "usemonth" :params.get("Group by").toString(); + String groupField = params.containsKey("Group by") ? "useMonth" :params.get("Group by").toString(); SaAggParam saAggParam = new SaAggParam(); - if (params.containsKey("usemonth")){ - saAggParam.setUseMonth(params.get("usemonth").toString()); + if (params.containsKey("useMonth")){ + saAggParam.setUseMonth(params.get("useMonth").toString()); } - if(params.containsKey("useyear")){ - saAggParam.setUseYear(params.get("useyear").toString()); + if(params.containsKey("useYear")){ + saAggParam.setUseYear(params.get("useYear").toString()); }else{ saAggParam.setUseYear(new SimpleDateFormat("yyyy").format(new Date())); } - if(params.containsKey("customname")){ - saAggParam.setCustomName(Arrays.asList(params.get("customname").toString().split(","))); + if(params.containsKey("customName")){ + saAggParam.setCustomName(Arrays.asList(params.get("customName").toString().split(","))); } - if (params.containsKey("zonename")){ - saAggParam.setZoneName(Arrays.asList(params.get("zonename").toString().split( ","))); + if (params.containsKey("zoneName")){ + saAggParam.setZoneName(Arrays.asList(params.get("zoneName").toString().split( ","))); } - if (params.containsKey("saletypename")){ - saAggParam.setSaleTypeName(Arrays.asList(params.get("saletypename").toString().split( ","))); + if (params.containsKey("saleTypeName")){ + saAggParam.setSaleTypeName(Arrays.asList(params.get("saleTypeName").toString().split( ","))); } - if (params.containsKey("salername")){ - saAggParam.setSalerName(Arrays.asList(params.get("salername").toString().split( ","))); + if (params.containsKey("salerName")){ + saAggParam.setSalerName(Arrays.asList(params.get("salerName").toString().split( ","))); } - if (params.containsKey("dosagename")){ - saAggParam.setDosageName(Arrays.asList(params.get("dosagename").toString().split( ","))); + if (params.containsKey("dosageName")){ + saAggParam.setDosageName(Arrays.asList(params.get("dosageName").toString().split( ","))); } if (params.containsKey("stdGoodsName")){ saAggParam.setStdGoodsName(Arrays.asList(params.get("stdGoodsName").toString().split( ","))); @@ -80,7 +80,7 @@ public class NewGrBiSaAggMonthCountController extends BaseController if (params.containsKey("provinceName")){ saAggParam.setProvinceName(Arrays.asList(params.get("provinceName").toString().split( ","))); } - if (params.containsKey("usemonth") || groupField.contains("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 5d55021..87709f3 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 @@ -30,37 +30,37 @@ public class zhxsqkLineReportEnhance implements ReportBeforeAdvicePlugin { } List groupFieldList = Arrays.asList(params.get("Group by").toString().split(",")); String sql; - if(!params.containsKey("useyear")){ - params.put("useyear", new SimpleDateFormat("yyyy").format(new Date())); + if(!params.containsKey("useYear")){ + params.put("useYear", new SimpleDateFormat("yyyy").format(new Date())); } - if((groupFieldList.contains("usemonth") || params.containsKey("usemonth"))){ + if((groupFieldList.contains("useMonth") || params.containsKey("useMonth"))){ sql = geroupMonthSql(params, groupFieldList); }else { StringBuilder executePluginSql = new StringBuilder(); executePluginSql.append(" SELECT \n"); - executePluginSql.append(" current_year_data.use_year as useyear, \n"); + executePluginSql.append(" current_year_data.use_year as useYear, \n"); if (groupFieldList.contains("customname") || params.containsKey("customname")) { //客户名称 executePluginSql.append(" current_year_data.custom_id as customid, \n"); - executePluginSql.append(" current_year_data.custom_name as customname, \n"); + executePluginSql.append(" current_year_data.custom_name as customName, \n"); } - if(groupFieldList.contains("useyear") || params.containsKey("useyear")){ + if(groupFieldList.contains("useYear") || params.containsKey("useYear")){ executePluginSql.append(" current_year_data.use_year as ny, \n"); //年月 } - if (groupFieldList.contains("zonename") || params.containsKey("zonename")) { //业务区域 + if (groupFieldList.contains("zoneName") || params.containsKey("zoneName")) { //业务区域 executePluginSql.append(" current_year_data.zone_id, \n"); - executePluginSql.append(" current_year_data.zone_name as zonename, \n"); + executePluginSql.append(" current_year_data.zone_name as zoneName, \n"); } - if (groupFieldList.contains("saletypename") || params.containsKey("saletypename")) { //销售类型 + if (groupFieldList.contains("saleTypeName") || params.containsKey("saleTypeName")) { //销售类型 executePluginSql.append(" current_year_data.sale_type_id, \n"); - executePluginSql.append(" current_year_data.sale_type_name as saletypename, \n"); + executePluginSql.append(" current_year_data.sale_type_name as saleTypeName, \n"); } - if (groupFieldList.contains("salername") || params.containsKey("salername")) { //业务员 + if (groupFieldList.contains("salerName") || params.containsKey("salerName")) { //业务员 executePluginSql.append(" current_year_data.saler_id, \n"); - executePluginSql.append(" current_year_data.saler_name as salername, \n"); + executePluginSql.append(" current_year_data.saler_name as salerName, \n"); } - if (groupFieldList.contains("dosagename") || params.containsKey("dosagename")) { //剂型 + if (groupFieldList.contains("dosageName") || params.containsKey("dosageName")) { //剂型 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") || params.containsKey("stdGoodsName")) { //标准品名 executePluginSql.append(" current_year_data.std_goods_name as stdGoodsName, \n"); @@ -134,7 +134,7 @@ public class zhxsqkLineReportEnhance implements ReportBeforeAdvicePlugin { executePluginSql.append(" FROM \n"); executePluginSql.append(" (SELECT use_year , \n"); executePluginSql.append(" use_year AS ny, \n"); - if (groupFieldList.contains("customname") || params.containsKey("customname")) { //客户名称 + if (groupFieldList.contains("customName") || params.containsKey("customName")) { //客户名称 executePluginSql.append(" custom_id, \n"); executePluginSql.append(" custom_name , \n"); } @@ -143,20 +143,20 @@ public class zhxsqkLineReportEnhance implements ReportBeforeAdvicePlugin { executePluginSql.append(" std_goods_name, \n"); } - if (groupFieldList.contains("zonename") || params.containsKey("zonename")) { //业务区域 + if (groupFieldList.contains("zoneName") || params.containsKey("zoneName")) { //业务区域 executePluginSql.append(" zone_id, \n"); executePluginSql.append(" zone_name, \n"); } - if (groupFieldList.contains("saletypename") || params.containsKey("saletypename")) { //销售类型 + if (groupFieldList.contains("saleTypeName") || params.containsKey("saleTypeName")) { //销售类型 executePluginSql.append(" sale_type_id, \n"); executePluginSql.append(" sale_type_name, \n"); } - if (groupFieldList.contains("dosagename") || params.containsKey("dosagename")) { //剂型 + if (groupFieldList.contains("dosageName") || params.containsKey("dosageName")) { //剂型 executePluginSql.append(" dosage_id, \n"); executePluginSql.append(" dosage_name, \n"); } - if (groupFieldList.contains("salername") || params.containsKey("salername")) { //业务员 + if (groupFieldList.contains("salerName") || params.containsKey("salerName")) { //业务员 executePluginSql.append(" saler_id, \n"); executePluginSql.append(" saler_name, \n"); } @@ -170,27 +170,27 @@ public class zhxsqkLineReportEnhance implements ReportBeforeAdvicePlugin { appendWhere(params,executePluginSql); executePluginSql.append(" GROUP BY use_year,"); - if (groupFieldList.contains("customname") || params.containsKey("customname")) { //客户名称 + if (groupFieldList.contains("customName") || params.containsKey("customName")) { //客户名称 executePluginSql.append(" custom_id,"); executePluginSql.append(" custom_name,"); } if (groupFieldList.contains("stdGoodsName") || params.containsKey("stdGoodsName")) { //标准品名 executePluginSql.append(" std_goods_name,"); } - if (groupFieldList.contains("zonename") || params.containsKey("zonename")) { //业务区域 + if (groupFieldList.contains("zoneName") || params.containsKey("zoneName")) { //业务区域 executePluginSql.append(" zone_id,"); executePluginSql.append(" zone_name,"); } - if (groupFieldList.contains("saletypename") || params.containsKey("saletypename")) { //销售类型 + if (groupFieldList.contains("saleTypeName") || params.containsKey("saleTypeName")) { //销售类型 executePluginSql.append(" sale_type_id,"); executePluginSql.append(" sale_type_name,"); } - if (groupFieldList.contains("dosagename") || params.containsKey("dosagename")) { //剂型 + if (groupFieldList.contains("dosageName") || params.containsKey("dosageName")) { //剂型 executePluginSql.append(" dosage_id,"); executePluginSql.append(" dosage_name,"); } - if (groupFieldList.contains("salername") || params.containsKey("salername")) { //业务员 + if (groupFieldList.contains("salerName") || params.containsKey("salerName")) { //业务员 executePluginSql.append(" saler_id,"); executePluginSql.append(" saler_name,"); } @@ -210,12 +210,12 @@ public class zhxsqkLineReportEnhance implements ReportBeforeAdvicePlugin { executePluginSql.append(" SUM(this_year_cost) AS last_year_cost, \n"); executePluginSql.append(" SUM(this_year_profit) AS last_year_profit \n"); executePluginSql.append(" FROM new_gr_bi_sa_agg_year_count \n"); - if(params.containsKey("useyear")){ - params.put("useyear", Integer.parseInt(params.get("useyear").toString()) - 1); + if(params.containsKey("useYear")){ + params.put("useYear", Integer.parseInt(params.get("useYear").toString()) - 1); } appendWhere(params, executePluginSql); - if(params.containsKey("useyear")){ - params.put("useyear", Integer.parseInt(params.get("useyear").toString() ) + 1); + if(params.containsKey("useYear")){ + params.put("useYear", Integer.parseInt(params.get("useYear").toString() ) + 1); } executePluginSql.append(" GROUP BY use_year,"); // executePluginSql.append(" custom_id, \n"); @@ -227,23 +227,23 @@ public class zhxsqkLineReportEnhance implements ReportBeforeAdvicePlugin { appendGroupByField(params, groupFieldList,executePluginSql); executePluginSql.append(" ) AS last_year_data \n"); executePluginSql.append(" ON last_year_data.use_year = current_year_data.use_year - 1 \n"); - if (groupFieldList.contains("customname") || params.containsKey("customname")) { //客户名称 + if (groupFieldList.contains("customName") || params.containsKey("customName")) { //客户名称 executePluginSql.append(" AND current_year_data.custom_id = last_year_data.custom_id \n"); } if (groupFieldList.contains("stdGoodsName") || params.containsKey("stdGoodsName")) { //标准品名 executePluginSql.append(" AND current_year_data.std_goods_name = last_year_data.std_goods_name \n"); } - if (groupFieldList.contains("zonename") || params.containsKey("zonename")) { //业务区域 + if (groupFieldList.contains("zoneName") || params.containsKey("zoneName")) { //业务区域 executePluginSql.append(" AND current_year_data.zone_id = last_year_data.zone_id \n"); } // executePluginSql.append(" AND current_month.province_id = last_year_data.province_id \n"); - if (groupFieldList.contains("saletypename") || params.containsKey("saletypename")) { //销售类型 + if (groupFieldList.contains("saleTypeName") || params.containsKey("saleTypeName")) { //销售类型 executePluginSql.append(" AND current_year_data.sale_type_id = last_year_data.sale_type_id \n"); } - if (groupFieldList.contains("dosagename") || params.containsKey("dosagename")) { //剂型 + if (groupFieldList.contains("dosageName") || params.containsKey("dosageName")) { //剂型 executePluginSql.append(" AND current_year_data.dosage_id = last_year_data.dosage_id \n"); } - if (groupFieldList.contains("salername") || params.containsKey("salername")) { //业务员 + if (groupFieldList.contains("salerName") || params.containsKey("salerName")) { //业务员 executePluginSql.append(" AND current_year_data.saler_id = last_year_data.saler_id \n"); } // executePluginSql.append(" ON current_year_data.std_goods_name = last_year_data.std_goods_name \n"); @@ -261,29 +261,29 @@ public class zhxsqkLineReportEnhance implements ReportBeforeAdvicePlugin { executePluginSql.append(" ON total_year_data.use_year = current_year_data.use_year \n"); // executePluginSql.append(" GROUP BY \n"); -// if (groupFieldList.contains("customname") || params.containsKey("customname")) { +// if (groupFieldList.contains("customName") || params.containsKey("customName")) { // executePluginSql.append(" current_year_data.custom_id,"); // executePluginSql.append(" current_year_data.custom_name,"); // } -// if (groupFieldList.contains("useyear") || params.containsKey("useyear")) { +// if (groupFieldList.contains("useYear") || params.containsKey("useYear")) { // executePluginSql.append(" current_year_data.use_year,"); // } -// if (groupFieldList.contains("usemonth") || params.containsKey("usemonth")) { +// if (groupFieldList.contains("useMonth") || params.containsKey("useMonth")) { // executePluginSql.append(" current_year_data.use_month,"); // } -// if (groupFieldList.contains("zonename") || params.containsKey("zonename")) { +// if (groupFieldList.contains("zoneName") || params.containsKey("zoneName")) { // executePluginSql.append(" current_year_data.zone_id,"); // executePluginSql.append(" current_year_data.zone_name,"); // } -// if (groupFieldList.contains("saletypename") || params.containsKey("saletypename")) { +// if (groupFieldList.contains("saleTypeName") || params.containsKey("saleTypeName")) { // executePluginSql.append(" current_year_data.sale_type_id,"); // executePluginSql.append(" current_year_data.sale_type_name,"); // } -// if (groupFieldList.contains("salername") || params.containsKey("salername")) { +// if (groupFieldList.contains("salerName") || params.containsKey("salerName")) { // executePluginSql.append(" current_year_data.saler_id,"); // executePluginSql.append(" current_year_data.saler_name,"); // } -// if (groupFieldList.contains("dosagename") || params.containsKey("dosagename")) { +// if (groupFieldList.contains("dosageName") || params.containsKey("dosageName")) { // executePluginSql.append(" current_year_data.dosage_id,"); // executePluginSql.append(" current_year_data.dosage_name,"); // } @@ -303,34 +303,34 @@ public class zhxsqkLineReportEnhance implements ReportBeforeAdvicePlugin { private String geroupMonthSql(Map params, List groupFieldList) { StringBuilder executePluginSql = new StringBuilder(); executePluginSql.append("select"); - if (groupFieldList.contains("usemonth") || params.containsKey("usemonth")) { //月 - executePluginSql.append(" current_month.use_year as useyear,"); - executePluginSql.append(" current_month.use_month as usemonth, \n"); - if(groupFieldList.contains("useyear") || params.containsKey("useyear")){ + if (groupFieldList.contains("useMonth") || params.containsKey("useMonth")) { //月 + executePluginSql.append(" current_month.use_year as useYear,"); + executePluginSql.append(" current_month.use_month as useMonth, \n"); + if(groupFieldList.contains("useYear") || params.containsKey("useYear")){ executePluginSql.append(" current_month.ny, \n"); //年月 }else{ executePluginSql.append(" LPAD(current_month.use_month, 2, '0') as ny, \n"); } } - if (groupFieldList.contains("customname") || params.containsKey("customname")) { //客户名称 + if (groupFieldList.contains("customName") || params.containsKey("customName")) { //客户名称 executePluginSql.append(" current_month.custom_id as customid, \n"); - executePluginSql.append(" current_month.custom_name as customname, \n"); + executePluginSql.append(" current_month.custom_name as customName, \n"); } - if (groupFieldList.contains("zonename") || params.containsKey("zonename")) { //业务区域 + if (groupFieldList.contains("zoneName") || params.containsKey("zoneName")) { //业务区域 executePluginSql.append(" current_month.zone_id, \n"); - executePluginSql.append(" current_month.zone_name as zonename, \n"); + executePluginSql.append(" current_month.zone_name as zoneName, \n"); } - if (groupFieldList.contains("saletypename") || params.containsKey("saletypename")) { //销售类型 + if (groupFieldList.contains("saleTypeName") || params.containsKey("saleTypeName")) { //销售类型 executePluginSql.append(" current_month.sale_type_id, \n"); - executePluginSql.append(" current_month.sale_type_name as saletypename, \n"); + executePluginSql.append(" current_month.sale_type_name as saleTypeName, \n"); } - if (groupFieldList.contains("salername") || params.containsKey("salername")) { //业务员 + if (groupFieldList.contains("salerName") || params.containsKey("salerName")) { //业务员 executePluginSql.append(" current_month.saler_id, \n"); - executePluginSql.append(" current_month.saler_name as salername, \n"); + executePluginSql.append(" current_month.saler_name as salerName, \n"); } - if (groupFieldList.contains("dosagename") || params.containsKey("dosagename")) { //剂型 + if (groupFieldList.contains("dosageName") || params.containsKey("dosageName")) { //剂型 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") || params.containsKey("stdGoodsName")) { //标准品名 executePluginSql.append(" current_month.std_goods_name as stdGoodsName, \n"); @@ -409,7 +409,7 @@ public class zhxsqkLineReportEnhance implements ReportBeforeAdvicePlugin { executePluginSql.append(" use_year AS use_year, \n"); executePluginSql.append(" use_month AS use_month, \n"); - if (groupFieldList.contains("customname") || params.containsKey("customname")) { //客户名称 + if (groupFieldList.contains("customName") || params.containsKey("customName")) { //客户名称 executePluginSql.append(" custom_id, \n"); executePluginSql.append(" custom_name , \n"); } @@ -418,20 +418,20 @@ public class zhxsqkLineReportEnhance implements ReportBeforeAdvicePlugin { executePluginSql.append(" std_goods_name, \n"); } - if (groupFieldList.contains("zonename") || params.containsKey("zonename") ) { //业务区域 + if (groupFieldList.contains("zoneName") || params.containsKey("zoneName") ) { //业务区域 executePluginSql.append(" zone_id, \n"); executePluginSql.append(" zone_name, \n"); } - if (groupFieldList.contains("saletypename") || params.containsKey("saletypename")) { //销售类型 + if (groupFieldList.contains("saleTypeName") || params.containsKey("saleTypeName")) { //销售类型 executePluginSql.append(" sale_type_id, \n"); executePluginSql.append(" sale_type_name, \n"); } - if (groupFieldList.contains("dosagename") || params.containsKey("dosagename")) { //剂型 + if (groupFieldList.contains("dosageName") || params.containsKey("dosageName")) { //剂型 executePluginSql.append(" dosage_id, \n"); executePluginSql.append(" dosage_name, \n"); } - if (groupFieldList.contains("salername") || params.containsKey("salername")) { //业务员 + if (groupFieldList.contains("salerName") || params.containsKey("salerName")) { //业务员 executePluginSql.append(" saler_id, \n"); executePluginSql.append(" saler_name, \n"); } @@ -447,27 +447,27 @@ public class zhxsqkLineReportEnhance implements ReportBeforeAdvicePlugin { appendWhere(params, executePluginSql); executePluginSql.append(" GROUP BY use_year,use_month,"); - if (groupFieldList.contains("customname") || params.containsKey("customname")) { //客户名称 + if (groupFieldList.contains("customName") || params.containsKey("customName")) { //客户名称 executePluginSql.append(" custom_id,"); executePluginSql.append(" custom_name,"); } if (groupFieldList.contains("stdGoodsName") || params.containsKey("stdGoodsName")) { //标准品名 executePluginSql.append(" std_goods_name,"); } - if (groupFieldList.contains("zonename") || params.containsKey("zonename")) { //业务区域 + if (groupFieldList.contains("zoneName") || params.containsKey("zoneName")) { //业务区域 executePluginSql.append(" zone_id,"); executePluginSql.append(" zone_name,"); } - if (groupFieldList.contains("saletypename") || params.containsKey("saletypename")) { //销售类型 + if (groupFieldList.contains("saleTypeName") || params.containsKey("saleTypeName")) { //销售类型 executePluginSql.append(" sale_type_id,"); executePluginSql.append(" sale_type_name,"); } - if (groupFieldList.contains("dosagename") || params.containsKey("dosagename")) { //剂型 + if (groupFieldList.contains("dosageName") || params.containsKey("dosageName")) { //剂型 executePluginSql.append(" dosage_id,"); executePluginSql.append(" dosage_name,"); } - if (groupFieldList.contains("salername") || params.containsKey("salername")) { //业务员 + if (groupFieldList.contains("salerName") || params.containsKey("salerName")) { //业务员 executePluginSql.append(" saler_id,"); executePluginSql.append(" saler_name,"); } @@ -489,23 +489,23 @@ public class zhxsqkLineReportEnhance implements ReportBeforeAdvicePlugin { executePluginSql.append(" ON last_month_data.use_year = current_month.use_year - (current_month.use_month = 1)\n"); executePluginSql.append(" AND last_month_data.use_month = IF(current_month.use_month = 1, 12, current_month.use_month - 1)\n"); - if (groupFieldList.contains("customname") || params.containsKey("customname") ) { //客户名称 + if (groupFieldList.contains("customName") || params.containsKey("customName") ) { //客户名称 executePluginSql.append(" AND current_month.custom_id = last_month_data.custom_id \n"); } if (groupFieldList.contains("stdGoodsName") || params.containsKey("stdGoodsName")) { //标准品名 executePluginSql.append(" AND current_month.std_goods_name = last_month_data.std_goods_name \n"); } - if (groupFieldList.contains("zonename") || params.containsKey("zonename")) { //业务区域 + if (groupFieldList.contains("zoneName") || params.containsKey("zoneName")) { //业务区域 executePluginSql.append(" AND current_month.zone_id = last_month_data.zone_id \n"); } // executePluginSql.append(" AND current_month.province_id = last_month_data.province_id \n"); - if (groupFieldList.contains("saletypename") || params.containsKey("saletypename")) { //销售类型 + if (groupFieldList.contains("saleTypeName") || params.containsKey("saleTypeName")) { //销售类型 executePluginSql.append(" AND current_month.sale_type_id = last_month_data.sale_type_id \n"); } - if (groupFieldList.contains("dosagename") || params.containsKey("dosagename")) { //剂型 + if (groupFieldList.contains("dosageName") || params.containsKey("dosageName")) { //剂型 executePluginSql.append(" AND current_month.dosage_id = last_month_data.dosage_id \n"); } - if (groupFieldList.contains("salername") || params.containsKey("salername")) { //业务员 + if (groupFieldList.contains("salerName") || params.containsKey("salerName")) { //业务员 executePluginSql.append(" AND current_month.saler_id = last_month_data.saler_id \n"); } executePluginSql.append(" LEFT JOIN (SELECT use_year, \n"); @@ -524,12 +524,12 @@ public class zhxsqkLineReportEnhance implements ReportBeforeAdvicePlugin { executePluginSql.append(" SUM(this_month_cost) as yoy_month_cost, \n"); // 同比月销售成本 executePluginSql.append(" SUM(this_month_profit) AS yoy_month_profit \n"); // 同比月毛利额 executePluginSql.append(" FROM new_gr_bi_sa_agg_month_count "); - if(params.containsKey("useyear")){ - params.put("useyear", Integer.parseInt(params.get("useyear").toString()) - 1); + if(params.containsKey("useYear")){ + params.put("useYear", Integer.parseInt(params.get("useYear").toString()) - 1); } appendWhere(params, executePluginSql); - if(params.containsKey("useyear")){ - params.put("useyear", Integer.parseInt(params.get("useyear").toString() ) + 1); + if(params.containsKey("useYear")){ + params.put("useYear", Integer.parseInt(params.get("useYear").toString() ) + 1); } executePluginSql.append(" GROUP BY use_year,use_month,"); appendGroupByField(params, groupFieldList, executePluginSql); @@ -538,20 +538,20 @@ public class zhxsqkLineReportEnhance implements ReportBeforeAdvicePlugin { if (groupFieldList.contains("stdGoodsName") || params.containsKey("stdGoodsName")) { //标准品名 executePluginSql.append(" AND yoy_month.std_goods_name = current_month.std_goods_name \n"); } - if (groupFieldList.contains("zonename") || params.containsKey("zonename")) { //业务区域 + if (groupFieldList.contains("zoneName") || params.containsKey("zoneName")) { //业务区域 executePluginSql.append(" AND yoy_month.zone_id = current_month.zone_id \n"); } // executePluginSql.append(" AND yoy_month.province_id = current_month.province_id \n"); - if (groupFieldList.contains("saletypename") || params.containsKey("saletypename")) { //销售类型 + if (groupFieldList.contains("saleTypeName") || params.containsKey("saleTypeName")) { //销售类型 executePluginSql.append(" AND yoy_month.sale_type_id = current_month.sale_type_id \n"); } - if (groupFieldList.contains("dosagename") || params.containsKey("dosagename")) { //剂型 + if (groupFieldList.contains("dosageName") || params.containsKey("dosageName")) { //剂型 executePluginSql.append(" AND yoy_month.dosage_id = current_month.dosage_id \n"); } - if (groupFieldList.contains("customname") || params.containsKey("customname")) { //客户名称 + if (groupFieldList.contains("customName") || params.containsKey("customName")) { //客户名称 executePluginSql.append(" AND yoy_month.custom_id = current_month.custom_id \n"); } - if (groupFieldList.contains("salername") || params.containsKey("salername")) { //业务员 + if (groupFieldList.contains("salerName") || params.containsKey("salerName")) { //业务员 executePluginSql.append(" AND yoy_month.saler_id = current_month.saler_id \n"); } executePluginSql.append(" LEFT JOIN (\n"); @@ -564,36 +564,36 @@ public class zhxsqkLineReportEnhance implements ReportBeforeAdvicePlugin { executePluginSql.append(" use_year\n"); executePluginSql.append(" ) total_month_data ON total_month_data.use_year = current_month.use_year \n"); // executePluginSql.append(" AND total_month_data.use_month = current_month.use_month \n"); - if(params.containsKey("useyear")){ - executePluginSql.append(" where current_month.use_year = " + params.get("useyear")); - if(params.containsKey("usemonth")){ - executePluginSql.append(" and current_month.use_month = " + params.get("usemonth")); + if(params.containsKey("useYear")){ + executePluginSql.append(" where current_month.use_year = " + params.get("useYear")); + if(params.containsKey("useMonth")){ + executePluginSql.append(" and current_month.use_month = " + params.get("useMonth")); } } // executePluginSql.append(" GROUP BY \n"); -// if (groupFieldList.contains("customname") || params.containsKey("customname")) { +// if (groupFieldList.contains("customName") || params.containsKey("customName")) { // executePluginSql.append(" current_month.custom_id,"); // executePluginSql.append(" current_month.custom_name,"); // } -// if (groupFieldList.contains("useyear") || params.containsKey("useyear")) { +// if (groupFieldList.contains("useYear") || params.containsKey("useYear")) { // executePluginSql.append(" current_month.use_year,"); // } -// if (groupFieldList.contains("usemonth") || params.containsKey("usemonth")) { +// if (groupFieldList.contains("useMonth") || params.containsKey("useMonth")) { // executePluginSql.append(" current_month.use_month,"); // } -// if (groupFieldList.contains("zonename") || params.containsKey("zonename")) { +// if (groupFieldList.contains("zoneName") || params.containsKey("zoneName")) { // executePluginSql.append(" current_month.zone_id,"); // executePluginSql.append(" current_month.zone_name,"); // } -// if (groupFieldList.contains("saletypename") || params.containsKey("saletypename")) { +// if (groupFieldList.contains("saleTypeName") || params.containsKey("saleTypeName")) { // executePluginSql.append(" current_month.sale_type_id,"); // executePluginSql.append(" current_month.sale_type_name,"); // } -// if (groupFieldList.contains("salername") || params.containsKey("salername")) { +// if (groupFieldList.contains("salerName") || params.containsKey("salerName")) { // executePluginSql.append(" current_month.saler_id,"); // executePluginSql.append(" current_month.saler_name,"); // } -// if (groupFieldList.contains("dosagename") || params.containsKey("dosagename")) { +// if (groupFieldList.contains("dosageName") || params.containsKey("dosageName")) { // executePluginSql.append(" current_month.dosage_id,"); // executePluginSql.append(" current_month.dosage_name,"); // } @@ -607,7 +607,7 @@ public class zhxsqkLineReportEnhance implements ReportBeforeAdvicePlugin { } private void appendGroupByField(Map params, List groupFieldList, StringBuilder executePluginSql) { - if (groupFieldList.contains("customname") || params.containsKey("customname")) { //客户名称 + if (groupFieldList.contains("customName") || params.containsKey("customName")) { //客户名称 executePluginSql.append(" custom_id,"); } @@ -615,68 +615,68 @@ public class zhxsqkLineReportEnhance implements ReportBeforeAdvicePlugin { executePluginSql.append(" std_goods_name,"); } - if (groupFieldList.contains("zonename") || params.containsKey("zonename")) { //业务区域 + if (groupFieldList.contains("zoneName") || params.containsKey("zoneName")) { //业务区域 executePluginSql.append(" zone_id,"); } - if (groupFieldList.contains("saletypename") || params.containsKey("saletypename")) { //销售类型 + if (groupFieldList.contains("saleTypeName") || params.containsKey("saleTypeName")) { //销售类型 executePluginSql.append(" sale_type_id,"); } - if (groupFieldList.contains("dosagename") || params.containsKey("dosagename")) { //剂型 + if (groupFieldList.contains("dosageName") || params.containsKey("dosageName")) { //剂型 executePluginSql.append(" dosage_id,"); } - if (groupFieldList.contains("salername") || params.containsKey("salername")) { //业务员 + if (groupFieldList.contains("salerName") || params.containsKey("salerName")) { //业务员 executePluginSql.append(" saler_id,"); } executePluginSql.deleteCharAt(executePluginSql.length() - 1); } private void appendSelectField(Map params, List groupFieldList, StringBuilder executePluginSql) { - if (groupFieldList.contains("customname") || params.containsKey("customname")) { //客户名称 + if (groupFieldList.contains("customName") || params.containsKey("customName")) { //客户名称 executePluginSql.append(" custom_id, \n"); } if (groupFieldList.contains("stdGoodsName") || params.containsKey("stdGoodsName")) { //标准品名 executePluginSql.append(" std_goods_name, \n"); } - if (groupFieldList.contains("zonename") || params.containsKey("zonename")) { //业务区域 + if (groupFieldList.contains("zoneName") || params.containsKey("zoneName")) { //业务区域 executePluginSql.append(" zone_id, \n"); } - if (groupFieldList.contains("saletypename") || params.containsKey("saletypename")) { //销售类型 + if (groupFieldList.contains("saleTypeName") || params.containsKey("saleTypeName")) { //销售类型 executePluginSql.append(" sale_type_id, \n"); } - if (groupFieldList.contains("dosagename") || params.containsKey("dosagename")) { //剂型 + if (groupFieldList.contains("dosageName") || params.containsKey("dosageName")) { //剂型 executePluginSql.append(" dosage_id, \n"); } - if (groupFieldList.contains("salername") || params.containsKey("salername")) { //业务员 + if (groupFieldList.contains("salerName") || params.containsKey("salerName")) { //业务员 executePluginSql.append(" saler_id, \n"); } } private void appendWhere(Map params, StringBuilder executePluginSql) { executePluginSql.append(" where"); - if (params.containsKey("useyear")) { - executePluginSql.append(" use_year = '").append(Integer.parseInt(params.get("useyear").toString())).append("'"); + if (params.containsKey("useYear")) { + executePluginSql.append(" use_year = '").append(Integer.parseInt(params.get("useYear").toString())).append("'"); } - if (params.containsKey("usemonth")) { - executePluginSql.append(" AND use_month = '").append(Integer.parseInt(params.get("usemonth").toString())).append("'"); + if (params.containsKey("useMonth")) { + executePluginSql.append(" AND use_month = '").append(Integer.parseInt(params.get("useMonth").toString())).append("'"); } - if (params.containsKey("customname")) { - executePluginSql.append(" AND custom_name IN ('").append(params.get("customname").toString().replaceAll(",", "','")).append("')"); + if (params.containsKey("customName")) { + executePluginSql.append(" AND custom_name IN ('").append(params.get("customName").toString().replaceAll(",", "','")).append("')"); } if (params.containsKey("stdGoodsName")) { executePluginSql.append(" AND std_goods_name IN ('").append(params.get("stdGoodsName").toString().replaceAll(",", "','")).append("')"); } - if (params.containsKey("zonename")) { - executePluginSql.append(" AND zone_name IN ('").append(params.get("zonename").toString().replaceAll(",", "','")).append("')"); + if (params.containsKey("zoneName")) { + executePluginSql.append(" AND zone_name IN ('").append(params.get("zoneName").toString().replaceAll(",", "','")).append("')"); } - if (params.containsKey("saletypename")) { - executePluginSql.append(" AND sale_type_name IN ('").append(params.get("saletypename").toString().replaceAll(",", "','")).append("')"); + if (params.containsKey("saleTypeName")) { + executePluginSql.append(" AND sale_type_name IN ('").append(params.get("saleTypeName").toString().replaceAll(",", "','")).append("')"); } - if (params.containsKey("dosagename")) { - executePluginSql.append(" AND dosage_name IN ('").append(params.get("dosagename").toString().replaceAll(",", "','")).append("')"); + if (params.containsKey("dosageName")) { + executePluginSql.append(" AND dosage_name IN ('").append(params.get("dosageName").toString().replaceAll(",", "','")).append("')"); } - if (params.containsKey("salername")) { - executePluginSql.append(" AND saler_name IN ('").append(params.get("salername").toString().replaceAll(",", "','")).append("')"); + if (params.containsKey("salerName")) { + executePluginSql.append(" AND saler_name IN ('").append(params.get("salerName").toString().replaceAll(",", "','")).append("')"); } } diff --git a/lidee-core/src/main/java/com/lideeyunji/core/framework/enhance/example/report/xtsy/zhxsqkPlugin.java b/lidee-core/src/main/java/com/lideeyunji/core/framework/enhance/example/report/xtsy/zhxsqkPlugin.java index 7a70464..4b3fc52 100644 --- a/lidee-core/src/main/java/com/lideeyunji/core/framework/enhance/example/report/xtsy/zhxsqkPlugin.java +++ b/lidee-core/src/main/java/com/lideeyunji/core/framework/enhance/example/report/xtsy/zhxsqkPlugin.java @@ -9,8 +9,10 @@ import com.lideeyunji.core.framework.config.aspect.enhancereport.plugin.ReportAr import com.lideeyunji.core.framework.config.aspect.enhancereport.plugin.ReportBeforeAdvicePlugin; import com.lideeyunji.core.framework.entity.NewGrBiSaAgg; import com.lideeyunji.core.framework.entity.NewGrBiSaAggMonthCount; +import com.lideeyunji.core.framework.entity.NewGrBiSaAggYearCount; import com.lideeyunji.core.framework.service.INewGrBiSaAggMonthCountService; import com.lideeyunji.core.framework.service.INewGrBiSaAggService; +import com.lideeyunji.core.framework.service.INewGrBiSaAggYearCountService; import com.lideeyunji.tool.framework.exception.lideeYunJiException; import com.lideeyunji.tool.framework.yunji.model.ResultDataModel; import com.lideeyunji.tool.framework.yunji.model.global.BaseWebResult; @@ -18,6 +20,7 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; +import javax.annotation.Resource; import java.util.Arrays; import java.util.List; import java.util.Map; @@ -30,11 +33,15 @@ import java.util.stream.Collectors; @Component("zhxsqkPlugin") public class zhxsqkPlugin implements ReportAroundAdvicePlugin { - @Autowired + @Resource INewGrBiSaAggService newGrBiSaAggService; - @Autowired + + @Resource INewGrBiSaAggMonthCountService newGrBiSaAggMonthCountService; + @Resource + INewGrBiSaAggYearCountService newGrBiSaAggYearCountService; + @Override public ResultDataModel executeAround(EnhanceReportContext enhanceContext) { log.info("进入=======>zhxsqkLineReportEnhance=======>execute"); @@ -46,14 +53,22 @@ public class zhxsqkPlugin implements ReportAroundAdvicePlugin { } List groupFieldList = Arrays.asList(params.get("Group by").toString().split(",")); PageHelper.startPage(Integer.parseInt(params.get("pageNo").toString()), Integer.parseInt(params.get("pageSize").toString())); - List newGrBiSaAggList = newGrBiSaAggMonthCountService.selectNewGrBiSaAggGroupMonthList(params, groupFieldList); - PageInfo pageInfo = new PageInfo<>(newGrBiSaAggList); - List> list = newGrBiSaAggList.stream().map(BeanUtil::beanToMap).collect(Collectors.toList()); - return ResultDataModel.fomat(pageInfo.getTotal(),list); + if((groupFieldList.contains("useMonth") || params.containsKey("useMonth"))){ + List newGrBiSaAggList = newGrBiSaAggMonthCountService.selectNewGrBiSaAggGroupMonthList(params, groupFieldList); + PageInfo pageInfo = new PageInfo<>(newGrBiSaAggList); + List> list = newGrBiSaAggList.stream().map(BeanUtil::beanToMap).collect(Collectors.toList()); + return ResultDataModel.fomat(pageInfo.getTotal(),list); + }else{ + List newGrBiSaAggList = newGrBiSaAggYearCountService.selectNewGrBiSaAggGroupYearList(params, groupFieldList); + PageInfo pageInfo = new PageInfo<>(newGrBiSaAggList); + List> list = newGrBiSaAggList.stream().map(BeanUtil::beanToMap).collect(Collectors.toList()); + return ResultDataModel.fomat(pageInfo.getTotal(),list); + } + }else { PageHelper.startPage(Integer.parseInt(params.get("pageNo").toString()), Integer.parseInt(params.get("pageSize").toString())); - List newGrBiSaAggList = newGrBiSaAggService.selectNewGrBiSaAggList(params); - PageInfo pageInfo = new PageInfo<>(newGrBiSaAggList); + List newGrBiSaAggList = newGrBiSaAggService.selectNewGrBiSaAggList(params); + PageInfo pageInfo = new PageInfo<>(newGrBiSaAggList); List> list = newGrBiSaAggList.stream().map(BeanUtil::beanToMap).collect(Collectors.toList()); return ResultDataModel.fomat(pageInfo.getTotal(),list); } 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 761cb26..5695c93 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 @@ -25,6 +25,8 @@ public class NewGrBiSaAggYearCount implements Serializable @TableField(value = "use_year") private String useYear; + @TableField(value = "ny") + private String ny; @TableField(value = "zone_id") private Long zoneId; @@ -135,15 +137,15 @@ public class NewGrBiSaAggYearCount implements Serializable @TableField(value = "this_year_sa_money_growth") - private BigDecimal thisYearSaMoneyGrowth; + private String thisYearSaMoneyGrowth; @TableField(value = "this_year_profit_growth") - private BigDecimal thisYearProfitGrowth; + private String thisYearProfitGrowth; @TableField(value = "this_year_profit_change") - private BigDecimal thisYearProfitChange; + private String thisYearProfitChange; @TableField(value = "this_year_sa_money_s") private BigDecimal thissamoney_s; @@ -151,4 +153,17 @@ public class NewGrBiSaAggYearCount implements Serializable @TableField(value = "this_year_profit_s") private BigDecimal thisprofit_s; + + @TableField(value = "saqty_yoy") + private String saqty_yoy; + + @TableField(value = "samoney_yoy") + private String samoney_yoy; + + @TableField(value = "profit_yoy") + private String profit_yoy; + + @TableField(value = "thisprofitshare") + private String thisprofitshare; + } diff --git a/lidee-core/src/main/java/com/lideeyunji/core/framework/mapper/NewGrBiSaAggMapper.java b/lidee-core/src/main/java/com/lideeyunji/core/framework/mapper/NewGrBiSaAggMapper.java index cf9a33c..6e159f1 100644 --- a/lidee-core/src/main/java/com/lideeyunji/core/framework/mapper/NewGrBiSaAggMapper.java +++ b/lidee-core/src/main/java/com/lideeyunji/core/framework/mapper/NewGrBiSaAggMapper.java @@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.annotation.InterceptorIgnore; import com.lideeyunji.core.framework.entity.GrBiSaAgg; import com.lideeyunji.core.framework.entity.NewGrBiSaAgg; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.lideeyunji.core.framework.entity.NewGrBiSaAggMonthCount; import com.lideeyunji.core.framework.params.SaAggParam; import com.lideeyunji.tool.framework.permission.core.annotation.DataPermission; import org.apache.ibatis.annotations.Param; @@ -71,7 +72,7 @@ public interface NewGrBiSaAggMapper extends BaseMapper */ @DataPermission(enable = false) @DS(value = "#dataSourceType") - public List selectNewGrBiSaAggList(@Param("dataSourceType") String dataSourceType,@Param("saAggParam")SaAggParam saAggParam); + public List selectNewGrBiSaAggList(@Param("dataSourceType") String dataSourceType, @Param("saAggParam")SaAggParam saAggParam); /** * 新增综合销售情况明细 diff --git a/lidee-core/src/main/java/com/lideeyunji/core/framework/mapper/NewGrBiSaAggYearCountMapper.java b/lidee-core/src/main/java/com/lideeyunji/core/framework/mapper/NewGrBiSaAggYearCountMapper.java index 73c6bcd..f23e0b7 100644 --- a/lidee-core/src/main/java/com/lideeyunji/core/framework/mapper/NewGrBiSaAggYearCountMapper.java +++ b/lidee-core/src/main/java/com/lideeyunji/core/framework/mapper/NewGrBiSaAggYearCountMapper.java @@ -1,11 +1,14 @@ package com.lideeyunji.core.framework.mapper; import java.util.List; +import java.util.Map; import com.baomidou.dynamic.datasource.annotation.DS; +import com.lideeyunji.core.framework.entity.NewGrBiSaAggMonthCount; import com.lideeyunji.core.framework.entity.NewGrBiSaAggYearCount; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.lideeyunji.core.framework.params.SaAggParam; +import com.lideeyunji.tool.framework.permission.core.annotation.DataPermission; import org.apache.ibatis.annotations.Param; /** @@ -67,4 +70,15 @@ public interface NewGrBiSaAggYearCountMapper extends BaseMapper getTotalDetail(@Param("dataSourceType") String dataSourceType,@Param("saAggParam") SaAggParam saAggParam); + + /** + * 批量查询综合销售情况明细列表 -月度 + * + * @param saAggParam 综合销售情况明细参数 + * @return 综合销售情况明细集合 + */ + @DataPermission(enable = false) + @DS(value = "#dataSourceType") + public List selectNewGrBiSaAggGroupYearList(@Param("dataSourceType") String dataSourceType, @Param("saAggParam") SaAggParam saAggParam, @Param("params") Map params, @Param("groupFieldList")List groupFieldList); + } diff --git a/lidee-core/src/main/java/com/lideeyunji/core/framework/service/INewGrBiSaAggService.java b/lidee-core/src/main/java/com/lideeyunji/core/framework/service/INewGrBiSaAggService.java index ccb9d3b..3e1044d 100644 --- a/lidee-core/src/main/java/com/lideeyunji/core/framework/service/INewGrBiSaAggService.java +++ b/lidee-core/src/main/java/com/lideeyunji/core/framework/service/INewGrBiSaAggService.java @@ -4,6 +4,7 @@ import java.util.List; import java.util.Map; import com.lideeyunji.core.framework.entity.NewGrBiSaAgg; +import com.lideeyunji.core.framework.entity.NewGrBiSaAggMonthCount; import org.apache.ibatis.annotations.Param; /** @@ -27,10 +28,10 @@ public interface INewGrBiSaAggService /** * 查询综合销售情况明细列表 * - * @param newGrBiSaAgg 综合销售情况明细 + * @param params 综合销售情况明细 * @return 综合销售情况明细集合 */ - public List selectNewGrBiSaAggList(Map params); + public List selectNewGrBiSaAggList(Map params); /** * 新增综合销售情况明细 diff --git a/lidee-core/src/main/java/com/lideeyunji/core/framework/service/INewGrBiSaAggYearCountService.java b/lidee-core/src/main/java/com/lideeyunji/core/framework/service/INewGrBiSaAggYearCountService.java index 734f32e..6b042b2 100644 --- a/lidee-core/src/main/java/com/lideeyunji/core/framework/service/INewGrBiSaAggYearCountService.java +++ b/lidee-core/src/main/java/com/lideeyunji/core/framework/service/INewGrBiSaAggYearCountService.java @@ -1,6 +1,9 @@ package com.lideeyunji.core.framework.service; import java.util.List; +import java.util.Map; + +import com.lideeyunji.core.framework.entity.NewGrBiSaAggMonthCount; import com.lideeyunji.core.framework.entity.NewGrBiSaAggYearCount; import com.lideeyunji.core.framework.params.SaAggParam; @@ -61,4 +64,6 @@ public interface INewGrBiSaAggYearCountService public int deleteNewGrBiSaAggYearCountById(Long id); List getTotalDetail(SaAggParam saAggParam); + + public List selectNewGrBiSaAggGroupYearList(Map params, List groupFieldList); } diff --git a/lidee-core/src/main/java/com/lideeyunji/core/framework/service/impl/NewGrBiSaAggServiceImpl.java b/lidee-core/src/main/java/com/lideeyunji/core/framework/service/impl/NewGrBiSaAggServiceImpl.java index 9bda86e..7dbf979 100644 --- a/lidee-core/src/main/java/com/lideeyunji/core/framework/service/impl/NewGrBiSaAggServiceImpl.java +++ b/lidee-core/src/main/java/com/lideeyunji/core/framework/service/impl/NewGrBiSaAggServiceImpl.java @@ -13,6 +13,7 @@ import com.baomidou.mybatisplus.core.plugins.IgnoreStrategy; import com.baomidou.mybatisplus.core.plugins.InterceptorIgnoreHelper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.lideeyunji.core.framework.entity.GrBiSaAgg; +import com.lideeyunji.core.framework.entity.NewGrBiSaAggMonthCount; import com.lideeyunji.core.framework.params.SaAggParam; import com.lideeyunji.core.framework.service.INewGrBiSaAggMonthCountService; import com.lideeyunji.core.framework.service.INewGrBiSaAggYearCountService; @@ -138,7 +139,7 @@ public class NewGrBiSaAggServiceImpl extends ServiceImpl selectNewGrBiSaAggList(Map params) + public List selectNewGrBiSaAggList(Map params) { SaAggParam saAggParam = createParam(params); return this.baseMapper.selectNewGrBiSaAggList(lideeYunJiBaseConstant.DS_ERP_BI_DATA, saAggParam); @@ -147,29 +148,29 @@ public class NewGrBiSaAggServiceImpl extends ServiceImpl params) { SaAggParam saAggParam = new SaAggParam(); - if (params.containsKey("useyear")) { - saAggParam.setUseYear(params.get("useyear").toString()); + if (params.containsKey("useYear")) { + saAggParam.setUseYear(params.get("useYear").toString()); } - if (params.containsKey("usemonth")) { - saAggParam.setUseMonth(params.get("usemonth").toString()); + if (params.containsKey("useMonth")) { + saAggParam.setUseMonth(params.get("useMonth").toString()); } - if (params.containsKey("customname")) { - saAggParam.setCustomName(Arrays.asList(params.get("customname").toString().split( ","))); + if (params.containsKey("customName")) { + saAggParam.setCustomName(Arrays.asList(params.get("customName").toString().split( ","))); } if (params.containsKey("stdGoodsName")) { saAggParam.setStdGoodsName(Arrays.asList(params.get("stdGoodsName").toString().split( ","))); } - if (params.containsKey("zonename")) { - saAggParam.setZoneName(Arrays.asList(params.get("zonename").toString().split( ","))); + if (params.containsKey("zoneName")) { + saAggParam.setZoneName(Arrays.asList(params.get("zoneName").toString().split( ","))); } - if (params.containsKey("saletypename")) { - saAggParam.setSaleTypeName(Arrays.asList(params.get("saletypename").toString().split( ","))); + if (params.containsKey("saletypeName")) { + saAggParam.setSaleTypeName(Arrays.asList(params.get("saletypeName").toString().split( ","))); } - if (params.containsKey("dosagename")) { - saAggParam.setDosageName(Arrays.asList(params.get("dosagename").toString().split( ","))); + if (params.containsKey("dosageName")) { + saAggParam.setDosageName(Arrays.asList(params.get("dosageName").toString().split( ","))); } - if (params.containsKey("salername")) { - saAggParam.setSalerName(Arrays.asList(params.get("salername").toString().split( ","))); + if (params.containsKey("salerName")) { + saAggParam.setSalerName(Arrays.asList(params.get("salerName").toString().split( ","))); } return saAggParam; } diff --git a/lidee-core/src/main/java/com/lideeyunji/core/framework/service/impl/NewGrBiSaAggYearCountServiceImpl.java b/lidee-core/src/main/java/com/lideeyunji/core/framework/service/impl/NewGrBiSaAggYearCountServiceImpl.java index 1493d17..15a90b5 100644 --- a/lidee-core/src/main/java/com/lideeyunji/core/framework/service/impl/NewGrBiSaAggYearCountServiceImpl.java +++ b/lidee-core/src/main/java/com/lideeyunji/core/framework/service/impl/NewGrBiSaAggYearCountServiceImpl.java @@ -2,7 +2,10 @@ package com.lideeyunji.core.framework.service.impl; import java.util.Collections; import java.util.List; +import java.util.Map; + import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.lideeyunji.core.framework.entity.NewGrBiSaAggMonthCount; import com.lideeyunji.core.framework.params.SaAggParam; import com.lideeyunji.tool.framework.common.constant.lideeYunJiBaseConstant; import org.springframework.stereotype.Service; @@ -95,4 +98,10 @@ public class NewGrBiSaAggYearCountServiceImpl extends ServiceImpl getTotalDetail(SaAggParam saAggParam) { return this.baseMapper.getTotalDetail(lideeYunJiBaseConstant.DS_ERP_BI_DATA, saAggParam); } + + @Override + public List selectNewGrBiSaAggGroupYearList(Map params, List groupFieldList){ + SaAggParam saAggParam = NewGrBiSaAggServiceImpl.createParam(params); + return this.baseMapper.selectNewGrBiSaAggGroupYearList(lideeYunJiBaseConstant.DS_ERP_BI_DATA, saAggParam,params, groupFieldList); + } } diff --git a/lidee-core/src/main/resources/mapper/framework/NewGrBiSaAggMapper.xml b/lidee-core/src/main/resources/mapper/framework/NewGrBiSaAggMapper.xml index 2fdf000..bd63887 100644 --- a/lidee-core/src/main/resources/mapper/framework/NewGrBiSaAggMapper.xml +++ b/lidee-core/src/main/resources/mapper/framework/NewGrBiSaAggMapper.xml @@ -28,6 +28,50 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select id, use_year, use_month, zone_id, zone_name, sale_type_id, sale_type_name, custom_id, custom_name, dosage_id, dosage_name, goods_id, goods_name, province_id, province_name, saler_id, saler_name, this_month_sa_qty, this_month_sa_money, this_month_cost, this_month_profit from new_gr_bi_sa_agg @@ -511,7 +555,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" END, this_year_profit_change = ( this_year_profit - last_year_profit); - SELECT ANY_VALUE (tbl_lgbsa.id) id, tbl_lgbsa.use_year, @@ -532,7 +576,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" tbl_lgbsa.province_name, tbl_lgbsa.saler_id, tbl_lgbsa.saler_name, - tbl_lgbsa.this_month_sa_qty AS thisMonthSaQty, + tbl_lgbsa.this_month_sa_qty AS this_month_sa_qty, ROUND(tbl_lgbsa.this_month_sa_money / 10000, 2) AS this_month_sa_money, -- 本月销售金额(元) ROUND(tbl_lgbsa.this_month_cost / 10000, 2) AS this_month_cost, ROUND(tbl_lgbsa.this_month_profit / 10000, 2) AS this_month_profit, @@ -544,13 +588,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ROUND(tbl_lgbsa.yoy_month_sa_money / 10000, 2) as yoy_month_sa_money, ROUND(tbl_lgbsa.yoy_month_profit / 10000, 2) as yoy_month_profit, ROUND(tbl_lgbsa.yoy_month_cost / 10000, 2) as yoy_month_cost, - CONCAT(ROUND((SELECT SUM(MONTHSAQTY) FROM yunji_gr_bi_sa_agg)/100000000 ,2), '亿') AS monthsaqty_s, - CONCAT(ROUND((SELECT SUM(THISSAQTY) FROM yunji_gr_bi_sa_agg)/100000000 ,2), '亿') AS thissaqty_s, - CONCAT(ROUND((SELECT SUM(LASTSAQTY) FROM yunji_gr_bi_sa_agg)/100000000 ,2), '亿') AS lastsaqty_s, - -- 原本带CAST的字段，简化写法（CONCAT会自动转为字符串） - CONCAT(ROUND((SELECT SUM(MONTHSAMONEY) FROM yunji_gr_bi_sa_agg)/100000000 ,2), '亿') AS monthsamoney_s, - CONCAT(ROUND((SELECT SUM(THISSAMONEY) FROM yunji_gr_bi_sa_agg)/100000000,2), '亿') AS thissamoney_s, - CONCAT(ROUND((SELECT SUM(LASTSAMONEY) FROM yunji_gr_bi_sa_agg)/100000000,2), '亿') AS lastsamoney_s, +# CONCAT(ROUND((SELECT SUM(MONTHSAQTY) FROM yunji_gr_bi_sa_agg)/100000000 ,2), '亿') AS monthsaqty_s, +# CONCAT(ROUND((SELECT SUM(THISSAQTY) FROM yunji_gr_bi_sa_agg)/100000000 ,2), '亿') AS thissaqty_s, +# CONCAT(ROUND((SELECT SUM(LASTSAQTY) FROM yunji_gr_bi_sa_agg)/100000000 ,2), '亿') AS lastsaqty_s, +# -- 原本带CAST的字段，简化写法（CONCAT会自动转为字符串） +# CONCAT(ROUND((SELECT SUM(MONTHSAMONEY) FROM yunji_gr_bi_sa_agg)/100000000 ,2), '亿') AS monthsamoney_s, +# CONCAT(ROUND((SELECT SUM(THISSAMONEY) FROM yunji_gr_bi_sa_agg)/100000000,2), '亿') AS thissamoney_s, +# CONCAT(ROUND((SELECT SUM(LASTSAMONEY) FROM yunji_gr_bi_sa_agg)/100000000,2), '亿') AS lastsamoney_s, CASE WHEN (CASE WHEN tbl_lgbsa.yoy_month_sa_qty = 0 THEN IF(tbl_lgbsa.this_month_sa_qty > 0, 100, 0) ELSE (tbl_lgbsa.this_month_sa_qty - tbl_lgbsa.yoy_month_sa_qty) / tbl_lgbsa.yoy_month_sa_qty * 100 END) > 0 THEN @@ -601,53 +645,53 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" FROM new_gr_bi_sa_agg tbl_lgbsa - and use_year = #{useYear} - and use_month = #{useMonth} + and use_year = #{saAggParam.useYear} + and use_month = #{saAggParam.useMonth} - and zone_name in - + and zone_name in + #{name} - and sale_type_name in - + and sale_type_name in + #{name} - and custom_name in - + and custom_name in + #{name} - and dosage_name in - + and dosage_name in + #{name} - and goods_name in - + and goods_name in + #{name} - and province_name in - + and province_name in + #{name} - and saler_name in - + and saler_name in + #{name} - and std_goods_name in - + and std_goods_name in + #{name} diff --git a/lidee-core/src/main/resources/mapper/framework/NewGrBiSaAggMonthCountMapper.xml b/lidee-core/src/main/resources/mapper/framework/NewGrBiSaAggMonthCountMapper.xml index 80c46dc..789072c 100644 --- a/lidee-core/src/main/resources/mapper/framework/NewGrBiSaAggMonthCountMapper.xml +++ b/lidee-core/src/main/resources/mapper/framework/NewGrBiSaAggMonthCountMapper.xml @@ -248,10 +248,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + SELECT + current_year_data.use_year, + + current_year_data.ny as ny, + + + current_year_data.custom_id, + current_year_data.custom_name, + + + current_year_data.zone_id, + current_year_data.zone_name, + + + current_year_data.sale_type_id, + current_year_data.sale_type_name, + + + current_year_data.saler_id, + current_year_data.saler_name, + + + current_year_data.dosage_id, + current_year_data.dosage_name, + + + current_year_data.std_goods_name, + + + current_year_data.this_year_sa_qty AS this_year_sa_qty, + ROUND(current_year_data.this_year_sa_money / 10000, 2) AS this_year_sa_money, + ROUND(current_year_data.this_year_profit / 10000, 2) AS this_year_profit, + ROUND(current_year_data.this_year_cost / 10000, 2) AS this_year_cost, + last_year_data.last_year_sa_qty AS last_year_sa_qty, + ROUND(last_year_data.last_year_sa_money / 10000, 2) AS last_year_sa_money, + ROUND(last_year_data.last_year_profit / 10000, 2) AS last_year_profit, + ROUND(last_year_data.last_year_cost / 10000, 2) AS last_year_cost, + + COALESCE(ROUND(current_year_data.this_year_sa_money / total_year_data.this_year_sa_money_sum * 100, 2), 0) AS this_year_sa_money_share, + COALESCE (ROUND(current_year_data.this_year_profit/total_year_data.this_year_profit_sum * 100, 2), 0 ) as thisprofitshare, + CASE + WHEN (CASE WHEN last_year_data.last_year_sa_qty = 0 THEN IF(current_year_data.this_year_sa_qty > 0, 100, 0) + ELSE (current_year_data.this_year_sa_qty - last_year_data.last_year_sa_qty) / last_year_data.last_year_sa_qty * 100 END) > 0 THEN + CONCAT('🟢 ', ROUND((CASE WHEN last_year_data.last_year_sa_qty = 0 THEN IF(current_year_data.this_year_sa_qty > 0, 100, 0) + ELSE (current_year_data.this_year_sa_qty - last_year_data.last_year_sa_qty) / last_year_data.last_year_sa_qty * 100 END), 2)) + WHEN (CASE WHEN last_year_data.last_year_sa_qty = 0 THEN IF(current_year_data.this_year_sa_qty > 0, 100, 0) + ELSE (current_year_data.this_year_sa_qty - last_year_data.last_year_sa_qty) / last_year_data.last_year_sa_qty * 100 END) < 0 THEN + CONCAT('🔴 ', ROUND((CASE WHEN last_year_data.last_year_sa_qty = 0 THEN IF(current_year_data.this_year_sa_qty > 0, 100, 0) + ELSE (current_year_data.this_year_sa_qty - last_year_data.last_year_sa_qty) / last_year_data.last_year_sa_qty * 100 END), 2)) + ELSE '0.00' + END AS saqty_yoy, + CASE + WHEN (CASE WHEN last_year_data.last_year_sa_money = 0 THEN IF(current_year_data.this_year_sa_money > 0, 100, 0) + ELSE (current_year_data.this_year_sa_money - last_year_data.last_year_sa_money) / last_year_data.last_year_sa_money * 100 END) > 0 THEN + CONCAT('🟢 ', ROUND((CASE WHEN last_year_data.last_year_sa_money = 0 THEN IF(current_year_data.this_year_sa_money > 0, 100, 0) + ELSE (current_year_data.this_year_sa_money - last_year_data.last_year_sa_money) / last_year_data.last_year_sa_money * 100 END), 2)) + WHEN (CASE WHEN last_year_data.last_year_sa_money = 0 THEN IF(current_year_data.this_year_sa_money > 0, 100, 0) + ELSE (current_year_data.this_year_sa_money - last_year_data.last_year_sa_money) / last_year_data.last_year_sa_money * 100 END) < 0 THEN + CONCAT('🔴 ', ROUND((CASE WHEN last_year_data.last_year_sa_money = 0 THEN IF(current_year_data.this_year_sa_money > 0, 100, 0) + ELSE (current_year_data.this_year_sa_money - last_year_data.last_year_sa_money) / last_year_data.last_year_sa_money * 100 END), 2)) + ELSE '0.00' + END AS samoney_yoy, + CASE + WHEN (CASE WHEN last_year_data.last_year_profit = 0 THEN IF(current_year_data.this_year_profit > 0, 100, 0) + ELSE (current_year_data.this_year_profit - last_year_data.last_year_profit) / last_year_data.last_year_profit * 100 END) > 0 THEN + CONCAT('🟢 ', ROUND((CASE WHEN last_year_data.last_year_profit = 0 THEN IF(current_year_data.this_year_profit > 0, 100, 0) + ELSE (current_year_data.this_year_profit - last_year_data.last_year_profit) / last_year_data.last_year_profit * 100 END), 2)) + WHEN (CASE WHEN last_year_data.last_year_profit = 0 THEN IF(current_year_data.this_year_profit > 0, 100, 0) + ELSE (current_year_data.this_year_profit - last_year_data.last_year_profit) / last_year_data.last_year_profit * 100 END) < 0 THEN + CONCAT('🔴 ', ROUND((CASE WHEN last_year_data.last_year_profit = 0 THEN IF(current_year_data.this_year_profit > 0, 100, 0) + ELSE (current_year_data.this_year_profit - last_year_data.last_year_profit) / last_year_data.last_year_profit * 100 END), 2)) + ELSE '0.00' + END AS profit_yoy, + CASE + WHEN (CASE WHEN last_year_data.last_year_sa_money = 0 THEN IF(current_year_data.this_year_sa_money > 0, 100, 0) + ELSE (current_year_data.this_year_sa_money - last_year_data.last_year_sa_money) / last_year_data.last_year_sa_money * 100 END) > 0 THEN + CONCAT('🟢 ', ROUND((CASE WHEN last_year_data.last_year_sa_money = 0 THEN IF(current_year_data.this_year_sa_money > 0, 100, 0) + ELSE (current_year_data.this_year_sa_money - last_year_data.last_year_sa_money) / last_year_data.last_year_sa_money * 100 END), 2)) + WHEN (CASE WHEN last_year_data.last_year_sa_money = 0 THEN IF(current_year_data.this_year_sa_money > 0, 100, 0) + ELSE (current_year_data.this_year_sa_money - last_year_data.last_year_sa_money) / last_year_data.last_year_sa_money * 100 END) < 0 THEN + CONCAT('🔴 ', ROUND((CASE WHEN last_year_data.last_year_sa_money = 0 THEN IF(current_year_data.this_year_sa_money > 0, 100, 0) + ELSE (current_year_data.this_year_sa_money - last_year_data.last_year_sa_money) / last_year_data.last_year_sa_money * 100 END), 2)) + ELSE '0.00' + END AS this_year_sa_money_growth + FROM + (SELECT use_year , + use_year AS ny, + + custom_id, + custom_name , + + + std_goods_name, + + + zone_id, + zone_name, + + + sale_type_id, + sale_type_name, + + + dosage_id, + dosage_name, + + + saler_id, + saler_name, + + GROUP_CONCAT(DISTINCT province_id ORDER BY province_id SEPARATOR ',') AS province_id, + GROUP_CONCAT(DISTINCT province_name ORDER BY province_name SEPARATOR ',') AS province_name, + sum(this_year_sa_qty) AS this_year_sa_qty, + sum(this_year_sa_money) AS this_year_sa_money, + sum(this_year_cost) AS this_year_cost, + sum(this_year_profit) AS this_year_profit + FROM new_gr_bi_sa_agg_year_count + + and use_year = #{saAggParam.useYear} + and zone_name in + + #{name} + + + and sale_type_name in + + #{name} + + + and custom_name in + + #{name} + + + and dosage_name in + + #{name} + + + and goods_name in + + #{name} + + + and province_name in + + #{name} + + + and saler_name in + + #{name} + + + + and std_goods_name in + + #{name} + + + + GROUP BY + + use_year, + + custom_id, + custom_name , + + + std_goods_name, + + + zone_id, + zone_name, + + + sale_type_id, + sale_type_name, + + + dosage_id, + dosage_name, + + + saler_id, + saler_name, + + + + ) as current_year_data + LEFT JOIN (SELECT use_year, + + custom_id, + + + std_goods_name, + + + zone_id, + + + sale_type_id, + + + dosage_id, + + + saler_id, + + SUM(this_year_sa_qty) AS last_year_sa_qty, + SUM(this_year_sa_money) AS last_year_sa_money, + SUM(this_year_cost) AS last_year_cost, + SUM(this_year_profit) AS last_year_profit + FROM new_gr_bi_sa_agg_year_count + + + and use_year = #{saAggParam.useYear} -1 + and zone_name in + + #{name} + + + and sale_type_name in + + #{name} + + + and custom_name in + + #{name} + + + and dosage_name in + + #{name} + + + and goods_name in + + #{name} + + + and province_name in + + #{name} + + + and saler_name in + + #{name} + + + + and std_goods_name in + + #{name} + + + + GROUP BY + + use_year, + + custom_id, + + + std_goods_name, + + + zone_id, + + + sale_type_id, + + + dosage_id, + + + saler_id, + + + + ) AS last_year_data + ON last_year_data.use_year = current_year_data.use_year - 1 + + AND current_year_data.custom_id = last_year_data.custom_id + + + AND current_year_data.std_goods_name = last_year_data.std_goods_name + + + AND current_year_data.zone_id = last_year_data.zone_id + + + AND current_year_data.sale_type_id = last_year_data.sale_type_id + + + AND current_year_data.dosage_id = last_year_data.dosage_id + + + AND current_year_data.saler_id = last_year_data.saler_id + + LEFT JOIN (SELECT use_year, + SUM(this_year_sa_money) AS this_year_sa_money_sum, + SUM(this_year_profit) AS this_year_profit_sum + FROM new_gr_bi_sa_agg_year_count + GROUP BY use_year) as total_year_data + ON total_year_data.use_year = current_year_data.use_year + \ No newline at end of file