废弃物载重排序

wangqian
1 parent c5573592
Showing 2 changed files with 7 additions and 2 deletions
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/wasterecord/vo/WasteRecordPageReqVO.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/mechanicalcost/MechanicalCostMapper.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
@@ -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&lt;MechanicalCostDO&gt; {
                 .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);