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

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

@@ -0,0 +1,41 @@
+package com.ruoyi.web.controller.zdsz;
+
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.framework.obs.ObsService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+/**
+ * 华为obs
+ *
+ * @date 2021-11-24
+ */
+@Validated
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+@RestController
+@RequestMapping("/obs")
+public class ObsController extends BaseController {
+    private final ObsService obsService;
+
+    /**
+     * 上传文件
+     */
+    @PostMapping
+    public R uploadFile(@RequestBody MultipartFile file) throws Exception {
+        return R.ok(obsService.uploadFile(file));
+    }
+
+    /**
+     * 删除文件
+     */
+    @DeleteMapping("/{objectKey}")
+    public R deleteFile(@PathVariable String objectKey) throws Exception {
+        obsService.deleteFile(objectKey);
+        return R.ok();
+    }
+
+}

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

@@ -34,7 +34,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
 @Validated
 @RequiredArgsConstructor
 @RestController
-@RequestMapping("/zdsz/comprehensive")
+@RequestMapping("/zdsz/openbolt")
 public class ZComprehensiveController extends BaseController {
 
     private final IZComprehensiveService iZComprehensiveService;
@@ -42,16 +42,16 @@ public class ZComprehensiveController extends BaseController {
     /**
      * 查询开栓|安检|维修列表
      */
-    @SaCheckPermission("zdsz:comprehensive:list")
+    @SaCheckPermission("zdsz:openbolt:list")
     @GetMapping("/list")
-    public TableDataInfo<ZComprehensiveVo> list(ZComprehensiveBo bo, PageQuery pageQuery) {
+    public TableDataInfo<ZComprehensiveVo> list(@Validated(QueryGroup.class) ZComprehensiveBo bo, PageQuery pageQuery) {
         return iZComprehensiveService.queryPageList(bo, pageQuery);
     }
 
     /**
      * 导出开栓|安检|维修列表
      */
-    @SaCheckPermission("zdsz:comprehensive:export")
+    @SaCheckPermission("zdsz:openbolt:export")
     @Log(title = "开栓|安检|维修", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(ZComprehensiveBo bo, HttpServletResponse response) {
@@ -64,7 +64,7 @@ public class ZComprehensiveController extends BaseController {
      *
      * @param id 主键
      */
-    @SaCheckPermission("zdsz:comprehensive:query")
+    @SaCheckPermission("zdsz:openbolt:query")
     @GetMapping("/{id}")
     public R<ZComprehensiveVo> getInfo(@NotNull(message = "主键不能为空")
                                      @PathVariable String id) {
@@ -74,7 +74,7 @@ public class ZComprehensiveController extends BaseController {
     /**
      * 新增开栓|安检|维修
      */
-    @SaCheckPermission("zdsz:comprehensive:add")
+    @SaCheckPermission("zdsz:openbolt:add")
     @Log(title = "开栓|安检|维修", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping()
@@ -85,7 +85,7 @@ public class ZComprehensiveController extends BaseController {
     /**
      * 修改开栓|安检|维修
      */
-    @SaCheckPermission("zdsz:comprehensive:edit")
+    @SaCheckPermission("zdsz:openbolt:edit")
     @Log(title = "开栓|安检|维修", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping()
@@ -98,7 +98,7 @@ public class ZComprehensiveController extends BaseController {
      *
      * @param ids 主键串
      */
-    @SaCheckPermission("zdsz:comprehensive:remove")
+    @SaCheckPermission("zdsz:openbolt:remove")
     @Log(title = "开栓|安检|维修", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public R<Void> remove(@NotEmpty(message = "主键不能为空")

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

@@ -0,0 +1,115 @@
+package com.ruoyi.web.controller.zdsz;
+
+import java.util.List;
+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;
+import com.ruoyi.common.annotation.RepeatSubmit;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.PageQuery;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.validate.AddGroup;
+import com.ruoyi.common.core.validate.EditGroup;
+import com.ruoyi.common.core.validate.QueryGroup;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.zdsz.domain.vo.ZEnginMaterialQualityVo;
+import com.ruoyi.zdsz.domain.bo.ZEnginMaterialQualityBo;
+import com.ruoyi.zdsz.service.IZEnginMaterialQualityService;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 工程材质
+ *
+ * @author ruoyi
+ * @date 2023-12-29
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/zdsz/enginMaterialQuality")
+public class ZEnginMaterialQualityController extends BaseController {
+
+    private final IZEnginMaterialQualityService iZEnginMaterialQualityService;
+
+    /**
+     * 查询工程材质列表
+     */
+    @SaCheckPermission("zdsz:enginMaterialQuality:list")
+    @GetMapping("/list")
+    public TableDataInfo<ZEnginMaterialQualityVo> list(ZEnginMaterialQualityBo bo, PageQuery pageQuery) {
+        return iZEnginMaterialQualityService.queryPageList(bo, pageQuery);
+    }
+    /**
+     * 工程材质下拉
+     */
+    @GetMapping("/getEnginMaterialQualityList")
+    public R getEnginMaterialQualityList() {
+        return R.ok(iZEnginMaterialQualityService.getEnginMaterialQualityList());
+    }
+
+    /**
+     * 导出工程材质列表
+     */
+    @SaCheckPermission("zdsz:enginMaterialQuality:export")
+    @Log(title = "工程材质", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(ZEnginMaterialQualityBo bo, HttpServletResponse response) {
+        List<ZEnginMaterialQualityVo> list = iZEnginMaterialQualityService.queryList(bo);
+        ExcelUtil.exportExcel(list, "工程材质", ZEnginMaterialQualityVo.class, response);
+    }
+
+    /**
+     * 获取工程材质详细信息
+     *
+     * @param id 主键
+     */
+    @SaCheckPermission("zdsz:enginMaterialQuality:query")
+    @GetMapping("/{id}")
+    public R<ZEnginMaterialQualityVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable String id) {
+        return R.ok(iZEnginMaterialQualityService.queryById(id));
+    }
+
+    /**
+     * 新增工程材质
+     */
+    @SaCheckPermission("zdsz:enginMaterialQuality:add")
+    @Log(title = "工程材质", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody ZEnginMaterialQualityBo bo) {
+        return toAjax(iZEnginMaterialQualityService.insertByBo(bo));
+    }
+
+    /**
+     * 修改工程材质
+     */
+    @SaCheckPermission("zdsz:enginMaterialQuality:edit")
+    @Log(title = "工程材质", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody ZEnginMaterialQualityBo bo) {
+        return toAjax(iZEnginMaterialQualityService.updateByBo(bo));
+    }
+
+    /**
+     * 删除工程材质
+     *
+     * @param ids 主键串
+     */
+    @SaCheckPermission("zdsz:enginMaterialQuality:remove")
+    @Log(title = "工程材质", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable String[] ids) {
+        return toAjax(iZEnginMaterialQualityService.deleteWithValidByIds(Arrays.asList(ids), true));
+    }
+}

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

@@ -0,0 +1,114 @@
+package com.ruoyi.web.controller.zdsz;
+
+import java.util.List;
+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;
+import com.ruoyi.common.annotation.RepeatSubmit;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.PageQuery;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.validate.AddGroup;
+import com.ruoyi.common.core.validate.EditGroup;
+import com.ruoyi.common.core.validate.QueryGroup;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.zdsz.domain.vo.ZEnginSpecificationsVo;
+import com.ruoyi.zdsz.domain.bo.ZEnginSpecificationsBo;
+import com.ruoyi.zdsz.service.IZEnginSpecificationsService;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 工程材质规格
+ *
+ * @author ruoyi
+ * @date 2023-12-29
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/zdsz/enginSpecifications")
+public class ZEnginSpecificationsController extends BaseController {
+
+    private final IZEnginSpecificationsService iZEnginSpecificationsService;
+
+    /**
+     * 查询工程材质规格列表
+     */
+    @SaCheckPermission("zdsz:enginSpecifications:list")
+    @GetMapping("/list")
+    public TableDataInfo<ZEnginSpecificationsVo> list(ZEnginSpecificationsBo bo, PageQuery pageQuery) {
+        return iZEnginSpecificationsService.queryPageList(bo, pageQuery);
+    }
+    /**
+     * 材质规格下拉
+     */
+    @GetMapping("/getEnginSpecificationsList")
+    public R getEnginSpecifications(String materId) {
+        return R.ok(iZEnginSpecificationsService.getEnginSpecifications(materId));
+    }
+    /**
+     * 导出工程材质规格列表
+     */
+    @SaCheckPermission("zdsz:enginSpecifications:export")
+    @Log(title = "工程材质规格", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(ZEnginSpecificationsBo bo, HttpServletResponse response) {
+        List<ZEnginSpecificationsVo> list = iZEnginSpecificationsService.queryList(bo);
+        ExcelUtil.exportExcel(list, "工程材质规格", ZEnginSpecificationsVo.class, response);
+    }
+
+    /**
+     * 获取工程材质规格详细信息
+     *
+     * @param id 主键
+     */
+    @SaCheckPermission("zdsz:enginSpecifications:query")
+    @GetMapping("/{id}")
+    public R<ZEnginSpecificationsVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable String id) {
+        return R.ok(iZEnginSpecificationsService.queryById(id));
+    }
+
+    /**
+     * 新增工程材质规格
+     */
+    @SaCheckPermission("zdsz:enginSpecifications:add")
+    @Log(title = "工程材质规格", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody ZEnginSpecificationsBo bo) {
+        return toAjax(iZEnginSpecificationsService.insertByBo(bo));
+    }
+
+    /**
+     * 修改工程材质规格
+     */
+    @SaCheckPermission("zdsz:enginSpecifications:edit")
+    @Log(title = "工程材质规格", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody ZEnginSpecificationsBo bo) {
+        return toAjax(iZEnginSpecificationsService.updateByBo(bo));
+    }
+
+    /**
+     * 删除工程材质规格
+     *
+     * @param ids 主键串
+     */
+    @SaCheckPermission("zdsz:enginSpecifications:remove")
+    @Log(title = "工程材质规格", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable String[] ids) {
+        return toAjax(iZEnginSpecificationsService.deleteWithValidByIds(Arrays.asList(ids), true));
+    }
+}

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

@@ -53,7 +53,14 @@ public class ZHouseController extends BaseController {
     public TableDataInfo<ZHouseVo> list(ZHouseBo bo, PageQuery pageQuery) {
         return iZHouseService.queryPageList(bo, pageQuery);
     }
-
+    /**
+     * 房间下拉
+     *
+     */
+    @GetMapping("/getHousesList")
+    public R getHousesList(String unitId) {
+        return R.ok(iZHouseService.getHouses(unitId));
+    }
     /**
      * 导出房间管理列表
      */

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

@@ -23,7 +23,7 @@ public class ZComprehensive extends BaseEntity {
     private static final long serialVersionUID=1L;
 
     /**
-     * 
+     *
      */
     @TableId(value = "id")
     private String id;

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

@@ -0,0 +1,44 @@
+package com.ruoyi.zdsz.domain;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import java.io.Serializable;
+import java.util.Date;
+import java.math.BigDecimal;
+
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 工程材质对象 z_engin_material_quality
+ *
+ * @author ruoyi
+ * @date 2023-12-29
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("z_engin_material_quality")
+public class ZEnginMaterialQuality extends BaseEntity {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 
+     */
+    @TableId(value = "id")
+    private String id;
+    /**
+     * 工程类型
+     */
+    private String enginType;
+    /**
+     * 材质名称
+     */
+    private String name;
+    /**
+     * 删除标识
+     */
+    @TableLogic
+    private String delFlag;
+
+}

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

@@ -0,0 +1,44 @@
+package com.ruoyi.zdsz.domain;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import java.io.Serializable;
+import java.util.Date;
+import java.math.BigDecimal;
+
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 工程材质规格对象 z_engin_specifications
+ *
+ * @author ruoyi
+ * @date 2023-12-29
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("z_engin_specifications")
+public class ZEnginSpecifications extends BaseEntity {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 
+     */
+    @TableId(value = "id")
+    private String id;
+    /**
+     * 材质id
+     */
+    private String materId;
+    /**
+     * 材质名称
+     */
+    private String name;
+    /**
+     * 删除标识
+     */
+    @TableLogic
+    private String delFlag;
+
+}

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

@@ -1,7 +1,10 @@
 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 com.ruoyi.common.core.validate.QueryGroup;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import javax.validation.constraints.*;
@@ -22,9 +25,10 @@ import com.ruoyi.common.core.domain.BaseEntity;
 public class ZComprehensiveBo extends BaseEntity {
 
     /**
-     * 
+     *
      */
     @NotBlank(message = "不能为空", groups = { EditGroup.class })
+    @TableId(type = IdType.ASSIGN_UUID)
     private String id;
 
     /**
@@ -54,7 +58,7 @@ public class ZComprehensiveBo extends BaseEntity {
     /**
      * 类型
      */
-    @NotBlank(message = "类型不能为空", groups = { AddGroup.class, EditGroup.class })
+    @NotBlank(message = "类型不能为空", groups = { AddGroup.class, EditGroup.class, QueryGroup.class })
     private String type;
 
     /**
@@ -72,7 +76,7 @@ public class ZComprehensiveBo 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/ZEnginMaterialQualityBo.java

@@ -0,0 +1,43 @@
+package com.ruoyi.zdsz.domain.bo;
+
+import com.ruoyi.common.core.validate.AddGroup;
+import com.ruoyi.common.core.validate.EditGroup;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import javax.validation.constraints.*;
+
+import java.util.Date;
+
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 工程材质业务对象 z_engin_material_quality
+ *
+ * @author ruoyi
+ * @date 2023-12-29
+ */
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class ZEnginMaterialQualityBo extends BaseEntity {
+
+    /**
+     * 
+     */
+    @NotBlank(message = "不能为空", groups = { EditGroup.class })
+    private String id;
+
+    /**
+     * 工程类型
+     */
+    @NotBlank(message = "工程类型不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String enginType;
+
+    /**
+     * 材质名称
+     */
+    @NotBlank(message = "材质名称不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String name;
+
+
+}

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

@@ -0,0 +1,43 @@
+package com.ruoyi.zdsz.domain.bo;
+
+import com.ruoyi.common.core.validate.AddGroup;
+import com.ruoyi.common.core.validate.EditGroup;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import javax.validation.constraints.*;
+
+import java.util.Date;
+
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 工程材质规格业务对象 z_engin_specifications
+ *
+ * @author ruoyi
+ * @date 2023-12-29
+ */
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class ZEnginSpecificationsBo extends BaseEntity {
+
+    /**
+     * 
+     */
+    @NotBlank(message = "不能为空", groups = { EditGroup.class })
+    private String id;
+
+    /**
+     * 材质id
+     */
+    @NotBlank(message = "材质id不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String materId;
+
+    /**
+     * 材质名称
+     */
+    @NotBlank(message = "材质名称不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String name;
+
+
+}

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

@@ -22,13 +22,13 @@ import com.ruoyi.common.core.domain.BaseEntity;
 public class ZEngineeringMaterialsResetsBo extends BaseEntity {
 
     /**
-     * 
+     *
      */
     @NotBlank(message = "不能为空", groups = { EditGroup.class })
     private String id;
 
     /**
-     * 
+     *
      */
     @NotBlank(message = "不能为空", groups = { AddGroup.class, EditGroup.class })
     private String areaId;
@@ -60,7 +60,7 @@ public class ZEngineeringMaterialsResetsBo 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/vo/ZAreaVo.java

@@ -24,7 +24,6 @@ public class ZAreaVo implements Serializable {
     /**
      *
      */
-    @ExcelProperty(value = "")
     private String id;
 
     /**

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

@@ -22,7 +22,7 @@ public class ZComprehensiveVo implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /**
-     * 
+     *
      */
     @ExcelProperty(value = "")
     private String id;
@@ -75,5 +75,16 @@ public class ZComprehensiveVo implements Serializable {
     @ExcelProperty(value = "备注")
     private String remark;
 
+    @ExcelProperty(value = "小区")
+    private String areaName;
+
+    @ExcelProperty(value = "楼栋")
+    private String buildingName;
+
+    @ExcelProperty(value = "单元")
+    private String unitName;
+
+    @ExcelProperty(value = "房间号")
+    private String houseName;
 
 }

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

@@ -0,0 +1,43 @@
+package com.ruoyi.zdsz.domain.vo;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.ruoyi.common.annotation.ExcelDictFormat;
+import com.ruoyi.common.convert.ExcelDictConvert;
+import lombok.Data;
+import java.util.Date;
+
+import java.io.Serializable;
+
+/**
+ * 工程材质视图对象 z_engin_material_quality
+ *
+ * @author ruoyi
+ * @date 2023-12-29
+ */
+@Data
+@ExcelIgnoreUnannotated
+public class ZEnginMaterialQualityVo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 
+     */
+    @ExcelProperty(value = "")
+    private String id;
+
+    /**
+     * 工程类型
+     */
+    @ExcelProperty(value = "工程类型")
+    private String enginType;
+
+    /**
+     * 材质名称
+     */
+    @ExcelProperty(value = "材质名称")
+    private String name;
+
+
+}

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

@@ -0,0 +1,45 @@
+package com.ruoyi.zdsz.domain.vo;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.ruoyi.common.annotation.ExcelDictFormat;
+import com.ruoyi.common.convert.ExcelDictConvert;
+import lombok.Data;
+import java.util.Date;
+
+import java.io.Serializable;
+
+/**
+ * 工程材质规格视图对象 z_engin_specifications
+ *
+ * @author ruoyi
+ * @date 2023-12-29
+ */
+@Data
+@ExcelIgnoreUnannotated
+public class ZEnginSpecificationsVo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 
+     */
+    @ExcelProperty(value = "")
+    private String id;
+
+    /**
+     * 材质id
+     */
+    @ExcelProperty(value = "材质id")
+    private String materId;
+    private String materName;
+    private String enginType;
+
+    /**
+     * 材质名称
+     */
+    @ExcelProperty(value = "材质名称")
+    private String name;
+
+
+}

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

@@ -22,15 +22,13 @@ public class ZEngineeringMaterialsResetsVo implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /**
-     * 
+     *
      */
-    @ExcelProperty(value = "")
     private String id;
 
     /**
-     * 
+     *
      */
-    @ExcelProperty(value = "")
     private String areaId;
 
     /**
@@ -54,7 +52,8 @@ public class ZEngineeringMaterialsResetsVo implements Serializable {
     /**
      * 工程周期
      */
-    @ExcelProperty(value = "工程周期")
+    @ExcelProperty(value = "工程周期", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(dictType = "engin_cycle")
     private String enginCycle;
 
     /**
@@ -62,6 +61,23 @@ public class ZEngineeringMaterialsResetsVo implements Serializable {
      */
     @ExcelProperty(value = "备注")
     private String remark;
+    /**
+     * 小区名称
+     */
+    @ExcelProperty(value = "小区名称")
+    private String areaName;
+
+    /**
+     * 材质
+     */
+    @ExcelProperty(value = "材质")
+    private String materialQualityName;
+
+    /**
+     * 规格
+     */
+    @ExcelProperty(value = "规格")
+    private String estimatedSpecificationsName;
 
 
 }

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

@@ -24,25 +24,21 @@ public class ZHouseVo implements Serializable {
     /**
      *
      */
-    @ExcelProperty(value = "")
     private String id;
 
     /**
      *
      */
-    @ExcelProperty(value = "")
     private String areaId;
 
     /**
      *
      */
-    @ExcelProperty(value = "")
     private String buildingId;
 
     /**
      *
      */
-    @ExcelProperty(value = "")
     private String unitId;
 
     /**

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

@@ -1,8 +1,13 @@
 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.ZHouseBo;
 import com.ruoyi.zdsz.domain.vo.ZComprehensiveVo;
 import com.ruoyi.common.core.mapper.BaseMapperPlus;
+import com.ruoyi.zdsz.domain.vo.ZHouseVo;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 开栓|安检|维修Mapper接口
@@ -12,4 +17,5 @@ import com.ruoyi.common.core.mapper.BaseMapperPlus;
  */
 public interface ZComprehensiveMapper extends BaseMapperPlus<ZComprehensiveMapper, ZComprehensive, ZComprehensiveVo> {
 
+    Page<ZComprehensiveVo> getPageList(@Param("p") ZComprehensiveBo bo, Page<?> page);
 }

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

@@ -0,0 +1,18 @@
+package com.ruoyi.zdsz.mapper;
+
+import com.ruoyi.zdsz.domain.ZEnginMaterialQuality;
+import com.ruoyi.zdsz.domain.vo.ZEnginMaterialQualityVo;
+import com.ruoyi.common.core.mapper.BaseMapperPlus;
+
+import java.util.List;
+
+/**
+ * 工程材质Mapper接口
+ *
+ * @author ruoyi
+ * @date 2023-12-29
+ */
+public interface ZEnginMaterialQualityMapper extends BaseMapperPlus<ZEnginMaterialQualityMapper, ZEnginMaterialQuality, ZEnginMaterialQualityVo> {
+
+    List<ZEnginMaterialQualityVo> getEnginMaterialQualityList();
+}

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

@@ -0,0 +1,25 @@
+package com.ruoyi.zdsz.mapper;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.zdsz.domain.ZEnginSpecifications;
+import com.ruoyi.zdsz.domain.bo.ZBuildingBo;
+import com.ruoyi.zdsz.domain.bo.ZEnginSpecificationsBo;
+import com.ruoyi.zdsz.domain.vo.ZBuildingVo;
+import com.ruoyi.zdsz.domain.vo.ZEnginSpecificationsVo;
+import com.ruoyi.common.core.mapper.BaseMapperPlus;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * 工程材质规格Mapper接口
+ *
+ * @author ruoyi
+ * @date 2023-12-29
+ */
+public interface ZEnginSpecificationsMapper extends BaseMapperPlus<ZEnginSpecificationsMapper, ZEnginSpecifications, ZEnginSpecificationsVo> {
+    Page<ZEnginSpecificationsVo> getPageList(@Param("p") ZEnginSpecificationsBo bo, Page<?> page);
+    ZEnginSpecificationsVo getById(String id);
+
+    List<ZEnginSpecificationsVo> getEnginSpecifications(String materId);
+}

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

@@ -1,8 +1,11 @@
 package com.ruoyi.zdsz.mapper;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.zdsz.domain.ZEngineeringMaterialsResets;
+import com.ruoyi.zdsz.domain.bo.ZEngineeringMaterialsResetsBo;
 import com.ruoyi.zdsz.domain.vo.ZEngineeringMaterialsResetsVo;
 import com.ruoyi.common.core.mapper.BaseMapperPlus;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 工程用料预设Mapper接口
@@ -12,4 +15,5 @@ import com.ruoyi.common.core.mapper.BaseMapperPlus;
  */
 public interface ZEngineeringMaterialsResetsMapper extends BaseMapperPlus<ZEngineeringMaterialsResetsMapper, ZEngineeringMaterialsResets, ZEngineeringMaterialsResetsVo> {
 
+    Page<ZEngineeringMaterialsResetsVo> getPageList(@Param("p") ZEngineeringMaterialsResetsBo bo, Page<ZEngineeringMaterialsResetsBo> page);
 }

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

@@ -9,6 +9,8 @@ import com.ruoyi.zdsz.domain.vo.ZHouseVo;
 import com.ruoyi.common.core.mapper.BaseMapperPlus;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * 房间管理Mapper接口
  *
@@ -18,4 +20,5 @@ import org.apache.ibatis.annotations.Param;
 public interface ZHouseMapper extends BaseMapperPlus<ZHouseMapper, ZHouse, ZHouseVo> {
     Page<ZHouseVo> getPageList(@Param("p") ZHouseBo bo, Page<?> page);
 
+    List<ZHouseVo> selectListByunitId(String unitId);
 }

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

@@ -0,0 +1,52 @@
+package com.ruoyi.zdsz.service;
+
+import com.ruoyi.zdsz.domain.ZEnginMaterialQuality;
+import com.ruoyi.zdsz.domain.vo.ZBuildingVo;
+import com.ruoyi.zdsz.domain.vo.ZEnginMaterialQualityVo;
+import com.ruoyi.zdsz.domain.bo.ZEnginMaterialQualityBo;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.core.domain.PageQuery;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 工程材质Service接口
+ *
+ * @author ruoyi
+ * @date 2023-12-29
+ */
+public interface IZEnginMaterialQualityService {
+
+    /**
+     * 查询工程材质
+     */
+    ZEnginMaterialQualityVo queryById(String id);
+
+    /**
+     * 查询工程材质列表
+     */
+    TableDataInfo<ZEnginMaterialQualityVo> queryPageList(ZEnginMaterialQualityBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询工程材质列表
+     */
+    List<ZEnginMaterialQualityVo> queryList(ZEnginMaterialQualityBo bo);
+
+    /**
+     * 新增工程材质
+     */
+    Boolean insertByBo(ZEnginMaterialQualityBo bo);
+
+    /**
+     * 修改工程材质
+     */
+    Boolean updateByBo(ZEnginMaterialQualityBo bo);
+
+    /**
+     * 校验并批量删除工程材质信息
+     */
+    Boolean deleteWithValidByIds(Collection<String> ids, Boolean isValid);
+
+    List<ZEnginMaterialQualityVo> getEnginMaterialQualityList();
+}

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

@@ -0,0 +1,51 @@
+package com.ruoyi.zdsz.service;
+
+import com.ruoyi.zdsz.domain.ZEnginSpecifications;
+import com.ruoyi.zdsz.domain.vo.ZEnginSpecificationsVo;
+import com.ruoyi.zdsz.domain.bo.ZEnginSpecificationsBo;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.core.domain.PageQuery;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 工程材质规格Service接口
+ *
+ * @author ruoyi
+ * @date 2023-12-29
+ */
+public interface IZEnginSpecificationsService {
+
+    /**
+     * 查询工程材质规格
+     */
+    ZEnginSpecificationsVo queryById(String id);
+
+    /**
+     * 查询工程材质规格列表
+     */
+    TableDataInfo<ZEnginSpecificationsVo> queryPageList(ZEnginSpecificationsBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询工程材质规格列表
+     */
+    List<ZEnginSpecificationsVo> queryList(ZEnginSpecificationsBo bo);
+
+    /**
+     * 新增工程材质规格
+     */
+    Boolean insertByBo(ZEnginSpecificationsBo bo);
+
+    /**
+     * 修改工程材质规格
+     */
+    Boolean updateByBo(ZEnginSpecificationsBo bo);
+
+    /**
+     * 校验并批量删除工程材质规格信息
+     */
+    Boolean deleteWithValidByIds(Collection<String> ids, Boolean isValid);
+
+    List<ZEnginSpecificationsVo> getEnginSpecifications(String materId);
+}

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

@@ -48,4 +48,6 @@ public interface IZHouseService {
     Boolean deleteWithValidByIds(Collection<String> ids, Boolean isValid);
 
     int getHouseByUnitId(Collection<String> list);
+
+    List<ZHouseVo> getHouses(String unitId);
 }

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/service/impl/ZComprehensiveServiceImpl.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.ZHouseBo;
+import com.ruoyi.zdsz.domain.vo.ZHouseVo;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import com.ruoyi.zdsz.domain.bo.ZComprehensiveBo;
@@ -44,9 +47,12 @@ public class ZComprehensiveServiceImpl implements IZComprehensiveService {
      */
     @Override
     public TableDataInfo<ZComprehensiveVo> queryPageList(ZComprehensiveBo bo, PageQuery pageQuery) {
-        LambdaQueryWrapper<ZComprehensive> lqw = buildQueryWrapper(bo);
-        Page<ZComprehensiveVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
-        return TableDataInfo.build(result);
+//        LambdaQueryWrapper<ZComprehensive> lqw = buildQueryWrapper(bo);
+//        Page<ZComprehensiveVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+//        return TableDataInfo.build(result);
+        Page<ZComprehensiveVo> page = new Page<>(pageQuery.getPageNum(), pageQuery.getPageSize());
+        Page<ZComprehensiveVo> list = baseMapper.getPageList(bo,page);
+        return PageUtils.buildDataInfo(list);
     }
 
     /**

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

@@ -0,0 +1,115 @@
+package com.ruoyi.zdsz.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+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 lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import com.ruoyi.zdsz.domain.bo.ZEnginMaterialQualityBo;
+import com.ruoyi.zdsz.domain.vo.ZEnginMaterialQualityVo;
+import com.ruoyi.zdsz.domain.ZEnginMaterialQuality;
+import com.ruoyi.zdsz.mapper.ZEnginMaterialQualityMapper;
+import com.ruoyi.zdsz.service.IZEnginMaterialQualityService;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Collection;
+
+/**
+ * 工程材质Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2023-12-29
+ */
+@RequiredArgsConstructor
+@Service
+public class ZEnginMaterialQualityServiceImpl implements IZEnginMaterialQualityService {
+
+    private final ZEnginMaterialQualityMapper baseMapper;
+
+    /**
+     * 查询工程材质
+     */
+    @Override
+    public ZEnginMaterialQualityVo queryById(String id){
+        return baseMapper.selectVoById(id);
+    }
+
+    /**
+     * 查询工程材质列表
+     */
+    @Override
+    public TableDataInfo<ZEnginMaterialQualityVo> queryPageList(ZEnginMaterialQualityBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<ZEnginMaterialQuality> lqw = buildQueryWrapper(bo);
+        Page<ZEnginMaterialQualityVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询工程材质列表
+     */
+    @Override
+    public List<ZEnginMaterialQualityVo> queryList(ZEnginMaterialQualityBo bo) {
+        LambdaQueryWrapper<ZEnginMaterialQuality> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<ZEnginMaterialQuality> buildQueryWrapper(ZEnginMaterialQualityBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<ZEnginMaterialQuality> lqw = Wrappers.lambdaQuery();
+        lqw.like(StringUtils.isNotBlank(bo.getEnginType()), ZEnginMaterialQuality::getEnginType, bo.getEnginType());
+        lqw.like(StringUtils.isNotBlank(bo.getName()), ZEnginMaterialQuality::getName, bo.getName());
+        return lqw;
+    }
+
+    /**
+     * 新增工程材质
+     */
+    @Override
+    public Boolean insertByBo(ZEnginMaterialQualityBo bo) {
+        ZEnginMaterialQuality add = BeanUtil.toBean(bo, ZEnginMaterialQuality.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改工程材质
+     */
+    @Override
+    public Boolean updateByBo(ZEnginMaterialQualityBo bo) {
+        ZEnginMaterialQuality update = BeanUtil.toBean(bo, ZEnginMaterialQuality.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(ZEnginMaterialQuality entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    /**
+     * 批量删除工程材质
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<String> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return baseMapper.deleteBatchIds(ids) > 0;
+    }
+
+    @Override
+    public List<ZEnginMaterialQualityVo> getEnginMaterialQualityList() {
+        return baseMapper.getEnginMaterialQualityList();
+    }
+}

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

@@ -0,0 +1,117 @@
+package com.ruoyi.zdsz.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+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.ZEnginSpecificationsBo;
+import com.ruoyi.zdsz.domain.vo.ZEnginSpecificationsVo;
+import com.ruoyi.zdsz.domain.ZEnginSpecifications;
+import com.ruoyi.zdsz.mapper.ZEnginSpecificationsMapper;
+import com.ruoyi.zdsz.service.IZEnginSpecificationsService;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Collection;
+
+/**
+ * 工程材质规格Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2023-12-29
+ */
+@RequiredArgsConstructor
+@Service
+public class ZEnginSpecificationsServiceImpl implements IZEnginSpecificationsService {
+
+    private final ZEnginSpecificationsMapper baseMapper;
+
+    /**
+     * 查询工程材质规格
+     */
+    @Override
+    public ZEnginSpecificationsVo queryById(String id){
+        return baseMapper.getById(id);
+    }
+
+    /**
+     * 查询工程材质规格列表
+     */
+    @Override
+    public TableDataInfo<ZEnginSpecificationsVo> queryPageList(ZEnginSpecificationsBo bo, PageQuery pageQuery) {
+        Page<ZEnginSpecificationsBo> page = new Page<>(pageQuery.getPageNum(), pageQuery.getPageSize());
+        Page<ZEnginSpecificationsVo> result = baseMapper.getPageList(bo,page);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询工程材质规格列表
+     */
+    @Override
+    public List<ZEnginSpecificationsVo> queryList(ZEnginSpecificationsBo bo) {
+        LambdaQueryWrapper<ZEnginSpecifications> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<ZEnginSpecifications> buildQueryWrapper(ZEnginSpecificationsBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<ZEnginSpecifications> lqw = Wrappers.lambdaQuery();
+        lqw.eq(StringUtils.isNotBlank(bo.getMaterId()), ZEnginSpecifications::getMaterId, bo.getMaterId());
+        lqw.like(StringUtils.isNotBlank(bo.getName()), ZEnginSpecifications::getName, bo.getName());
+        return lqw;
+    }
+
+    /**
+     * 新增工程材质规格
+     */
+    @Override
+    public Boolean insertByBo(ZEnginSpecificationsBo bo) {
+        ZEnginSpecifications add = BeanUtil.toBean(bo, ZEnginSpecifications.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改工程材质规格
+     */
+    @Override
+    public Boolean updateByBo(ZEnginSpecificationsBo bo) {
+        ZEnginSpecifications update = BeanUtil.toBean(bo, ZEnginSpecifications.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(ZEnginSpecifications entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    /**
+     * 批量删除工程材质规格
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<String> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return baseMapper.deleteBatchIds(ids) > 0;
+    }
+
+    @Override
+    public List<ZEnginSpecificationsVo> getEnginSpecifications(String materId) {
+        return baseMapper.getEnginSpecifications(materId);
+    }
+}

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

@@ -8,6 +8,8 @@ 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 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.ZEngineeringMaterialsResetsBo;
@@ -45,9 +47,12 @@ public class ZEngineeringMaterialsResetsServiceImpl implements IZEngineeringMate
      */
     @Override
     public TableDataInfo<ZEngineeringMaterialsResetsVo> queryPageList(ZEngineeringMaterialsResetsBo bo, PageQuery pageQuery) {
-        LambdaQueryWrapper<ZEngineeringMaterialsResets> lqw = buildQueryWrapper(bo);
-        Page<ZEngineeringMaterialsResetsVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
-        return TableDataInfo.build(result);
+//        LambdaQueryWrapper<ZEngineeringMaterialsResets> lqw = buildQueryWrapper(bo);
+//        Page<ZEngineeringMaterialsResetsVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+//        return TableDataInfo.build(result);
+        Page<ZEngineeringMaterialsResetsBo> page = new Page<>(pageQuery.getPageNum(), pageQuery.getPageSize());
+        Page<ZEngineeringMaterialsResetsVo> list = baseMapper.getPageList(bo,page);
+        return TableDataInfo.build(list);
     }
 
     /**

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

@@ -8,9 +8,6 @@ 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 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;
@@ -125,4 +122,9 @@ public class ZHouseServiceImpl implements IZHouseService {
         lqw.in(!ids.isEmpty(), ZHouse::getUnitId, ids);
         return baseMapper.selectVoList(lqw).size();
     }
+
+    @Override
+    public List<ZHouseVo> getHouses(String unitId) {
+        return baseMapper.selectListByunitId(unitId);
+    }
 }

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

@@ -20,6 +20,34 @@ 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
+        zc.*,
+        zh.NAME AS houseName,
+        zt.NAME AS unitName,
+        zb.NAME AS buildingName,
+        za.NAME AS areaName
+        FROM
+        z_comprehensive AS zc
+        LEFT JOIN z_house AS zh ON zh.id = zc.house_id
+        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>
+    </select>
 
 </mapper>

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

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.zdsz.mapper.ZEnginMaterialQualityMapper">
+
+    <resultMap type="com.ruoyi.zdsz.domain.ZEnginMaterialQuality" id="ZEnginMaterialQualityResult">
+        <result property="id" column="id"/>
+        <result property="enginType" column="engin_type"/>
+        <result property="name" column="name"/>
+        <result property="delFlag" column="del_flag"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
+    </resultMap>
+
+
+    <select id="getEnginMaterialQualityList" resultType="com.ruoyi.zdsz.domain.vo.ZEnginMaterialQualityVo">
+        select * from z_engin_material_quality zc where zc.del_flag = '0'
+    </select>
+
+</mapper>

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

@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.zdsz.mapper.ZEnginSpecificationsMapper">
+
+    <resultMap type="com.ruoyi.zdsz.domain.ZEnginSpecifications" id="ZEnginSpecificationsResult">
+        <result property="id" column="id"/>
+        <result property="materId" column="mater_id"/>
+        <result property="name" column="name"/>
+        <result property="delFlag" column="del_flag"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
+    </resultMap>
+
+    <select id="getById" resultType="com.ruoyi.zdsz.domain.vo.ZEnginSpecificationsVo">
+        select a.id         as id,
+               a.name       as name,
+               b.name       as materName,
+               b.id         as materId,
+               b.engin_type AS enginType
+        from z_engin_specifications a
+                 left join z_engin_material_quality b on b.id = a.mater_id
+        where a.del_flag = '0'
+          and a.id = #{id}
+    </select>
+    <select id="getPageList" resultType="com.ruoyi.zdsz.domain.vo.ZEnginSpecificationsVo">
+        select a.id as id,
+        a.name as name,
+        b.name as materName,
+        b.id as materId,
+        b.engin_type AS enginType
+        from z_engin_specifications a
+        left join z_engin_material_quality b on b.id = a.mater_id
+        <where>
+            a.del_flag = '0'
+            <if test="p.name != null  and p.name != ''">
+                and a.name LIKE CONCAT('%',#{p.name},'%')
+            </if>
+            <if test="p.materId != null  and p.materId != ''">
+                and a.mater_id = #{p.materId}
+            </if>
+        </where>
+    </select>
+    <select id="getEnginSpecifications" resultType="com.ruoyi.zdsz.domain.vo.ZEnginSpecificationsVo">
+        select * from z_engin_specifications as ze where ze.del_flag = '0'
+        <if test="materId != null and materId != ''">
+            and ze.mater_id = #{materId}
+        </if>
+    </select>
+</mapper>

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

@@ -19,5 +19,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateTime" column="update_time"/>
     </resultMap>
 
+    <select id="getPageList" resultType="com.ruoyi.zdsz.domain.vo.ZEngineeringMaterialsResetsVo">
+        SELECT
+            ze.*,
+            zs.name as materialQualityName,
+            zm.name as estimatedSpecificationsName
+        FROM
+            z_engineering_materials_resets AS ze
+                LEFT JOIN z_engin_specifications AS zs ON zs.id = ze.estimated_specifications
+                AND zs.del_flag = '0'
+                LEFT JOIN z_engin_material_quality AS zm ON zm.id = ze.material_quality
+                AND zm.del_flag = '0'
+                LEFT JOIN z_area AS za ON za.id = ze.area_id
+                AND za.del_flag = '0'
+        WHERE
+            ze.del_flag = '0'
+        <if test="p.areaId != null  and p.areaId != ''">
+            and ze.area_id LIKE CONCAT('%',#{p.areaId},'%')
+        </if>
+    </select>
 
 </mapper>

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

@@ -19,28 +19,34 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </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
+        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,
+        (select d.name from z_unit d where d.id = a.unit_id) as unitName
+        from z_house a
         <where>
-            zh.del_flag = '0'
+            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 zh.area_id = #{p.areaId}
+                and a.area_id = #{p.areaId}
             </if>
             <if test="p.buildingId != null  and p.buildingId != ''">
-                and zh.building_id = #{p.buildingId}
+                and a.building_id = #{p.buildingId}
             </if>
             <if test="p.unitId != null  and p.unitId != ''">
-                and zh.unit_id = #{p.unitId}
+                and a.unit_id = #{p.unitId}
             </if>
         </where>
     </select>
 
+
+    <select id="selectListByunitId" resultType="com.ruoyi.zdsz.domain.vo.ZHouseVo">
+        select * from z_house as zh where zh.del_flag = '0'
+        <if test="unitId != null  and unitId != ''">
+            and zh.unit_id = #{unitId}
+        </if>
+    </select>
 </mapper>