BJ_FS / urbanops

Commit 4d77af8a33ac90fbd289d8ad949258f12b3b28dd

Authored by wangqian
1 parent c5573592

废弃物载重排序

Inline Side-by-side
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
  View file @4d77af8
... ... @@ -66,7 +66,7 @@ public class WasteRecordPageReqVO extends PageParam {
66 66  
67 67 public static final Map<String, SFunction<WasteRecordDO, ?>> SORT_FIELD_MAP = Map.of(
68 68 "id", WasteRecordDO::getId,
69   - "vehicleLoad", WasteRecordDO::getWasteType,
  69 + "vehicleLoad", WasteRecordDO::getVehicleLoad,
70 70 "transportTimes", WasteRecordDO::getTransportTimes,
71 71 "totalCost", WasteRecordDO::getTotalCost,
72 72 "createTime", WasteRecordDO::getCreateTime
... ...
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/mechanicalcost/MechanicalCostMapper.java
  View file @4d77af8
... ... @@ -5,6 +5,7 @@ import java.util.*;
5 5 import com.zteits.urbanops.framework.common.pojo.PageResult;
6 6 import com.zteits.urbanops.framework.mybatis.core.query.LambdaQueryWrapperX;
7 7 import com.zteits.urbanops.framework.mybatis.core.mapper.BaseMapperX;
  8 +import com.zteits.urbanops.module.garden.controller.admin.wasterecord.vo.WasteRecordPageReqVO;
8 9 import com.zteits.urbanops.module.garden.dal.dataobject.mechanicalcost.MechanicalCostDO;
9 10 import org.apache.ibatis.annotations.Mapper;
10 11 import com.zteits.urbanops.module.garden.controller.admin.mechanicalcost.vo.*;
... ... @@ -36,7 +37,11 @@ public interface MechanicalCostMapper extends BaseMapperX&lt;MechanicalCostDO&gt; {
36 37 .eqIfPresent(MechanicalCostDO::getDeptId, reqVO.getDeptId())
37 38 .eqIfPresent(MechanicalCostDO::getRemark, reqVO.getRemark())
38 39 .betweenIfPresent(MechanicalCostDO::getCreateTime, reqVO.getCreateTime())
39   - .orderByDesc(MechanicalCostDO::getId));
  40 + //.orderByDesc(MechanicalCostDO::getId));
  41 + .orderBy(true, reqVO.getSortAsc(),
  42 + MechanicalCostPageReqVO.SORT_FIELD_MAP.get(reqVO.getOrderByColumn())
  43 + )
  44 + );
40 45 }
41 46  
42 47 public List<Long> selectDuplicateIds(List<MechanicalCostDO> keyList);
... ...