From 9e72adf9d1c43c24d299ec696dd5f52bdf2a7f74 Mon Sep 17 00:00:00 2001 From: king Date: Fri, 8 May 2026 10:51:40 +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=EF=BC=8C=E6=A0=87=E5=87=86=E5=93=81=E5=90=8D?= =?UTF-8?q?=E3=80=81=E5=AE=A2=E6=88=B7=E5=90=8D=E7=A7=B0=E3=80=81=E4=B8=9A?= =?UTF-8?q?=E5=8A=A1=E5=91=98=E3=80=81=E5=8C=BA=E5=9F=9F=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../example/report/xtsy/ZhxsqkPlugin.java | 92 +++++++++++++++---- 1 file changed, 72 insertions(+), 20 deletions(-) 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 63db47a..b61920e 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 @@ -60,6 +60,17 @@ public class ZhxsqkPlugin implements ReportAroundAdvicePlugin { Page page = PageHelper.startPage(Integer.parseInt(params.get("pageNo").toString()), Integer.parseInt(params.get("pageSize").toString())); if(!groupFieldList.contains("useMonth") && !groupFieldList.contains("useYear")){ setMonthOrderBy(params, page); + if(!params.containsKey("column")){ + page.setUnsafeOrderBy(params.get("Group by").toString() + .replace("useYear", "use_year desc") + .replace("useMonth", "use_month desc") + .replace("stdGoodsName", "std_goods_name") + .replace("customName", "custom_name") + .replace("zoneName", "zone_name") + .replace("salerName", "saler_name") + .replace("dosageName", "dosage_name") + .replace("saleTypeName", "sale_type_name")); + } if(params.get("useYearStart").toString() .equals(params.get("useYearEnd").toString())){ params.put("isOneYear", true); }else{ @@ -72,6 +83,17 @@ public class ZhxsqkPlugin implements ReportAroundAdvicePlugin { } if(groupFieldList.contains("useMonth") || params.containsKey("useMonth")){ setMonthOrderBy(params, page); + if(!params.containsKey("column")){ + page.setUnsafeOrderBy(params.get("Group by").toString() + .replace("useYear", "use_year desc") + .replace("useMonth", "use_month desc") + .replace("stdGoodsName", "std_goods_name") + .replace("customName", "custom_name") + .replace("zoneName", "zone_name") + .replace("salerName", "saler_name") + .replace("dosageName", "dosage_name") + .replace("saleTypeName", "sale_type_name")); + } List newGrBiSaAggList = newGrBiSaAggMonthCountService.selectNewGrBiSaAggGroupMonthList(params, groupFieldList); PageInfo pageInfo = new PageInfo<>(newGrBiSaAggList); List> list = newGrBiSaAggList.stream().map(BeanUtil::beanToMap).collect(Collectors.toList()); @@ -109,16 +131,17 @@ public class ZhxsqkPlugin implements ReportAroundAdvicePlugin { if ("thisYearSaMoneyGrowth".equals(params.get("column"))) { orderBy = "CAST(TRIM(REGEXP_SUBSTR(this_year_sa_money_growth, '-?([0-9]+\\.?[0-9]*|[0-9]*\\.?[0-9]+)')) AS DECIMAL(10,2)) " + params.get("order").toString(); } - if("stdGoodsName".equals(params.get("column"))){ - orderBy = "std_goods_name " + params.get("order").toString(); - } - if("customName".equals(params.get("column"))){ - orderBy = "custom_name " + params.get("order").toString(); - } - if("salerName".equals(params.get("column"))){ - orderBy = "saler_name " + params.get("order").toString(); - } - page.setUnsafeOrderBy(orderBy); + commonOrder(params, page, orderBy); + }else{ + page.setUnsafeOrderBy(params.get("Group by").toString() + .replace("useYear", "use_year desc") + .replace("useMonth", "use_month desc") + .replace("stdGoodsName", "std_goods_name") + .replace("customName", "custom_name") + .replace("zoneName", "zone_name") + .replace("salerName", "saler_name") + .replace("dosageName", "dosage_name") + .replace("saleTypeName", "sale_type_name")); } List newGrBiSaAggList = newGrBiSaAggYearCountService.selectNewGrBiSaAggGroupYearList(params, groupFieldList); PageInfo pageInfo = new PageInfo<>(newGrBiSaAggList); @@ -169,16 +192,45 @@ public class ZhxsqkPlugin implements ReportAroundAdvicePlugin { if ("lastMonthSaMoney_yoy".equals(params.get("column"))) { orderBy = "CAST(TRIM(REGEXP_SUBSTR(lastMonthSaMoney_yoy, '-?([0-9]+\\.?[0-9]*|[0-9]*\\.?[0-9]+)')) AS DECIMAL(10,2)) " + params.get("order").toString(); } - if("stdGoodsName".equals(params.get("column"))){ - orderBy = "std_goods_name " + params.get("order").toString(); - } - if("customName".equals(params.get("column"))){ - orderBy = "custom_name " + params.get("order").toString(); - } - if("salerName".equals(params.get("column"))){ - orderBy = "saler_name " + params.get("order").toString(); - } - page.setUnsafeOrderBy(orderBy); + commonOrder(params, page, orderBy); } } + + + private static void commonOrder(Map params, Page page, String orderBy) { + if("stdGoodsName".equals(params.get("column"))){ + orderBy = "std_goods_name " + params.get("order").toString(); + } + if("customName".equals(params.get("column"))){ + orderBy = "custom_name " + params.get("order").toString(); + } + if("salerName".equals(params.get("column"))){ + orderBy = "saler_name " + params.get("order").toString(); + } + if("useYear".equals(params.get("column"))){ + orderBy = "use_year " + params.get("order").toString(); + } + if("useMonth".equals(params.get("column"))){ + orderBy = "use_month " + params.get("order").toString(); + } + if("stdGoodsName".equals(params.get("column"))){ + orderBy = "std_goods_name " + params.get("order").toString(); + } + if("customName".equals(params.get("column"))){ + orderBy = "custom_name " + params.get("order").toString(); + } + if("zoneName".equals(params.get("column"))){ + orderBy = "zone_name " + params.get("order").toString(); + } + if("salerName".equals(params.get("column"))){ + orderBy = "saler_name " + params.get("order").toString(); + } + if("dosageName".equals(params.get("column"))){ + orderBy = "dosage_name " + params.get("order").toString(); + } + if("saleTypeName".equals(params.get("column"))){ + orderBy = "sale_type_name " + params.get("order").toString(); + } + page.setUnsafeOrderBy(orderBy); + } }