Merge remote-tracking branch 'origin/zdsz3.0' into zdsz3.0

ruoyi-admin/src/main/java/com/ruoyi/web/controller/zdsz/ZAreaController.java

@@ -4,9 +4,13 @@ import java.util.List;
 import java.util.Arrays;
 import java.util.concurrent.TimeUnit;
 
+import com.ruoyi.zdsz.service.*;
 import lombok.RequiredArgsConstructor;
+
+import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.constraints.*;
+
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.validation.annotation.Validated;
@@ -22,7 +26,6 @@ import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.zdsz.domain.vo.ZAreaVo;
 import com.ruoyi.zdsz.domain.bo.ZAreaBo;
-import com.ruoyi.zdsz.service.IZAreaService;
 import com.ruoyi.common.core.page.TableDataInfo;
 
 /**
@@ -38,6 +41,22 @@ import com.ruoyi.common.core.page.TableDataInfo;
 public class ZAreaController extends BaseController {
 
     private final IZAreaService iZAreaService;
+    @Resource
+    private IZBuildingService buildingService;
+    @Resource
+    private IZEngineeringCivilService civilService;
+    @Resource
+    private IZEngineeringMaterialsResetsService materialsResetsService;
+    /**
+     * 小区下拉
+     *
+     * @return
+     */
+    @GetMapping("/getAreaList")
+    public R getArea(String district) {
+        return R.ok(iZAreaService.getArea(district));
+    }
+
 
     /**
      * 查询小区管理列表
@@ -66,8 +85,7 @@ public class ZAreaController extends BaseController {
      */
     @SaCheckPermission("zdsz:area:query")
     @GetMapping("/{id}")
