From 4d77af8a33ac90fbd289d8ad949258f12b3b28dd Mon Sep 17 00:00:00 2001
From: wangqian <1406304305@qq.com>
Date: Wed, 14 Jan 2026 10:49:26 +0800
Subject: [PATCH] 废弃物载重排序

---
 urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/wasterecord/vo/WasteRecordPageReqVO.java | 2 +-
 urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/mechanicalcost/MechanicalCostMapper.java        | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/wasterecord/vo/WasteRecordPageReqVO.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/wasterecord/vo/WasteRecordPageReqVO.java
index 5c6e414..c683dc7 100644
--- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/wasterecord/vo/WasteRecordPageReqVO.java
+++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/wasterecord/vo/WasteRecordPageReqVO.java
@@ -66,7 +66,7 @@ public class WasteRecordPageReqVO extends PageParam {
 
     public static final Map<String, SFunction<WasteRecordDO, ?>> SORT_FIELD_MAP = Map.of(
             "id", WasteRecordDO::getId,
-            "vehicleLoad", WasteRecordDO::getWasteType,
+            "vehicleLoad", WasteRecordDO::getVehicleLoad,
             "transportTimes", WasteRecordDO::getTransportTimes,
             "totalCost", WasteRecordDO::getTotalCost,
             "createTime", WasteRecordDO::getCreateTime
diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/mechanicalcost/MechanicalCostMapper.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/mechanicalcost/MechanicalCostMapper.java
index 2309316..25ea3eb 100644
--- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/mechanicalcost/MechanicalCostMapper.java
+++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/mechanicalcost/MechanicalCostMapper.java
@@ -5,6 +5,7 @@ import java.util.*;
 import com.zteits.urbanops.framework.common.pojo.PageResult;
 import com.zteits.urbanops.framework.mybatis.core.query.LambdaQueryWrapperX;
 import com.zteits.urbanops.framework.mybatis.core.mapper.BaseMapperX;
+import com.zteits.urbanops.module.garden.controller.admin.wasterecord.vo.WasteRecordPageReqVO;
 import com.zteits.urbanops.module.garden.dal.dataobject.mechanicalcost.MechanicalCostDO;
 import org.apache.ibatis.annotations.Mapper;
 import com.zteits.urbanops.module.garden.controller.admin.mechanicalcost.vo.*;
@@ -36,7 +37,11 @@ public interface MechanicalCostMapper extends BaseMapperX<MechanicalCostDO> {
                 .eqIfPresent(MechanicalCostDO::getDeptId, reqVO.getDeptId())
                 .eqIfPresent(MechanicalCostDO::getRemark, reqVO.getRemark())
                 .betweenIfPresent(MechanicalCostDO::getCreateTime, reqVO.getCreateTime())
-                .orderByDesc(MechanicalCostDO::getId));
+                //.orderByDesc(MechanicalCostDO::getId));
+                .orderBy(true, reqVO.getSortAsc(),
+                        MechanicalCostPageReqVO.SORT_FIELD_MAP.get(reqVO.getOrderByColumn())
+                )
+        );
     }
 
     public List<Long> selectDuplicateIds(List<MechanicalCostDO> keyList);
--
libgit2 0.21.4