人员费用排序

wangqian
1 parent 1fccd3ea
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
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/personalcost/PersonalCostMapper.java
 package com.zteits.urbanops.module.garden.controller.admin.personalcost.vo;
+import com.baomidou.mybatisplus.core.toolkit.support.SFunction;
 import com.zteits.urbanops.framework.common.pojo.PageParam;
+import com.zteits.urbanops.module.garden.dal.dataobject.personalcost.PersonalCostDO;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
@@ -8,6 +10,7 @@ import org.springframework.format.annotation.DateTimeFormat;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.util.List;
+import java.util.Map;
 import static com.zteits.urbanops.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
@@ -46,4 +49,9 @@ public class PersonalCostPageReqVO extends PageParam {
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime[] createTime;
+    public static final Map<String, SFunction<PersonalCostDO, ?>> SORT_FIELD_MAP = Map.of(
+            "id", PersonalCostDO::getId,
+            "salaryAmount", PersonalCostDO::getSalaryAmount
+    );
+
 }
@@ -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.rentalmechanicalcost.vo.RentalMechanicalCostPageReqVO;
 import com.zteits.urbanops.module.garden.dal.dataobject.personalcost.PersonalCostDO;
 import org.apache.ibatis.annotations.Mapper;
 import com.zteits.urbanops.module.garden.controller.admin.personalcost.vo.*;
@@ -29,7 +30,11 @@ public interface PersonalCostMapper extends BaseMapperX&lt;PersonalCostDO&gt; {
                 .eqIfPresent(PersonalCostDO::getDeptId, reqVO.getDeptId())
                 .eqIfPresent(PersonalCostDO::getRemark, reqVO.getRemark())
                 .betweenIfPresent(PersonalCostDO::getCreateTime, reqVO.getCreateTime())
-                .orderByDesc(PersonalCostDO::getId));
+                //.orderByDesc(PersonalCostDO::getId))
+                .orderBy(true, reqVO.getSortAsc(),
+                 PersonalCostPageReqVO.SORT_FIELD_MAP.get(reqVO.getOrderByColumn())
+                )
+        );
     }