增加排序

wangqian
1 parent 4cf824f0
Showing 10 changed files with 120 additions and 34 deletions
urbanops-framework/urbanops-common/src/main/java/com/zteits/urbanops/framework/common/pojo/PageParam.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/departmentcost/vo/DepartmentCostPageReqVO.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/rentalmechanicalcost/vo/RentalMechanicalCostPageReqVO.java
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/controller/admin/waterfee/vo/WaterFeePageReqVO.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/dataobject/mechanicalcost/MechanicalCostDO.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/departmentcost/DepartmentCostMapper.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/rentalmechanicalcost/RentalMechanicalCostMapper.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/wasterecord/WasteRecordMapper.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/waterfee/WaterFeeMapper.java
@@ -6,6 +6,8 @@ import lombok.Data;
 import jakarta.validation.constraints.Min;
 import jakarta.validation.constraints.Max;
 import jakarta.validation.constraints.NotNull;
+import org.springframework.util.StringUtils;
+
 import java.io.Serializable;
 @Schema(description="分页参数")
@@ -33,4 +35,25 @@ public class PageParam implements Serializable {
     @Max(value = 100, message = "每页条数最大值为 100")
     private Integer pageSize = PAGE_SIZE;
+    /**
+     * 排序字段
+     */
+    private String sortField = "id";
+    /**
+     * 排序方向：asc（升序）/ desc（降序）
+     */
+    private String sortOrder = "desc";
+    /**
+     * isAsc=true（升序）
+     */
+    private Boolean isAsc = true;
+    /*执行该排序逻辑*/
+    private Boolean sortCondition = true;
+
+
+    public void setSortOrder(String sortOrder) {
+        this.sortOrder = StringUtils.hasText(sortOrder) ? sortOrder.trim() : "desc";
+        this.isAsc = "asc".equalsIgnoreCase(this.sortOrder);
+    }
+
 }
 package com.zteits.urbanops.module.garden.controller.admin.departmentcost.vo;
+import com.baomidou.mybatisplus.core.toolkit.support.SFunction;
+import com.zteits.urbanops.module.garden.dal.dataobject.departmentcost.DepartmentCostDO;
 import lombok.*;
 import java.util.*;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -45,4 +47,13 @@ public class DepartmentCostPageReqVO extends PageParam {
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime[] createTime;
-}
 \ No newline at end of file
+    //对应前端排序字段
+    public static final Map<String, SFunction<DepartmentCostDO, ?>> SORT_FIELD_MAP = Map.of(
+            "id", DepartmentCostDO::getId,
+            "salaryMonth", DepartmentCostDO::getSalaryMonth,
+            "personCount", DepartmentCostDO::getPersonCount,
+            "deptTotalCost", DepartmentCostDO::getDeptTotalCost,
+            "createTime", DepartmentCostDO::getCreateTime
+    );
+
+}
 package com.zteits.urbanops.module.garden.controller.admin.rentalmechanicalcost.vo;
-import cn.idev.excel.annotation.ExcelProperty;
-import com.fasterxml.jackson.annotation.JsonFormat;
+import com.baomidou.mybatisplus.core.toolkit.support.SFunction;
 import com.zteits.urbanops.framework.common.pojo.PageParam;
-import com.zteits.urbanops.module.garden.controller.admin.costfee.vo.TeamBizdomainRelVo;
+import com.zteits.urbanops.module.garden.dal.dataobject.rentalmechanicalcost.RentalMechanicalCostDO;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
 import java.math.BigDecimal;
 import java.time.LocalDate;
-import java.time.LocalDateTime;
 import java.util.Date;
