From db81afa80a3787f17838ef24dcc2f21d55bfc931 Mon Sep 17 00:00:00 2001 From: maxiangong <298222784@qq.com> Date: Mon, 27 Apr 2026 17:04:51 +0800 Subject: [PATCH] =?UTF-8?q?=E8=83=BD=E8=80=97=E7=AE=A1=E7=90=86=EF=BC=8C?= =?UTF-8?q?=E4=BA=BA=E6=95=88=E7=AE=A1=E7=90=86=E5=88=97=E8=A1=A8=E6=8E=92?= =?UTF-8?q?=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../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, 265 insertions(+), 45 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 228f2f67..54dd4019 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 996db1f5..4d7f3861 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,7 +57,16 @@ AND bu2.real_name LIKE concat(concat('%', #{bsEfficiencyTask.reportUserName}),'%'))) - ORDER BY t.year_month desc, t.create_time + + + ORDER BY ${bsEfficiencyTask.orderByField} + ASC + DESC + + + 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 e06978b7..ce92fe33 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,6 +20,7 @@ \ 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 7f4c8487..e0efb51c 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,6 +26,7 @@ \ 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 cfda2365..47257fc6 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,4 +26,13 @@ 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 433a3096..f3b71137 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,5 +99,13 @@ 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 0e7f23d8..3088a1b9 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,5 +67,14 @@ 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 aa425295..616864ab 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,4 +50,13 @@ 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 384ac6ad..821b68a5 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,4 +23,13 @@ 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 5a31d07c..99153f22 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,4 +160,13 @@ 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 061f0ce4..35453993 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,5 +34,13 @@ 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 f3a5b53c..65432f79 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 dddc63f0..f1de27fc 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,6 +38,16 @@ 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 ef932baa..c2df722e 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,6 +49,16 @@ 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 3ef61635..61d19817 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,6 +37,16 @@ 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 94dad978..1f8fcc0a 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,6 +38,16 @@ 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 d8fd97c4..5c293c83 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,4 +38,13 @@ 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 a2515293..6bbb05be 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,4 +42,13 @@ 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 3d622b04..ba7ceec3 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,4 +52,14 @@ 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 7487e039..39414a3b 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,4 +42,13 @@ 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 4cfeab8d..96656a82 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,4 +42,13 @@ 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 7198f9c4..b6d51808 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,37 +438,38 @@