diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/road/vo/RoadPageReqVO.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/road/vo/RoadPageReqVO.java index 62270bb..2f224ed 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/road/vo/RoadPageReqVO.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/road/vo/RoadPageReqVO.java @@ -1,5 +1,8 @@ package com.zteits.urbanops.module.garden.controller.admin.road.vo; +import com.baomidou.mybatisplus.core.toolkit.support.SFunction; +import com.zteits.urbanops.module.garden.dal.dataobject.departmentcost.DepartmentCostDO; +import com.zteits.urbanops.module.garden.dal.dataobject.road.RoadDO; import lombok.*; import java.util.*; import io.swagger.v3.oas.annotations.media.Schema; @@ -83,4 +86,12 @@ public class RoadPageReqVO extends PageParam { @Schema(description = "更新者", example = "芋艿") private String updaterName; + //对应前端排序字段 + public static final Map> SORT_FIELD_MAP = Map.of( + "id", RoadDO::getId, + "greenBeltTreeArea", RoadDO::getGreenBeltTreeArea, + "greenBeltArea", RoadDO::getGreenBeltArea, + "totalArea", RoadDO::getTotalArea, + "treeArea", RoadDO::getTreeArea + ); } \ No newline at end of file diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/road/RoadInterceptMapper.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/road/RoadInterceptMapper.java index 559e8e2..80ffb3a 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/road/RoadInterceptMapper.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/road/RoadInterceptMapper.java @@ -4,6 +4,7 @@ import com.zteits.urbanops.framework.annotation.ProcessBusinessLine; import com.zteits.urbanops.framework.common.pojo.PageResult; 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.road.vo.RoadPageReqVO; import com.zteits.urbanops.module.garden.dal.dataobject.road.RoadDO; import org.apache.ibatis.annotations.Mapper; @@ -42,7 +43,10 @@ public interface RoadInterceptMapper extends BaseMapperX { .likeIfPresent(RoadDO::getCreatorName, reqVO.getCreatorName()) .betweenIfPresent(RoadDO::getCreateTime, reqVO.getCreateTime()) .likeIfPresent(RoadDO::getUpdaterName, reqVO.getUpdaterName()) - .orderByDesc(RoadDO::getId)); + .orderBy(true, reqVO.getSortAsc(), + RoadPageReqVO.SORT_FIELD_MAP.get(reqVO.getOrderByColumn()) + ) + ); } } \ No newline at end of file diff --git a/urbanops-module-garden/src/main/resources/mapper/maintainplan/MaintainPlanCommitMapper.xml b/urbanops-module-garden/src/main/resources/mapper/maintainplan/MaintainPlanCommitMapper.xml index 5f09d3a..0992fb8 100644 --- a/urbanops-module-garden/src/main/resources/mapper/maintainplan/MaintainPlanCommitMapper.xml +++ b/urbanops-module-garden/src/main/resources/mapper/maintainplan/MaintainPlanCommitMapper.xml @@ -38,6 +38,9 @@ a.batch_no = b.batch_no AND a.plan_no = c.plan_no AND b.batch_no = c.batch_no + AND a.deleted = c.deleted + AND a.deleted = b.deleted + AND a.deleted = 0 and a.plan_no LIKE CONCAT('%', #{req.planNo},'%') @@ -45,7 +48,7 @@ and b.plan_name LIKE CONCAT('%', #{req.planName},'%') - AND b.road_name LIKE CONCAT(#{req.roadName},'%') + AND b.road_name LIKE CONCAT('%', #{req.roadName},'%') and b.level_id = #{req.levelId} @@ -83,6 +86,7 @@ + order by c.id desc