修改

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/mapper/ZComprehensiveMapper.java

@@ -3,9 +3,11 @@ package com.ruoyi.zdsz.mapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.zdsz.domain.ZComprehensive;
 import com.ruoyi.zdsz.domain.bo.ZComprehensiveBo;
+import com.ruoyi.zdsz.domain.bo.ZEngineeringCivilBo;
 import com.ruoyi.zdsz.domain.bo.ZHouseBo;
 import com.ruoyi.zdsz.domain.vo.ZComprehensiveVo;
 import com.ruoyi.common.core.mapper.BaseMapperPlus;
+import com.ruoyi.zdsz.domain.vo.ZEngineeringCivilVo;
 import com.ruoyi.zdsz.domain.vo.ZHouseVo;
 import org.apache.ibatis.annotations.Param;
 
@@ -17,5 +19,7 @@ import org.apache.ibatis.annotations.Param;
  */
 public interface ZComprehensiveMapper extends BaseMapperPlus<ZComprehensiveMapper, ZComprehensive, ZComprehensiveVo> {
 
-    Page<ZComprehensiveVo> getPageList(@Param("p") ZComprehensiveBo bo, Page<?> page);
+//    Page<ZComprehensiveVo> getPageList(@Param("p") ZComprehensiveBo bo, Page<?> page);
+    Page<ZComprehensiveVo> queryPageList(@Param("p") ZComprehensiveBo bo, @Param("pa")Page<?> page, @Param("page") Integer pages, @Param("size") Integer size);
+
 }

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/service/impl/ZComprehensiveServiceImpl.java

@@ -11,18 +11,12 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.ruoyi.framework.obs.ObsService;
 import com.ruoyi.zdsz.domain.ZEngiineeringPhoto;
-import com.ruoyi.zdsz.domain.bo.ZEngiineeringPhotoBo;
-import com.ruoyi.zdsz.domain.bo.ZEngineeringNodeBo;
-import com.ruoyi.zdsz.domain.bo.ZHouseBo;
-import com.ruoyi.zdsz.domain.vo.ZEngiineeringPhotoVo;
-import com.ruoyi.zdsz.domain.vo.ZEngineeringPipeJackingVo;
-import com.ruoyi.zdsz.domain.vo.ZHouseVo;
+import com.ruoyi.zdsz.domain.bo.*;
+import com.ruoyi.zdsz.domain.vo.*;
 import com.ruoyi.zdsz.mapper.ZEngiineeringPhotoMapper;
 import com.ruoyi.zdsz.service.IZEngiineeringPhotoService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
-import com.ruoyi.zdsz.domain.bo.ZComprehensiveBo;
-import com.ruoyi.zdsz.domain.vo.ZComprehensiveVo;
 import com.ruoyi.zdsz.domain.ZComprehensive;
 import com.ruoyi.zdsz.mapper.ZComprehensiveMapper;
 import com.ruoyi.zdsz.service.IZComprehensiveService;
@@ -69,9 +63,13 @@ public class ZComprehensiveServiceImpl implements IZComprehensiveService {
      */
     @Override
     public TableDataInfo<ZComprehensiveVo> queryPageList(ZComprehensiveBo bo, PageQuery pageQuery) {
+//        Page<ZComprehensiveVo> page = new Page<>(pageQuery.getPageNum(), pageQuery.getPageSize());
+//        Page<ZComprehensiveVo> list = baseMapper.getPageList(bo,page);
+//        return PageUtils.buildDataInfo(list);
         Page<ZComprehensiveVo> page = new Page<>(pageQuery.getPageNum(), pageQuery.getPageSize());
-        Page<ZComprehensiveVo> list = baseMapper.getPageList(bo,page);
-        return PageUtils.buildDataInfo(list);
+        Page<ZComprehensiveVo> result = baseMapper.queryPageList(bo,page,pageQuery.getPageNum(), pageQuery.getPageSize());
+        page.setTotal(result.getRecords() != null ? result.getRecords().get(0).getTotal():0);
+        return TableDataInfo.build(result);
     }
 
     /**

ruoyi-zdsz/src/main/resources/mapper/zdsz/ZComprehensiveMapper.xml

@@ -20,8 +20,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateBy" column="update_by"/>
         <result property="updateTime" column="update_time"/>
     </resultMap>
-    <select id="getPageList" resultType="com.ruoyi.zdsz.domain.vo.ZComprehensiveVo">
+    <select id="queryPageList" resultType="com.ruoyi.zdsz.domain.vo.ZComprehensiveVo">
         SELECT
+        (
+        SELECT COUNT(id) FROM z_comprehensive WHERE del_flag = 0 AND type = #{p.type}
+        <if test="p.areaId != null and p.areaId != ''">
+            AND area_id = #{p.areaId}
+        </if>
+        <if test="p.buildingId != null and p.buildingId != ''">
+            AND building_id = #{p.buildingId}
+        </if>
+        <if test="p.unitId != null and p.unitId != ''">
+            AND unit_id = #{p.unitId}
+        </if>
+        <if test="p.houseId != null and p.houseId != ''">
+            AND house_id = #{p.houseId}
+        </if>
+        ) AS total,
         zc.*,
         zh.NAME AS houseName,
         zt.NAME AS unitName,
@@ -33,21 +48,28 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         LEFT JOIN z_unit AS zt ON zh.unit_id = zt.id
         LEFT JOIN z_building AS zb ON zt.building_id = zb.id
         LEFT JOIN z_area AS za ON zb.area_id = za.id
-        where 1=1
-           and zc.del_flag = '0'
-          and zc.type = #{p.type}
-            <if test="p.areaId != null  and p.areaId != ''">
-                and zc.area_id = #{p.areaId}
-            </if>
-            <if test="p.buildingId != null  and p.buildingId != ''">
-                and zc.building_id = #{p.buildingId}
-            </if>
-            <if test="p.unitId != null  and p.unitId != ''">
-                and zc.unit_id = #{p.unitId}
-            </if>
-            <if test="p.houseId != null  and p.houseId != ''">
-                and zc.house_id = #{p.houseId}
-            </if>
+        WHERE
+        1 = 1
+        AND zc.del_flag = '0'
+        AND zc.id IN (
+        SELECT a.id FROM (
+        SELECT id FROM z_comprehensive WHERE del_flag = '0' AND type = #{p.type}
+        <if test="p.areaId != null and p.areaId != ''">
+            AND area_id = #{p.areaId}
+        </if>
+        <if test="p.buildingId != null and p.buildingId != ''">
+            AND building_id = #{p.buildingId}
+        </if>
+        <if test="p.unitId != null and p.unitId != ''">
+            AND unit_id = #{p.unitId}
+        </if>
+        <if test="p.houseId != null and p.houseId != ''">
+            AND house_id = #{p.houseId}
+        </if>
+        LIMIT #{page},#{size}
+        ) AS a
+        )
+
     </select>
 
 </mapper>