-import java.util.List;
-
-import static com.zteits.urbanops.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY;
-import static com.zteits.urbanops.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+import java.util.Map;
 @Schema(description = "管理后台 - 租赁机械费用录入分页 Request VO")
 @Data
 public class RentalMechanicalCostPageReqVO extends PageParam {
+    private String id;
     @Schema(description = "机械名称", example = "张三")
     private String mechName;
@@ -34,4 +30,17 @@ public class RentalMechanicalCostPageReqVO extends PageParam {
     @Schema(description = "使用时长（天）")
     private Integer useDuration;
+    @Schema(description = "结束日期")
+    private LocalDate endUseTime;
+
+    @Schema(description = "数量")
+    private Integer quantity;
+
+    public static final Map<String, SFunction<RentalMechanicalCostDO, ?>> SORT_FIELD_MAP = Map.of(
+            "id", RentalMechanicalCostDO::getId,
+            "quantity", RentalMechanicalCostDO::getQuantity,
+            "useDuration", RentalMechanicalCostDO::getUseDuration,
+            "startUseTime", RentalMechanicalCostDO::getStartUseTime,
+            "endUseTime", RentalMechanicalCostDO::getEndUseTime
+    );
 }
@@ -2,7 +2,9 @@ package com.zteits.urbanops.module.garden.controller.admin.wasterecord.vo;
 import cn.hutool.core.annotation.Alias;
 import cn.idev.excel.annotation.ExcelProperty;
+import com.baomidou.mybatisplus.core.toolkit.support.SFunction;
 import com.zteits.urbanops.framework.common.pojo.PageParam;
+import com.zteits.urbanops.module.garden.dal.dataobject.wasterecord.WasteRecordDO;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
@@ -11,6 +13,7 @@ import java.math.BigDecimal;
 import java.time.LocalDate;
 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;
@@ -61,4 +64,11 @@ public class WasteRecordPageReqVO extends PageParam {
     @Alias("deptId")
     private List<String> teamIdList;
+    public static final Map<String, SFunction<WasteRecordDO, ?>> SORT_FIELD_MAP = Map.of(
+            "id", WasteRecordDO::getId,
+            "vehicleLoad", WasteRecordDO::getWasteType,
+            "transportTimes", WasteRecordDO::getTransportTimes,
+            "totalCost", WasteRecordDO::getTotalCost,
+            "createTime", WasteRecordDO::getCreateTime
+    );
 }
 package com.zteits.urbanops.module.garden.controller.admin.waterfee.vo;
-import lombok.*;
-import java.util.*;
-import io.swagger.v3.oas.annotations.media.Schema;
+import com.baomidou.mybatisplus.core.toolkit.support.SFunction;
 import com.zteits.urbanops.framework.common.pojo.PageParam;
-import java.math.BigDecimal;
+import com.zteits.urbanops.module.garden.dal.dataobject.waterfee.WaterFeeDO;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
+
+import java.math.BigDecimal;
 import java.time.LocalDateTime;
+import java.util.Map;
 import static com.zteits.urbanops.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
@@ -45,4 +48,10 @@ public class WaterFeePageReqVO extends PageParam {
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime[] createTime;
-}
 \ No newline at end of file
+    public static final Map<String, SFunction<WaterFeeDO, ?>> SORT_FIELD_MAP = Map.of(
+            "id", WaterFeeDO::getId,
+            "totalFee", WaterFeeDO::getTotalFee,
+            "waterUsage", WaterFeeDO::getWaterUsage,
+            "createTime", WaterFeeDO::getCreateTime
+    );
+}
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.KeySequence;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.core.toolkit.support.SFunction;
 import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
 import com.zteits.urbanops.framework.mybatis.core.dataobject.BaseDO;
 import lombok.*;
@@ -11,6 +12,7 @@ import lombok.*;
 import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.util.List;
+import java.util.Map;
 /**
  * 自有机械费用录入 DO
@@ -98,5 +100,16 @@ public class MechanicalCostDO extends BaseDO {
      */
     private String remark;
+    static final Map<String, SFunction<MechanicalCostDO, ?>> SORT_FIELD_MAP = Map.of(
+            "id", MechanicalCostDO::getId,
+            "unitPrice", MechanicalCostDO::getUnitPrice,
+            "quantity", MechanicalCostDO::getQuantity,
+            "licensePlate", MechanicalCostDO::getLicensePlate,
+            "vehicleCategory", MechanicalCostDO::getVehicleCategory,
+            "vehicleType", MechanicalCostDO::getVehicleType,
+            "startUseTime", MechanicalCostDO::getStartUseTime,
+            "endUseTime", MechanicalCostDO::getEndUseTime,
+            "serviceLife", MechanicalCostDO::getServiceLife
+    );
 }
 package com.zteits.urbanops.module.garden.dal.mysql.departmentcost;
-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.framework.mybatis.core.query.LambdaQueryWrapperX;
+import com.zteits.urbanops.module.garden.controller.admin.departmentcost.vo.DepartmentCostPageReqVO;
 import com.zteits.urbanops.module.garden.dal.dataobject.departmentcost.DepartmentCostDO;
 import org.apache.ibatis.annotations.Mapper;
