From 40ba5b40b7994a214f5b33cc4ce88906f79814d5 Mon Sep 17 00:00:00 2001 From: maxiangong <298222784@qq.com> Date: Mon, 27 Apr 2026 17:10:34 +0800 Subject: [PATCH] =?UTF-8?q?Revert=20"=E8=83=BD=E8=80=97=E7=AE=A1=E7=90=86?= =?UTF-8?q?=EF=BC=8C=E4=BA=BA=E6=95=88=E7=AE=A1=E7=90=86=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E6=8E=92=E5=BA=8F"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit db81afa80a3787f17838ef24dcc2f21d55bfc931. --- .../common/constant/LauncherConstant.java | 12 +-- .../mapper/EfficiencyTaskMapper.xml | 22 +----- .../mapper/EfficiencyTaskReportMapper.xml | 14 +--- .../mapper/EfficiencyTempMapper.xml | 10 --- .../mapper/SalaryStandardMapper.xml | 12 --- .../pojo/dto/BsEfficiencyTaskDTO.java | 9 --- .../pojo/dto/BsSalaryCalculationDTO.java | 8 -- .../pojo/vo/BsEfficiencyTaskReportVO.java | 9 --- .../pojo/vo/BsEfficiencyTaskVO.java | 9 --- .../pojo/vo/BsEfficiencyTempVO.java | 9 --- .../pojo/vo/BsSalaryCalculationVO.java | 9 --- .../pojo/vo/BsSalaryStandardVO.java | 8 -- .../impl/BsEfficiencyTempServiceImpl.java | 8 +- .../energy/mapper/EnergyCoreUseMapper.xml | 10 --- .../energy/mapper/EnergyMonitorMapper.xml | 10 --- .../desk/energy/mapper/EnergyQuotaMapper.xml | 10 --- .../desk/energy/mapper/EnergyTargetMapper.xml | 10 --- .../energy/mapper/PeakFlatValleyMapper.xml | 10 --- .../energy/pojo/vo/BsEnergyCoreUseVO.java | 9 --- .../energy/pojo/vo/BsEnergyMonitorVO.java | 9 --- .../desk/energy/pojo/vo/BsEnergyQuotaVO.java | 10 --- .../desk/energy/pojo/vo/BsEnergyTargetVO.java | 9 --- .../energy/pojo/vo/BsPeakFlatValleyVO.java | 9 --- .../desk/produce/mapper/WorkPlanMapper.xml | 75 ++++++++----------- 24 files changed, 45 insertions(+), 265 deletions(-) diff --git a/blade-common/src/main/java/org/springblade/common/constant/LauncherConstant.java b/blade-common/src/main/java/org/springblade/common/constant/LauncherConstant.java index 54dd4019..228f2f67 100644 --- a/blade-common/src/main/java/org/springblade/common/constant/LauncherConstant.java +++ b/blade-common/src/main/java/org/springblade/common/constant/LauncherConstant.java @@ -12,9 +12,9 @@ public interface LauncherConstant { /** * nacos 命名空间 */ -// String NACOS_NAMESPACE = "feaf627f-a847-463b-8b73-24a0538f526e"; + //String NACOS_NAMESPACE = "feaf627f-a847-463b-8b73-24a0538f526e"; // 生产环境 - String NACOS_NAMESPACE = "db3f4da1-ae19-4104-8c17-6d9b8f069401"; + String NACOS_NAMESPACE = "db3f4da1-ae19-4104-8c17-6d9b8f069401"; // 测试环境 // String NACOS_NAMESPACE = "6cdd0310-0d61-4f54-891a-7fb06224d9b8"; @@ -151,10 +151,10 @@ public interface LauncherConstant { return appName.concat(GROUP_NAME); } - /** - * wms - */ - String APPLICATION_WMS_NAME = "blade-wms"; + /** + * wms + */ + String APPLICATION_WMS_NAME = "blade-wms"; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/efficiency/mapper/EfficiencyTaskMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/efficiency/mapper/EfficiencyTaskMapper.xml index 4d7f3861..996db1f5 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/efficiency/mapper/EfficiencyTaskMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/efficiency/mapper/EfficiencyTaskMapper.xml @@ -57,16 +57,7 @@ AND bu2.real_name LIKE concat(concat('%', #{bsEfficiencyTask.reportUserName}),'%'))) - - - ORDER BY ${bsEfficiencyTask.orderByField} - ASC - DESC - - - ORDER BY t.year_month desc, t.create_time - - + ORDER BY t.year_month desc, t.create_time \ No newline at end of file diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/efficiency/mapper/EfficiencyTaskReportMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/efficiency/mapper/EfficiencyTaskReportMapper.xml index ce92fe33..e06978b7 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/efficiency/mapper/EfficiencyTaskReportMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/efficiency/mapper/EfficiencyTaskReportMapper.xml @@ -20,7 +20,6 @@ \ No newline at end of file diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/efficiency/mapper/SalaryStandardMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/efficiency/mapper/SalaryStandardMapper.xml index e0efb51c..7f4c8487 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/efficiency/mapper/SalaryStandardMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/efficiency/mapper/SalaryStandardMapper.xml @@ -26,7 +26,6 @@ \ No newline at end of file diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/efficiency/pojo/dto/BsEfficiencyTaskDTO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/efficiency/pojo/dto/BsEfficiencyTaskDTO.java index 47257fc6..cfda2365 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/efficiency/pojo/dto/BsEfficiencyTaskDTO.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/efficiency/pojo/dto/BsEfficiencyTaskDTO.java @@ -26,13 +26,4 @@ public class BsEfficiencyTaskDTO extends BsEfficiencyTaskEntity { * 精确匹配姓名 */ private String employeeNameExact; - - /** - * 排序字段 - */ - private String orderByField; - /** - * true: 升序，false: 降序 - */ - private boolean isAsc; } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/efficiency/pojo/dto/BsSalaryCalculationDTO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/efficiency/pojo/dto/BsSalaryCalculationDTO.java index f3b71137..433a3096 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/efficiency/pojo/dto/BsSalaryCalculationDTO.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/efficiency/pojo/dto/BsSalaryCalculationDTO.java @@ -99,13 +99,5 @@ public class BsSalaryCalculationDTO { */ private String maxTotalArea; - /** - * 排序字段 - */ - private String orderByField; - /** - * true: 升序，false: 降序 - */ - private boolean isAsc; } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/efficiency/pojo/vo/BsEfficiencyTaskReportVO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/efficiency/pojo/vo/BsEfficiencyTaskReportVO.java index 3088a1b9..0e7f23d8 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/efficiency/pojo/vo/BsEfficiencyTaskReportVO.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/efficiency/pojo/vo/BsEfficiencyTaskReportVO.java @@ -67,14 +67,5 @@ public class BsEfficiencyTaskReportVO extends BsEfficiencyTaskReportEntity { */ private BigDecimal m12Score; - /** - * 排序字段 - */ - private String orderByField; - /** - * true: 升序，false: 降序 - */ - private boolean isAsc; - } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/efficiency/pojo/vo/BsEfficiencyTaskVO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/efficiency/pojo/vo/BsEfficiencyTaskVO.java index 616864ab..aa425295 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/efficiency/pojo/vo/BsEfficiencyTaskVO.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/efficiency/pojo/vo/BsEfficiencyTaskVO.java @@ -50,13 +50,4 @@ public class BsEfficiencyTaskVO extends BsEfficiencyTaskEntity { * 动态列表 */ private Map table; - - /** - * 排序字段 - */ - private String orderByField; - /** - * true: 升序，false: 降序 - */ - private boolean isAsc; } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/efficiency/pojo/vo/BsEfficiencyTempVO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/efficiency/pojo/vo/BsEfficiencyTempVO.java index 821b68a5..384ac6ad 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/efficiency/pojo/vo/BsEfficiencyTempVO.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/efficiency/pojo/vo/BsEfficiencyTempVO.java @@ -23,13 +23,4 @@ public class BsEfficiencyTempVO extends BsEfficiencyTempEntity { */ private String updateUserName; - /** - * 排序字段 - */ - private String orderByField; - /** - * true: 升序，false: 降序 - */ - private boolean isAsc; - } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/efficiency/pojo/vo/BsSalaryCalculationVO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/efficiency/pojo/vo/BsSalaryCalculationVO.java index 99153f22..5a31d07c 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/efficiency/pojo/vo/BsSalaryCalculationVO.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/efficiency/pojo/vo/BsSalaryCalculationVO.java @@ -160,13 +160,4 @@ public class BsSalaryCalculationVO { */ private String totalAmount; - /** - * 排序字段 - */ - private String orderByField; - /** - * true: 升序，false: 降序 - */ - private boolean isAsc; - } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/efficiency/pojo/vo/BsSalaryStandardVO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/efficiency/pojo/vo/BsSalaryStandardVO.java index 35453993..061f0ce4 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/efficiency/pojo/vo/BsSalaryStandardVO.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/efficiency/pojo/vo/BsSalaryStandardVO.java @@ -34,13 +34,5 @@ public class BsSalaryStandardVO extends BsSalaryStandardEntity { */ private BigDecimal price; - /** - * 排序字段 - */ - private String orderByField; - /** - * true: 升序，false: 降序 - */ - private boolean isAsc; } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/efficiency/service/impl/BsEfficiencyTempServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/efficiency/service/impl/BsEfficiencyTempServiceImpl.java index 65432f79..f3a5b53c 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/efficiency/service/impl/BsEfficiencyTempServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/efficiency/service/impl/BsEfficiencyTempServiceImpl.java @@ -57,7 +57,7 @@ public class BsEfficiencyTempServiceImpl extends BaseServiceImpl - - - ORDER BY ${bsEnergyCoreUse.orderByField} - ASC - DESC - - - ORDER BY CREATE_TIME DESC - - \ No newline at end of file diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/mapper/EnergyMonitorMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/mapper/EnergyMonitorMapper.xml index f1de27fc..dddc63f0 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/mapper/EnergyMonitorMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/mapper/EnergyMonitorMapper.xml @@ -38,16 +38,6 @@ and month = #{bsEnergyMonitor.month} - - - ORDER BY ${bsEnergyMonitor.orderByField} - ASC - DESC - - - ORDER BY CREATE_TIME DESC - - diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/mapper/EnergyQuotaMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/mapper/EnergyQuotaMapper.xml index c2df722e..ef932baa 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/mapper/EnergyQuotaMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/mapper/EnergyQuotaMapper.xml @@ -49,16 +49,6 @@ and "DATE" #{bsEnergyQuota.endDate} - - - ORDER BY ${bsEnergyQuota.orderByField} - ASC - DESC - - - ORDER BY CREATE_TIME DESC - - diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/mapper/EnergyTargetMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/mapper/EnergyTargetMapper.xml index 61d19817..3ef61635 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/mapper/EnergyTargetMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/mapper/EnergyTargetMapper.xml @@ -37,16 +37,6 @@ and status = #{bsEnergyTarget.status} - - - ORDER BY ${bsEnergyTarget.orderByField} - ASC - DESC - - - ORDER BY CREATE_TIME DESC - - diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/mapper/PeakFlatValleyMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/mapper/PeakFlatValleyMapper.xml index 1f8fcc0a..94dad978 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/mapper/PeakFlatValleyMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/mapper/PeakFlatValleyMapper.xml @@ -38,16 +38,6 @@ and MONTH = #{bsPeakFlatValley.month} - - - ORDER BY ${bsPeakFlatValley.orderByField} - ASC - DESC - - - ORDER BY CREATE_TIME DESC - - diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/vo/BsEnergyCoreUseVO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/vo/BsEnergyCoreUseVO.java index 5c293c83..d8fd97c4 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/vo/BsEnergyCoreUseVO.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/vo/BsEnergyCoreUseVO.java @@ -38,13 +38,4 @@ public class BsEnergyCoreUseVO extends BsEnergyCoreUseEntity { @Schema(description = "日期") private String date; - /** - * 排序字段 - */ - private String orderByField; - /** - * true: 升序，false: 降序 - */ - private boolean isAsc; - } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/vo/BsEnergyMonitorVO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/vo/BsEnergyMonitorVO.java index 6bbb05be..a2515293 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/vo/BsEnergyMonitorVO.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/vo/BsEnergyMonitorVO.java @@ -42,13 +42,4 @@ public class BsEnergyMonitorVO extends BsEnergyMonitorEntity { @Serial private static final long serialVersionUID = 1L; - /** - * 排序字段 - */ - private String orderByField; - /** - * true: 升序，false: 降序 - */ - private boolean isAsc; - } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/vo/BsEnergyQuotaVO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/vo/BsEnergyQuotaVO.java index ba7ceec3..3d622b04 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/vo/BsEnergyQuotaVO.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/vo/BsEnergyQuotaVO.java @@ -52,14 +52,4 @@ public class BsEnergyQuotaVO extends BsEnergyQuotaEntity { */ private String endDate; - /** - * 排序字段 - */ - private String orderByField; - /** - * true: 升序，false: 降序 - */ - private boolean isAsc; - - } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/vo/BsEnergyTargetVO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/vo/BsEnergyTargetVO.java index 39414a3b..7487e039 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/vo/BsEnergyTargetVO.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/vo/BsEnergyTargetVO.java @@ -42,13 +42,4 @@ public class BsEnergyTargetVO extends BsEnergyTargetEntity { @Serial private static final long serialVersionUID = 1L; - /** - * 排序字段 - */ - private String orderByField; - /** - * true: 升序，false: 降序 - */ - private boolean isAsc; - } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/vo/BsPeakFlatValleyVO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/vo/BsPeakFlatValleyVO.java index 96656a82..4cfeab8d 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/vo/BsPeakFlatValleyVO.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/vo/BsPeakFlatValleyVO.java @@ -42,13 +42,4 @@ public class BsPeakFlatValleyVO extends BsPeakFlatValleyEntity { @Serial private static final long serialVersionUID = 1L; - /** - * 排序字段 - */ - private String orderByField; - /** - * true: 升序，false: 降序 - */ - private boolean isAsc; - } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/WorkPlanMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/WorkPlanMapper.xml index b6d51808..7198f9c4 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/WorkPlanMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/WorkPlanMapper.xml @@ -438,38 +438,37 @@