BJ_FS / urbanops

Commit 6e6555bb13bb7c7f0eb0643de5e999253bc29ad9

Authored by wangqian
1 parent 1fccd3ea

人员费用排序

Inline Side-by-side
Showing 2 changed files with 14 additions and 1 deletions
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/personalcost/vo/PersonalCostPageReqVO.java
  View file @6e6555b
1 1 package com.zteits.urbanops.module.garden.controller.admin.personalcost.vo;
2 2  
  3 +import com.baomidou.mybatisplus.core.toolkit.support.SFunction;
3 4 import com.zteits.urbanops.framework.common.pojo.PageParam;
  5 +import com.zteits.urbanops.module.garden.dal.dataobject.personalcost.PersonalCostDO;
4 6 import io.swagger.v3.oas.annotations.media.Schema;
5 7 import lombok.Data;
6 8 import org.springframework.format.annotation.DateTimeFormat;
... ... @@ -8,6 +10,7 @@ import org.springframework.format.annotation.DateTimeFormat;
8 10 import java.math.BigDecimal;
9 11 import java.time.LocalDateTime;
10 12 import java.util.List;
  13 +import java.util.Map;
11 14  
12 15 import static com.zteits.urbanops.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
13 16  
... ... @@ -46,4 +49,9 @@ public class PersonalCostPageReqVO extends PageParam {
46 49 @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
47 50 private LocalDateTime[] createTime;
48 51  
  52 + public static final Map<String, SFunction<PersonalCostDO, ?>> SORT_FIELD_MAP = Map.of(
  53 + "id", PersonalCostDO::getId,
  54 + "salaryAmount", PersonalCostDO::getSalaryAmount
  55 + );
  56 +
49 57 }
... ...
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/personalcost/PersonalCostMapper.java
  View file @6e6555b
... ... @@ -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.rentalmechanicalcost.vo.RentalMechanicalCostPageReqVO;
8 9 import com.zteits.urbanops.module.garden.dal.dataobject.personalcost.PersonalCostDO;
9 10 import org.apache.ibatis.annotations.Mapper;
10 11 import com.zteits.urbanops.module.garden.controller.admin.personalcost.vo.*;
... ... @@ -29,7 +30,11 @@ public interface PersonalCostMapper extends BaseMapperX&lt;PersonalCostDO&gt; {
29 30 .eqIfPresent(PersonalCostDO::getDeptId, reqVO.getDeptId())
30 31 .eqIfPresent(PersonalCostDO::getRemark, reqVO.getRemark())
31 32 .betweenIfPresent(PersonalCostDO::getCreateTime, reqVO.getCreateTime())
32   - .orderByDesc(PersonalCostDO::getId));
  33 + //.orderByDesc(PersonalCostDO::getId))
  34 + .orderBy(true, reqVO.getSortAsc(),
  35 + PersonalCostPageReqVO.SORT_FIELD_MAP.get(reqVO.getOrderByColumn())
  36 + )
  37 + );
33 38 }
34 39  
35 40  
... ...