-import com.zteits.urbanops.module.garden.controller.admin.departmentcost.vo.*;
+
+import java.util.List;
 /**
  * 部门费用录入 Mapper
@@ -29,7 +29,10 @@ public interface DepartmentCostMapper extends BaseMapperX&lt;DepartmentCostDO&gt; {
                 .eqIfPresent(DepartmentCostDO::getDeptId, reqVO.getDeptId())
                 .eqIfPresent(DepartmentCostDO::getRemark, reqVO.getRemark())
                 .betweenIfPresent(DepartmentCostDO::getCreateTime, reqVO.getCreateTime())
-                .orderByDesc(DepartmentCostDO::getId));
+                .orderBy(reqVO.getSortCondition(), reqVO.getIsAsc(),
+                        DepartmentCostPageReqVO.SORT_FIELD_MAP.get(reqVO.getSortField())
+                    )
+                );
     }
     /**
      * 批量查询重复数据
 package com.zteits.urbanops.module.garden.dal.mysql.rentalmechanicalcost;
-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.framework.mybatis.core.query.LambdaQueryWrapperX;
+import com.zteits.urbanops.module.garden.controller.admin.departmentcost.vo.DepartmentCostPageReqVO;
+import com.zteits.urbanops.module.garden.controller.admin.rentalmechanicalcost.vo.RentalMechanicalCostPageReqVO;
 import com.zteits.urbanops.module.garden.dal.dataobject.rentalmechanicalcost.RentalMechanicalCostDO;
 import org.apache.ibatis.annotations.Mapper;
-import com.zteits.urbanops.module.garden.controller.admin.rentalmechanicalcost.vo.*;
 /**
  * 租赁机械费用录入 Mapper
@@ -36,7 +35,10 @@ public interface RentalMechanicalCostMapper extends BaseMapperX&lt;RentalMechanical
                 //.eqIfPresent(RentalMechanicalCostDO::getRoadIds, reqVO.getRoadIds())
                 ///.//eqIfPresent(RentalMechanicalCostDO::getRemark, reqVO.getRemark())
                 //.betweenIfPresent(RentalMechanicalCostDO::getCreateTime, reqVO.getCreateTime())
-                .orderByDesc(RentalMechanicalCostDO::getId));
+                .orderBy(reqVO.getSortCondition(), reqVO.getIsAsc(),
+                        RentalMechanicalCostPageReqVO.SORT_FIELD_MAP.get(reqVO.getSortField())
+                )
+        );
     }
 }
 package com.zteits.urbanops.module.garden.dal.mysql.wasterecord;
-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.framework.mybatis.core.query.LambdaQueryWrapperX;
+import com.zteits.urbanops.module.garden.controller.admin.wasterecord.vo.WasteRecordPageReqVO;
 import com.zteits.urbanops.module.garden.dal.dataobject.wasterecord.WasteRecordDO;
 import org.apache.ibatis.annotations.Mapper;
-import com.zteits.urbanops.module.garden.controller.admin.wasterecord.vo.*;
 /**
  * 园林废弃物录入 Mapper
@@ -31,7 +29,11 @@ public interface WasteRecordMapper extends BaseMapperX&lt;WasteRecordDO&gt; {
                 .eqIfPresent(WasteRecordDO::getDeptId, reqVO.getDeptId())
                 .eqIfPresent(WasteRecordDO::getRemark, reqVO.getRemark())
                 .betweenIfPresent(WasteRecordDO::getCreateTime, reqVO.getCreateTime())
-                .orderByDesc(WasteRecordDO::getId));
+                //.orderByDesc(WasteRecordDO::getId));
+                .orderBy(reqVO.getSortCondition(), reqVO.getIsAsc(),
+                        WasteRecordPageReqVO.SORT_FIELD_MAP.get(reqVO.getSortField())
+                )
+        );
     }
 }
 package com.zteits.urbanops.module.garden.dal.mysql.waterfee;
-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.framework.mybatis.core.query.LambdaQueryWrapperX;
+import com.zteits.urbanops.module.garden.controller.admin.waterfee.vo.WaterFeePageReqVO;
 import com.zteits.urbanops.module.garden.dal.dataobject.waterfee.WaterFeeDO;
 import org.apache.ibatis.annotations.Mapper;
-import com.zteits.urbanops.module.garden.controller.admin.waterfee.vo.*;
+
+import java.util.List;
 /**
  * 水费录入信息 Mapper
@@ -29,7 +29,11 @@ public interface WaterFeeMapper extends BaseMapperX&lt;WaterFeeDO&gt; {
                 .eqIfPresent(WaterFeeDO::getDeptId, reqVO.getDeptId())
                 .eqIfPresent(WaterFeeDO::getCompanyId, reqVO.getCompanyId())
                 .betweenIfPresent(WaterFeeDO::getCreateTime, reqVO.getCreateTime())
-                .orderByDesc(WaterFeeDO::getId));
+                //.orderByDesc(WaterFeeDO::getId));
+                .orderBy(reqVO.getSortCondition(), reqVO.getIsAsc(),
+                        WaterFeePageReqVO.SORT_FIELD_MAP.get(reqVO.getSortField())
+                )
+        );
     }