-    public R<ZAreaVo> getInfo(@NotNull(message = "主键不能为空")
-                                     @PathVariable String id) {
+    public R<ZAreaVo> getInfo(@NotNull(message = "主键不能为空") @PathVariable String id) {
         return R.ok(iZAreaService.queryById(id));
     }
 
@@ -101,8 +119,20 @@ public class ZAreaController extends BaseController {
     @SaCheckPermission("zdsz:area:remove")
     @Log(title = "小区管理", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
-    public R<Void> remove(@NotEmpty(message = "主键不能为空")
-                          @PathVariable String[] ids) {
+    public R remove(@NotEmpty(message = "主键不能为空") @PathVariable String[] ids) {
+        //是否需要校验
+        int i = buildingService.getBuildingListByAreaId(Arrays.asList(ids));
+        if (i>0){
+            return R.fail("小区已关联楼栋不能删除!");
+        }
+        int j = civilService.getCivilByAreaId(Arrays.asList(ids));
+        if (j>0){
+            return R.fail("小区已关联民用工程不能删除!");
+        }
+        int k = materialsResetsService.getMaterialByAreaId(Arrays.asList(ids));
+        if (k>0){
+            return R.fail("小区已关联用料统计不能删除!");
+        }
         return toAjax(iZAreaService.deleteWithValidByIds(Arrays.asList(ids), true));
     }
 }

ruoyi-admin/src/main/java/com/ruoyi/web/controller/zdsz/ZBuildingController.java

@@ -5,8 +5,10 @@ import java.util.Arrays;
 import java.util.concurrent.TimeUnit;
 
 import lombok.RequiredArgsConstructor;
+
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.constraints.*;
+
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.validation.annotation.Validated;
@@ -40,12 +42,22 @@ public class ZBuildingController extends BaseController {
     private final IZBuildingService iZBuildingService;
 
     /**
+     * 楼宇下拉
+     *
+     * @return
+     */
+    @GetMapping("/getBuildingList")
+    public R getBuildingList(String areaId) {
+        return R.ok(iZBuildingService.getBuildingList(areaId));
+    }
+
+    /**
      * 查询楼栋管理列表
      */
     @SaCheckPermission("zdsz:building:list")
     @GetMapping("/list")
     public TableDataInfo<ZBuildingVo> list(ZBuildingBo bo, PageQuery pageQuery) {
-        return iZBuildingService.queryPageList(bo, pageQuery);
+        return iZBuildingService.getPageList(bo, pageQuery);
     }
 
     /**
@@ -66,8 +78,7 @@ public class ZBuildingController extends BaseController {
      */
     @SaCheckPermission("zdsz:building:query")
     @GetMapping("/{id}")
-    public R<ZBuildingVo> getInfo(@NotNull(message = "主键不能为空")
-                                     @PathVariable String id) {
+    public R<ZBuildingVo> getInfo(@NotNull(message = "主键不能为空") @PathVariable String id) {
         return R.ok(iZBuildingService.queryById(id));
     }
 
@@ -101,8 +112,7 @@ public class ZBuildingController extends BaseController {
     @SaCheckPermission("zdsz:building:remove")
     @Log(title = "楼栋管理", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
-    public R<Void> remove(@NotEmpty(message = "主键不能为空")
-                          @PathVariable String[] ids) {
+    public R<Void> remove(@NotEmpty(message = "主键不能为空") @PathVariable String[] ids) {
         return toAjax(iZBuildingService.deleteWithValidByIds(Arrays.asList(ids), true));
     }
 }

ruoyi-admin/src/main/java/com/ruoyi/web/controller/zdsz/ZHouseController.java

@@ -4,7 +4,10 @@ import java.util.List;
 import java.util.Arrays;
 import java.util.concurrent.TimeUnit;
 
+import com.ruoyi.zdsz.service.IZEngineeringCivilService;
 import lombok.RequiredArgsConstructor;
+
+import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.constraints.*;
 import cn.dev33.satoken.annotation.SaCheckPermission;
@@ -39,6 +42,9 @@ public class ZHouseController extends BaseController {
 
     private final IZHouseService iZHouseService;
 
+    @Resource
+    private IZEngineeringCivilService civilService;
+
     /**
      * 查询房间管理列表
      */
@@ -103,6 +109,11 @@ public class ZHouseController extends BaseController {
     @DeleteMapping("/{ids}")
     public R<Void> remove(@NotEmpty(message = "主键不能为空")
                           @PathVariable String[] ids) {
+        //是否需要校验
+        int i = civilService.getCivilByhouseId(Arrays.asList(ids));
+        if (i>0) {
+            return R.fail("房间已关联民用工程不能删除!");
+        }
         return toAjax(iZHouseService.deleteWithValidByIds(Arrays.asList(ids), true));
     }
 }

ruoyi-admin/src/main/java/com/ruoyi/web/controller/zdsz/ZUnitController.java

@@ -5,8 +5,10 @@ import java.util.Arrays;
 import java.util.concurrent.TimeUnit;
 
 import lombok.RequiredArgsConstructor;
+
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.constraints.*;
+
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.validation.annotation.Validated;
@@ -40,12 +42,22 @@ public class ZUnitController extends BaseController {
     private final IZUnitService iZUnitService;
 
     /**
+     * 单元下拉
+     *
+     * @return
+     */
+    @GetMapping("/getUnitList")
+    public R getUnitList(String areaId, String buildingId) {
+        return R.ok(iZUnitService.getUnitList(areaId, buildingId));
+    }
+
+    /**
      * 查询单元管理列表
      */
     @SaCheckPermission("zdsz:unit:list")
     @GetMapping("/list")
     public TableDataInfo<ZUnitVo> list(ZUnitBo bo, PageQuery pageQuery) {
-        return iZUnitService.queryPageList(bo, pageQuery);
+        return iZUnitService.getPageList(bo, pageQuery);
     }
 
     /**
@@ -66,8 +78,7 @@ public class ZUnitController extends BaseController {
      */
     @SaCheckPermission("zdsz:unit:query")
     @GetMapping("/{id}")
-    public R<ZUnitVo> getInfo(@NotNull(message = "主键不能为空")
-                                     @PathVariable String id) {
+    public R<ZUnitVo> getInfo(@NotNull(message = "主键不能为空") @PathVariable String id) {
         return R.ok(iZUnitService.queryById(id));
     }
 
@@ -101,8 +112,7 @@ public class ZUnitController extends BaseController {
     @SaCheckPermission("zdsz:unit:remove")
     @Log(title = "单元管理", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
-    public R<Void> remove(@NotEmpty(message = "主键不能为空")
-                          @PathVariable String[] ids) {
+    public R<Void> remove(@NotEmpty(message = "主键不能为空") @PathVariable String[] ids) {
         return toAjax(iZUnitService.deleteWithValidByIds(Arrays.asList(ids), true));
     }
 }

ruoyi-common/src/main/java/com/ruoyi/common/core/page/PagePlus.java

@@ -0,0 +1,156 @@
+package com.ruoyi.common.core.page;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.metadata.OrderItem;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * 分页 Page 增强对象
+ *
+ * @param <T> 数据库实体
+ * @param <K> vo实体
+ * @author Lion Li
+ */
+@Data
+@Accessors(chain = true)
+public class PagePlus<T,K> implements IPage<T> {
+
+    /**
+     * domain实体列表
+     */
+    private List<T> records = Collections.emptyList();
+
+    /**
+     * vo实体列表
+     */
+    private List<K> recordsVo = Collections.emptyList();
+
+    /**
+     * 总数
+     */
+    private long total = 0L;
+
+    /**
+     * 页长度
+     */
+    private long size = 10L;
+
+    /**
+     * 当前页
+     */
+    private long current = 1L;
+
+    /**
+     * 排序字段信息
+     */
+    private List<OrderItem> orders = new ArrayList<>();
+
+    /**
+     * 自动优化 COUNT SQL
+     */
+    private boolean optimizeCountSql = true;
+
+    /**
+     * 是否进行 count 查询
+     */
+    private boolean isSearchCount = true;
+
+    /**
+     * 是否命中count缓存
+     */
+    private boolean hitCount = false;
+
+    /**
+     * countId
+     */
+    private String countId;
+
+    /**
+     * 最大limit
+     */
+    private Long maxLimit;
+
+    public PagePlus() {
+    }
+
+    public PagePlus(long current, long size) {
+        this(current, size, 0L);
+    }
+
+    public PagePlus(long current, long size, long total) {
+        this(current, size, total, true);
+    }
+
+    public PagePlus(long current, long size, boolean isSearchCount) {
+        this(current, size, 0L, isSearchCount);
+    }
+
+    public PagePlus(long current, long size, long total, boolean isSearchCount) {
+        if (current > 1L) {
+            this.current = current;
+        }
+        this.size = size;
+        this.total = total;
+        this.isSearchCount = isSearchCount;
+    }
+
+    @Override
+    public String countId() {
+        return this.getCountId();
+    }
+
+    @Override
+    public Long maxLimit() {
+        return this.getMaxLimit();
+    }
+
+    public PagePlus<T, K> addOrder(OrderItem... items) {
+        this.orders.addAll(Arrays.asList(items));
+        return this;
+    }
+
+    public PagePlus<T, K> addOrder(List<OrderItem> items) {
+        this.orders.addAll(items);
+        return this;
+    }
+
+    @Override
+    public List<OrderItem> orders() {
+        return this.getOrders();
+    }
+
+    @Override
+    public boolean optimizeCountSql() {
+        return this.optimizeCountSql;
+    }
+
+	@Override
+	public long getPages() {
+		// 解决 github issues/3208
+		return IPage.super.getPages();
+	}
+
+	public static <T,K> PagePlus<T,K> of(long current, long size) {
+		return of(current, size, 0);
+	}
+
+	public static <T,K> PagePlus<T,K> of(long current, long size, long total) {
+		return of(current, size, total, true);
+	}
+
+	public static <T,K> PagePlus<T,K> of(long current, long size, boolean searchCount) {
+		return of(current, size, 0, searchCount);
+	}
+
+	public static <T,K> PagePlus<T,K> of(long current, long size, long total, boolean searchCount) {
+		return new PagePlus<>(current, size, total, searchCount);
+	}
+
+}
+

ruoyi-common/src/main/java/com/ruoyi/common/utils/PageUtils.java

@@ -0,0 +1,147 @@
+package com.ruoyi.common.utils;
+
+import cn.hutool.http.HttpStatus;
+import com.baomidou.mybatisplus.core.metadata.OrderItem;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.common.core.page.PagePlus;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.utils.sql.SqlUtil;
+
+import java.util.List;
+
+/**
+ * 分页工具
+ *
+ * @author Lion Li
+ */
+public class PageUtils {
+
+    /**
+     * 当前记录起始索引
+     */
+    public static final String PAGE_NUM = "pageNum";
+
+    /**
+     * 每页显示记录数
+     */
+    public static final String PAGE_SIZE = "pageSize";
+
+    /**
+     * 排序列
+     */
+    public static final String ORDER_BY_COLUMN = "orderByColumn";
+
+    /**
+     * 排序的方向 "desc" 或者 "asc".
+     */
+    public static final String IS_ASC = "isAsc";
+
+    /**
+     * 当前记录起始索引 默认值
+     */
+    public static final int DEFAULT_PAGE_NUM = 1;
+
+    /**
+     * 每页显示记录数 默认值 默认查全部
+     */
+    public static final int DEFAULT_PAGE_SIZE = Integer.MAX_VALUE;
+
+    /**
+     * 构建 plus 分页对象
+     *
+     * @param <T> domain 实体
+     * @param <K> vo 实体
+     * @return 分页对象
+     */
+    public static <T, K> PagePlus<T, K> buildPagePlus() {
+        Integer pageNum = ServletUtils.getParameterToInt(PAGE_NUM, DEFAULT_PAGE_NUM);
+        Integer pageSize = ServletUtils.getParameterToInt(PAGE_SIZE, DEFAULT_PAGE_SIZE);
+        String orderByColumn = ServletUtils.getParameter(ORDER_BY_COLUMN);
+        String isAsc = ServletUtils.getParameter(IS_ASC);
+        if (pageNum <= 0) {
+            pageNum = DEFAULT_PAGE_NUM;
+        }
+        PagePlus<T, K> page = new PagePlus<>(pageNum, pageSize);
+        OrderItem orderItem = buildOrderItem(orderByColumn, isAsc);
+        page.addOrder(orderItem);
+        return page;
+    }
+
+    public static <T> Page<T> buildPage() {
+        return buildPage(null, null);
+    }
+
+    /**
+     * 构建 MP 普通分页对象
+     *
+     * @param <T> domain 实体
+     * @return 分页对象
+     */
+    public static <T> Page<T> buildPage(String defaultOrderByColumn, String defaultIsAsc) {
+        Integer pageNum = ServletUtils.getParameterToInt(PAGE_NUM, DEFAULT_PAGE_NUM);
+        Integer pageSize = ServletUtils.getParameterToInt(PAGE_SIZE, DEFAULT_PAGE_SIZE);
+        String orderByColumn = ServletUtils.getParameter(ORDER_BY_COLUMN, defaultOrderByColumn);
+        String isAsc = ServletUtils.getParameter(IS_ASC, defaultIsAsc);
+        if (pageNum <= 0) {
+            pageNum = DEFAULT_PAGE_NUM;
+        }
+        Page<T> page = new Page<>(pageNum, pageSize);
+        OrderItem orderItem = buildOrderItem(orderByColumn, isAsc);
+        page.addOrder(orderItem);
+        return page;
+    }
+
+    private static OrderItem buildOrderItem(String orderByColumn, String isAsc) {
+        // 兼容前端排序类型
+        if ("ascending".equals(isAsc)) {
+            isAsc = "asc";
+        } else if ("descending".equals(isAsc)) {
+            isAsc = "desc";
+        }
+        if (StringUtils.isNotBlank(orderByColumn)) {
+            String orderBy = SqlUtil.escapeOrderBySql(orderByColumn);
+            orderBy = StringUtils.toUnderScoreCase(orderBy);
+            if ("asc".equals(isAsc)) {
+                return OrderItem.asc(orderBy);
+            } else if ("desc".equals(isAsc)) {
+                return OrderItem.desc(orderBy);
+            }
+        }
+        return null;
+    }
+
+    public static <T, K> TableDataInfo<K> buildDataInfo(PagePlus<T, K> page) {
+        TableDataInfo<K> rspData = new TableDataInfo<>();
+        rspData.setCode(HttpStatus.HTTP_OK);
+        rspData.setMsg("查询成功");
+        rspData.setRows(page.getRecordsVo());
+        rspData.setTotal(page.getTotal());
+        return rspData;
+    }
+
+    public static <T> TableDataInfo<T> buildDataInfo(Page<T> page) {
+        TableDataInfo<T> rspData = new TableDataInfo<>();
+        rspData.setCode(HttpStatus.HTTP_OK);
+        rspData.setMsg("查询成功");
+        rspData.setRows(page.getRecords());
+        rspData.setTotal(page.getTotal());
+        return rspData;
+    }
+
+    public static <T> TableDataInfo<T> buildDataInfo(List<T> list) {
+        TableDataInfo<T> rspData = new TableDataInfo<>();
+        rspData.setCode(HttpStatus.HTTP_OK);
+        rspData.setMsg("查询成功");
+        rspData.setRows(list);
+        rspData.setTotal(list.size());
+        return rspData;
+    }
+
+    public static <T> TableDataInfo<T> buildDataInfo() {
+        TableDataInfo<T> rspData = new TableDataInfo<>();
+        rspData.setCode(HttpStatus.HTTP_OK);
+        rspData.setMsg("查询成功");
+        return rspData;
+    }
+
+}

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/domain/ZArea.java

@@ -23,7 +23,7 @@ public class ZArea extends BaseEntity {
     private static final long serialVersionUID=1L;
 
     /**
-     * 
+     *
      */
     @TableId(value = "id")
     private String id;
@@ -38,7 +38,7 @@ public class ZArea extends BaseEntity {
     /**
      * 是否释放
      */
-    private Long releaseIs;
+    private String releaseIs;
     /**
      * 释放人
      */

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/domain/bo/ZAreaBo.java

@@ -1,5 +1,8 @@
 package com.ruoyi.zdsz.domain.bo;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.ruoyi.common.core.validate.AddGroup;
 import com.ruoyi.common.core.validate.EditGroup;
 import lombok.Data;
@@ -22,9 +25,10 @@ import com.ruoyi.common.core.domain.BaseEntity;
 public class ZAreaBo extends BaseEntity {
 
     /**
-     * 
+     *
      */
     @NotBlank(message = "不能为空", groups = { EditGroup.class })
+    @TableId(type = IdType.ASSIGN_UUID)
     private String id;
 
     /**
@@ -42,13 +46,13 @@ public class ZAreaBo extends BaseEntity {
     /**
      * 是否释放
      */
-    @NotNull(message = "是否释放不能为空", groups = { AddGroup.class, EditGroup.class })
-    private Long releaseIs;
+//    @NotNull(message = "是否释放不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String releaseIs;
 
     /**
      * 释放人
      */
-    @NotBlank(message = "释放人不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "释放人不能为空", groups = { AddGroup.class, EditGroup.class })
     private String releaseBy;
 
     /**
@@ -72,7 +76,7 @@ public class ZAreaBo extends BaseEntity {
     /**
      * 备注
      */
-    @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
     private String remark;
 
 

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/domain/bo/ZBuildingBo.java

@@ -42,7 +42,6 @@ public class ZBuildingBo extends BaseEntity {
     /**
      * 备注
      */
-    @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
     private String remark;
 
 

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/domain/bo/ZHouseBo.java

@@ -1,5 +1,7 @@
 package com.ruoyi.zdsz.domain.bo;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.ruoyi.common.core.validate.AddGroup;
 import com.ruoyi.common.core.validate.EditGroup;
 import lombok.Data;
@@ -22,31 +24,32 @@ import com.ruoyi.common.core.domain.BaseEntity;
 public class ZHouseBo extends BaseEntity {
 
     /**
-     * 
+     *
      */
     @NotBlank(message = "不能为空", groups = { EditGroup.class })
+    @TableId(type = IdType.ASSIGN_UUID)
     private String id;
 
     /**
-     * 
+     *
      */
     @NotBlank(message = "不能为空", groups = { AddGroup.class, EditGroup.class })
     private String areaId;
 
     /**
-     * 
+     *
      */
     @NotBlank(message = "不能为空", groups = { AddGroup.class, EditGroup.class })
     private String buildingId;
 
     /**
-     * 
+     *
      */
     @NotBlank(message = "不能为空", groups = { AddGroup.class, EditGroup.class })
     private String unitId;
 
     /**
-     * 
+     *
      */
     @NotBlank(message = "不能为空", groups = { AddGroup.class, EditGroup.class })
     private String name;
@@ -54,7 +57,7 @@ public class ZHouseBo extends BaseEntity {
     /**
      * 备注
      */
-    @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
     private String remark;
 
 

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/domain/bo/ZUnitBo.java

@@ -48,7 +48,6 @@ public class ZUnitBo extends BaseEntity {
     /**
      * 备注
      */
-    @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
     private String remark;
 
 

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/domain/vo/ZAreaVo.java

@@ -22,7 +22,7 @@ public class ZAreaVo implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /**
-     * 
+     *
      */
     @ExcelProperty(value = "")
     private String id;
@@ -44,7 +44,7 @@ public class ZAreaVo implements Serializable {
      */
     @ExcelProperty(value = "是否释放", converter = ExcelDictConvert.class)
     @ExcelDictFormat(dictType = "release_status")
-    private Long releaseIs;
+    private String releaseIs;
 
     /**
      * 释放人

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/domain/vo/ZBuildingVo.java

@@ -32,6 +32,7 @@ public class ZBuildingVo implements Serializable {
      */
     @ExcelProperty(value = "")
     private String areaId;
+    private String areaName;
 
     /**
      * 

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/domain/vo/ZHouseVo.java

@@ -22,31 +22,31 @@ public class ZHouseVo implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /**
-     * 
+     *
      */
     @ExcelProperty(value = "")
     private String id;
 
     /**
-     * 
+     *
      */
     @ExcelProperty(value = "")
     private String areaId;
 
     /**
-     * 
+     *
      */
     @ExcelProperty(value = "")
     private String buildingId;
 
     /**
-     * 
+     *
      */
     @ExcelProperty(value = "")
     private String unitId;
 
     /**
-     * 
+     *
      */
     @ExcelProperty(value = "")
     private String name;
@@ -58,4 +58,12 @@ public class ZHouseVo implements Serializable {
     private String remark;
 
 
+    @ExcelProperty(value = "小区")
+    private String areaName;
+
+    @ExcelProperty(value = "楼栋")
+    private String buildingName;
+
+    @ExcelProperty(value = "单元")
+    private String unitName;
 }

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/domain/vo/ZUnitVo.java

@@ -32,12 +32,14 @@ public class ZUnitVo implements Serializable {
      */
     @ExcelProperty(value = "")
     private String areaId;
+    private String areaName;
 
     /**
      * 
      */
     @ExcelProperty(value = "")
     private String buildingId;
+    private String buildingName;
 
     /**
      * 

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

@@ -4,6 +4,8 @@ import com.ruoyi.zdsz.domain.ZArea;
 import com.ruoyi.zdsz.domain.vo.ZAreaVo;
 import com.ruoyi.common.core.mapper.BaseMapperPlus;
 
+import java.util.List;
+
 /**
  * 小区管理Mapper接口
  *
@@ -11,5 +13,5 @@ import com.ruoyi.common.core.mapper.BaseMapperPlus;
  * @date 2023-12-27
  */
 public interface ZAreaMapper extends BaseMapperPlus<ZAreaMapper, ZArea, ZAreaVo> {
-
+    List<ZAreaVo> getArea(String district);
 }

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

@@ -1,8 +1,14 @@
 package com.ruoyi.zdsz.mapper;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.zdsz.domain.ZBuilding;
+import com.ruoyi.zdsz.domain.bo.ZBuildingBo;
+import com.ruoyi.zdsz.domain.vo.ZAreaVo;
 import com.ruoyi.zdsz.domain.vo.ZBuildingVo;
 import com.ruoyi.common.core.mapper.BaseMapperPlus;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * 楼栋管理Mapper接口
@@ -11,5 +17,8 @@ import com.ruoyi.common.core.mapper.BaseMapperPlus;
  * @date 2023-12-27
  */
 public interface ZBuildingMapper extends BaseMapperPlus<ZBuildingMapper, ZBuilding, ZBuildingVo> {
+    Page<ZBuildingVo> getPageList(@Param("p") ZBuildingBo bo, Page<?> page);
+
+    List<ZBuildingVo> getBuildingList(String areaId);
 
 }

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

@@ -1,8 +1,13 @@
 package com.ruoyi.zdsz.mapper;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.zdsz.domain.ZHouse;
+import com.ruoyi.zdsz.domain.bo.ZBuildingBo;
+import com.ruoyi.zdsz.domain.bo.ZHouseBo;
+import com.ruoyi.zdsz.domain.vo.ZBuildingVo;
 import com.ruoyi.zdsz.domain.vo.ZHouseVo;
 import com.ruoyi.common.core.mapper.BaseMapperPlus;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 房间管理Mapper接口
@@ -11,5 +16,6 @@ import com.ruoyi.common.core.mapper.BaseMapperPlus;
  * @date 2023-12-27
  */
 public interface ZHouseMapper extends BaseMapperPlus<ZHouseMapper, ZHouse, ZHouseVo> {
+    Page<ZHouseVo> getPageList(@Param("p") ZHouseBo bo, Page<?> page);
 
 }

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

@@ -1,8 +1,15 @@
 package com.ruoyi.zdsz.mapper;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.zdsz.domain.ZUnit;
+import com.ruoyi.zdsz.domain.bo.ZBuildingBo;
+import com.ruoyi.zdsz.domain.bo.ZUnitBo;
+import com.ruoyi.zdsz.domain.vo.ZBuildingVo;
 import com.ruoyi.zdsz.domain.vo.ZUnitVo;
 import com.ruoyi.common.core.mapper.BaseMapperPlus;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * 单元管理Mapper接口
@@ -11,5 +18,7 @@ import com.ruoyi.common.core.mapper.BaseMapperPlus;
  * @date 2023-12-27
  */
 public interface ZUnitMapper extends BaseMapperPlus<ZUnitMapper, ZUnit, ZUnitVo> {
+    Page<ZUnitVo> getPageList(@Param("p") ZUnitBo bo, Page<?> page);
 
+    List<ZUnitVo> getUnitList(@Param("areaId")String areaId,@Param("buildingId") String buildingId);
 }

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/service/IZAreaService.java

@@ -21,6 +21,7 @@ public interface IZAreaService {
      * 查询小区管理
      */
     ZAreaVo queryById(String id);
+    List<ZAreaVo> getArea(String district);
 
     /**
      * 查询小区管理列表

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/service/IZBuildingService.java

@@ -1,6 +1,7 @@
 package com.ruoyi.zdsz.service;
 
 import com.ruoyi.zdsz.domain.ZBuilding;
+import com.ruoyi.zdsz.domain.vo.ZAreaVo;
 import com.ruoyi.zdsz.domain.vo.ZBuildingVo;
 import com.ruoyi.zdsz.domain.bo.ZBuildingBo;
 import com.ruoyi.common.core.page.TableDataInfo;
@@ -17,6 +18,11 @@ import java.util.List;
  */
 public interface IZBuildingService {
 
+    List<ZBuildingVo> getBuildingList(String areaId);
+
+
+    int getBuildingListByAreaId(Collection<String> ids);
+
     /**
      * 查询楼栋管理
      */
@@ -25,7 +31,7 @@ public interface IZBuildingService {
     /**
      * 查询楼栋管理列表
      */
-    TableDataInfo<ZBuildingVo> queryPageList(ZBuildingBo bo, PageQuery pageQuery);
+    TableDataInfo<ZBuildingVo> getPageList(ZBuildingBo bo, PageQuery pageQuery);
 
     /**
      * 查询楼栋管理列表

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/service/IZEngineeringCivilService.java

@@ -46,4 +46,8 @@ public interface IZEngineeringCivilService {
      * 校验并批量删除民用工程信息
      */
     Boolean deleteWithValidByIds(Collection<String> ids, Boolean isValid);
+
+    int getCivilByAreaId(Collection<String> list);
+
+    int getCivilByhouseId(Collection<String> list);
 }

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/service/IZEngineeringMaterialsResetsService.java

@@ -46,4 +46,6 @@ public interface IZEngineeringMaterialsResetsService {
      * 校验并批量删除工程用料预设信息
      */
     Boolean deleteWithValidByIds(Collection<String> ids, Boolean isValid);
+
+    int getMaterialByAreaId(Collection<String> list);
 }

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/service/IZUnitService.java

@@ -1,6 +1,7 @@
 package com.ruoyi.zdsz.service;
 
 import com.ruoyi.zdsz.domain.ZUnit;
+import com.ruoyi.zdsz.domain.vo.ZBuildingVo;
 import com.ruoyi.zdsz.domain.vo.ZUnitVo;
 import com.ruoyi.zdsz.domain.bo.ZUnitBo;
 import com.ruoyi.common.core.page.TableDataInfo;
@@ -18,6 +19,12 @@ import java.util.List;
 public interface IZUnitService {
 
     /**
+     * 单元下拉
+     * */
+    List<ZUnitVo> getUnitList(String areaId,String buildingId);
+
+
+    /**
      * 查询单元管理
      */
     ZUnitVo queryById(String id);
@@ -25,7 +32,7 @@ public interface IZUnitService {
     /**
      * 查询单元管理列表
      */
-    TableDataInfo<ZUnitVo> queryPageList(ZUnitBo bo, PageQuery pageQuery);
+    TableDataInfo<ZUnitVo> getPageList(ZUnitBo bo, PageQuery pageQuery);
 
     /**
      * 查询单元管理列表

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

@@ -7,7 +7,9 @@ import com.ruoyi.common.core.domain.PageQuery;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.ruoyi.zdsz.service.IZBuildingService;
 import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.zdsz.domain.bo.ZAreaBo;
 import com.ruoyi.zdsz.domain.vo.ZAreaVo;
@@ -15,6 +17,7 @@ import com.ruoyi.zdsz.domain.ZArea;
 import com.ruoyi.zdsz.mapper.ZAreaMapper;
 import com.ruoyi.zdsz.service.IZAreaService;
 
+import javax.annotation.Resource;
 import java.util.List;
 import java.util.Map;
 import java.util.Collection;
@@ -29,13 +32,23 @@ import java.util.Collection;
 @Service
 public class ZAreaServiceImpl implements IZAreaService {
 
-    private final ZAreaMapper baseMapper;
+    @Resource
+    private ZAreaMapper baseMapper;
+
+
+    /**
+     * 小区下拉
+     */
+    @Override
+    public List<ZAreaVo> getArea(String district) {
+        return baseMapper.getArea(district);
+    }
 
     /**
      * 查询小区管理
      */
     @Override
-    public ZAreaVo queryById(String id){
+    public ZAreaVo queryById(String id) {
         return baseMapper.selectVoById(id);
     }
 
@@ -78,6 +91,7 @@ public class ZAreaServiceImpl implements IZAreaService {
     public Boolean insertByBo(ZAreaBo bo) {
         ZArea add = BeanUtil.toBean(bo, ZArea.class);
         validEntityBeforeSave(add);
+        add.setReleaseIs("001");
         boolean flag = baseMapper.insert(add) > 0;
         if (flag) {
             bo.setId(add.getId());
@@ -98,7 +112,7 @@ public class ZAreaServiceImpl implements IZAreaService {
     /**
      * 保存前的数据校验
      */
-    private void validEntityBeforeSave(ZArea entity){
+    private void validEntityBeforeSave(ZArea entity) {
         //TODO 做一些数据校验,如唯一约束
     }
 
@@ -107,8 +121,8 @@ public class ZAreaServiceImpl implements IZAreaService {
      */
     @Override
     public Boolean deleteWithValidByIds(Collection<String> ids, Boolean isValid) {
-        if(isValid){
-            //TODO 做一些业务上的校验,判断是否需要校验
+        if (isValid) {
+
         }
         return baseMapper.deleteBatchIds(ids) > 0;
     }

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

@@ -1,6 +1,8 @@
 package com.ruoyi.zdsz.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.ruoyi.common.utils.PageUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.core.domain.PageQuery;
@@ -15,6 +17,7 @@ import com.ruoyi.zdsz.domain.ZBuilding;
 import com.ruoyi.zdsz.mapper.ZBuildingMapper;
 import com.ruoyi.zdsz.service.IZBuildingService;
 
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.Collection;
@@ -32,21 +35,36 @@ public class ZBuildingServiceImpl implements IZBuildingService {
     private final ZBuildingMapper baseMapper;
 
     /**
-     * 查询楼栋管理
-     */
+     * 楼宇下拉
+     * */
     @Override
-    public ZBuildingVo queryById(String id){
-        return baseMapper.selectVoById(id);
+    public List<ZBuildingVo> getBuildingList(String areaId) {
+        return baseMapper.getBuildingList(areaId);
+    }
+
+    @Override
+    public int getBuildingListByAreaId(Collection<String> ids) {
+        LambdaQueryWrapper<ZBuilding> lqw = Wrappers.lambdaQuery();
+        lqw.in(!ids.isEmpty(), ZBuilding::getAreaId, ids);
+        return baseMapper.selectVoList(lqw).size();
     }
 
     /**
      * 查询楼栋管理列表
      */
     @Override
-    public TableDataInfo<ZBuildingVo> queryPageList(ZBuildingBo bo, PageQuery pageQuery) {
-        LambdaQueryWrapper<ZBuilding> lqw = buildQueryWrapper(bo);
-        Page<ZBuildingVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
-        return TableDataInfo.build(result);
+    public TableDataInfo<ZBuildingVo> getPageList(ZBuildingBo bo, PageQuery pageQuery) {
+        Page<ZBuildingBo> page = new Page<>(pageQuery.getPageNum(), pageQuery.getPageSize());
+        Page<ZBuildingVo> list = baseMapper.getPageList(bo,page);
+        return TableDataInfo.build(list);
+    }
+
+    /**
+     * 查询楼栋管理
+     */
+    @Override
+    public ZBuildingVo queryById(String id){
+        return baseMapper.selectVoById(id);
     }
 
     /**

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

@@ -7,6 +7,7 @@ import com.ruoyi.common.core.domain.PageQuery;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.ruoyi.zdsz.domain.ZBuilding;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import com.ruoyi.zdsz.domain.bo.ZEngineeringCivilBo;
@@ -115,4 +116,18 @@ public class ZEngineeringCivilServiceImpl implements IZEngineeringCivilService {
         }
         return baseMapper.deleteBatchIds(ids) > 0;
     }
+
+    @Override
+    public int getCivilByAreaId(Collection<String> ids) {
+        LambdaQueryWrapper<ZEngineeringCivil> lqw = Wrappers.lambdaQuery();
+        lqw.in(!ids.isEmpty(), ZEngineeringCivil::getAreaId, ids);
+        return baseMapper.selectVoList(lqw).size();
+    }
+
+    @Override
+    public int getCivilByhouseId(Collection<String> ids) {
+        LambdaQueryWrapper<ZEngineeringCivil> lqw = Wrappers.lambdaQuery();
+        lqw.in(!ids.isEmpty(), ZEngineeringCivil::getHouseId, ids);
+        return baseMapper.selectVoList(lqw).size();
+    }
 }

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

@@ -7,6 +7,7 @@ import com.ruoyi.common.core.domain.PageQuery;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.ruoyi.zdsz.domain.ZEngineeringMaterial;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import com.ruoyi.zdsz.domain.bo.ZEngineeringMaterialsResetsBo;
@@ -110,4 +111,12 @@ public class ZEngineeringMaterialsResetsServiceImpl implements IZEngineeringMate
         }
         return baseMapper.deleteBatchIds(ids) > 0;
     }
+
+
+    @Override
+    public int getMaterialByAreaId(Collection<String> ids) {
+        LambdaQueryWrapper<ZEngineeringMaterialsResets> lqw = Wrappers.lambdaQuery();
+        lqw.in(!ids.isEmpty(), ZEngineeringMaterialsResets::getAreaId, ids);
+        return baseMapper.selectVoList(lqw).size();
+    }
 }

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

@@ -1,12 +1,15 @@
 package com.ruoyi.zdsz.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
+import com.ruoyi.common.utils.PageUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.core.domain.PageQuery;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.ruoyi.zdsz.domain.bo.ZBuildingBo;
+import com.ruoyi.zdsz.domain.vo.ZBuildingVo;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import com.ruoyi.zdsz.domain.bo.ZHouseBo;
@@ -15,6 +18,7 @@ import com.ruoyi.zdsz.domain.ZHouse;
 import com.ruoyi.zdsz.mapper.ZHouseMapper;
 import com.ruoyi.zdsz.service.IZHouseService;
 
+import javax.annotation.Resource;
 import java.util.List;
 import java.util.Map;
 import java.util.Collection;
@@ -29,6 +33,7 @@ import java.util.Collection;
 @Service
 public class ZHouseServiceImpl implements IZHouseService {
 
+    @Resource
     private final ZHouseMapper baseMapper;
 
     /**
@@ -44,9 +49,12 @@ public class ZHouseServiceImpl implements IZHouseService {
      */
     @Override
     public TableDataInfo<ZHouseVo> queryPageList(ZHouseBo bo, PageQuery pageQuery) {
-        LambdaQueryWrapper<ZHouse> lqw = buildQueryWrapper(bo);
-        Page<ZHouseVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
-        return TableDataInfo.build(result);
+//        LambdaQueryWrapper<ZHouse> lqw = buildQueryWrapper(bo);
+//        Page<ZHouseVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+//        return TableDataInfo.build(result);
+        Page<ZHouseBo> page = new Page<>(pageQuery.getPageNum(), pageQuery.getPageSize());
+        Page<ZHouseVo> list = baseMapper.getPageList(bo,page);
+        return PageUtils.buildDataInfo(list);
     }
 
     /**

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

@@ -7,6 +7,8 @@ import com.ruoyi.common.core.domain.PageQuery;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.ruoyi.zdsz.domain.bo.ZBuildingBo;
+import com.ruoyi.zdsz.domain.vo.ZBuildingVo;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import com.ruoyi.zdsz.domain.bo.ZUnitBo;
@@ -31,6 +33,11 @@ public class ZUnitServiceImpl implements IZUnitService {
 
     private final ZUnitMapper baseMapper;
 
+    @Override
+    public List<ZUnitVo> getUnitList(String areaId, String buildingId) {
+        return baseMapper.getUnitList(areaId,buildingId);
+    }
+
     /**
      * 查询单元管理
      */
@@ -43,9 +50,9 @@ public class ZUnitServiceImpl implements IZUnitService {
      * 查询单元管理列表
      */
     @Override
-    public TableDataInfo<ZUnitVo> queryPageList(ZUnitBo bo, PageQuery pageQuery) {
-        LambdaQueryWrapper<ZUnit> lqw = buildQueryWrapper(bo);
-        Page<ZUnitVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+    public TableDataInfo<ZUnitVo> getPageList(ZUnitBo bo, PageQuery pageQuery) {
+        Page<ZUnitBo> page = new Page<>(pageQuery.getPageNum(), pageQuery.getPageSize());
+        Page<ZUnitVo> result = baseMapper.getPageList(bo,page);
         return TableDataInfo.build(result);
     }
 

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

@@ -20,6 +20,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateBy" column="update_by"/>
         <result property="updateTime" column="update_time"/>
     </resultMap>
-
+    <select id="getArea" resultType="com.ruoyi.zdsz.domain.vo.ZAreaVo">
+        select id   as id,
+               name as name
+        from z_area
+        where del_flag = '0'
+        <if test="district != null and district != ''">
+            and district = #{district}
+        </if>
+    </select>
 
 </mapper>

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

@@ -16,5 +16,30 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateTime" column="update_time"/>
     </resultMap>
 
+    <select id="getBuildingList" resultType="com.ruoyi.zdsz.domain.vo.ZBuildingVo">
+        select id   as id,
+               name as name
+        from z_building
+        where del_flag = '0'
+        <if test="areaId != null and areaId != ''">
+            and area_id = #{areaId}
+        </if>
+    </select>
+
+    <select id="getPageList" resultType="com.ruoyi.zdsz.domain.vo.ZBuildingVo">
+        select a.id as id,
+        a.name as name,
+        (select b.name from z_area b where b.id = a.area_id) as areaName
+        from z_building a
+        <where>
+            a.del_flag = '0'
+            <if test="p.name != null  and p.name != ''">
+                and a.name LIKE CONCAT('%',#{p.name},'%')
+            </if>
+            <if test="p.areaId != null  and p.areaId != ''">
+                and a.area_id = #{p.areaId}
+            </if>
+        </where>
+    </select>
 
 </mapper>

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

@@ -18,5 +18,29 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateTime" column="update_time"/>
     </resultMap>
 
+    <select id="getPageList" resultType="com.ruoyi.zdsz.domain.vo.ZHouseVo">
+        SELECT
+            zh.*,
+            zt.NAME AS unitName,
+            zb.NAME AS buildingName,
+            za.NAME AS areaName
+        FROM
+            z_house AS zh
+                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>
+            zh.del_flag = '0'
+            <if test="p.areaId != null  and p.areaId != ''">
+                and zh.area_id = #{p.areaId}
+            </if>
+            <if test="p.buildingId != null  and p.buildingId != ''">
+                and zh.building_id = #{p.buildingId}
+            </if>
+            <if test="p.unitId != null  and p.unitId != ''">
+                and zh.unit_id = #{p.unitId}
+            </if>
+        </where>
+    </select>
 
 </mapper>

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

@@ -18,4 +18,37 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
 
+    <select id="getUnitList" resultType="com.ruoyi.zdsz.domain.vo.ZUnitVo">
+        select id   as id,
+        name as name
+        from z_unit
+        where del_flag = '0'
+        <if test="areaId != null and areaId != ''">
+            and area_id = #{areaId}
+        </if>
+        <if test="buildingId != null and buildingId != ''">
+            and building_id = #{buildingId}
+        </if>
+    </select>
+
+    <select id="getPageList" resultType="com.ruoyi.zdsz.domain.vo.ZUnitVo">
+        select a.id as id,
+        a.name as name,
+        (select b.name from z_area b where b.id = a.area_id) as areaName,
+        (select c.name from z_building c where c.id = a.building_id) as buildingName
+        from z_unit a
+        <where>
+            a.del_flag = '0'
+            <if test="p.name != null  and p.name != ''">
+                and a.name LIKE CONCAT('%',#{p.name},'%')
+            </if>
+            <if test="p.areaId != null  and p.areaId != ''">
+                and a.area_id = #{p.areaId}
+            </if>
+            <if test="p.buildingId != null  and p.buildingId != ''">
+                and a.building_id = #{p.buildingId}
+            </if>
+        </where>
+    </select>
+
 </mapper>