Merge remote-tracking branch 'origin/dev' into dev

wangqian
2 parents db4fa6d2 fb2bc9ed
Showing 3 changed files with 21 additions and 2 deletions
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/road/vo/RoadPageReqVO.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/road/RoadInterceptMapper.java
urbanops-module-garden/src/main/resources/mapper/maintainplan/MaintainPlanCommitMapper.xml
 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<String, SFunction<RoadDO, ?>> 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
@@ -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&lt;RoadDO&gt; {
                 .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
@@ -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
         <if test="req.planNo != null and req.planNo !=''">
             and a.plan_no LIKE CONCAT('%', #{req.planNo},'%')
         </if>
@@ -45,7 +48,7 @@
             and b.plan_name LIKE CONCAT('%', #{req.planName},'%')
         </if>
         <if test="req.roadName != null and req.roadName !=''">
-            AND b.road_name  LIKE CONCAT(#{req.roadName},'%')
+            AND b.road_name  LIKE CONCAT('%', #{req.roadName},'%')
         </if>
         <if test="req.levelId != null">
             and b.level_id = #{req.levelId}
@@ -83,6 +86,7 @@
         <if test="req.createTimeEnd != null">
             <![CDATA[AND DATE_FORMAT(a.create_time, '%Y-%m-%d') <= #{req.createTimeEnd}]]>
         </if>
+        order by c.id desc
     </select>
    <select id="appMaintainPlanCommitDetailPage" resultType="com.zteits.urbanops.module.garden.controller.app.maintainplan.vo.AppMaintainPlanCommitDetailPageRespVO">