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

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

@@ -47,6 +47,13 @@ public class ZEnginMaterialQualityController extends BaseController {
     public TableDataInfo<ZEnginMaterialQualityVo> list(ZEnginMaterialQualityBo bo, PageQuery pageQuery) {
         return iZEnginMaterialQualityService.queryPageList(bo, pageQuery);
     }
+    /**
+     * 工程材质下拉
+     */
+    @GetMapping("/getEnginMaterialQualityList")
+    public R getEnginMaterialQualityList() {
+        return R.ok(iZEnginMaterialQualityService.getEnginMaterialQualityList());
+    }
 
     /**
      * 导出工程材质列表

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

@@ -47,7 +47,13 @@ public class ZEnginSpecificationsController extends BaseController {
     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));
+    }
     /**
      * 导出工程材质规格列表
      */

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/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;
 
     /**
@@ -62,6 +60,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/ZEnginMaterialQualityMapper.java

@@ -4,6 +4,8 @@ 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接口
  *
@@ -12,4 +14,5 @@ import com.ruoyi.common.core.mapper.BaseMapperPlus;
  */
 public interface ZEnginMaterialQualityMapper extends BaseMapperPlus<ZEnginMaterialQualityMapper, ZEnginMaterialQuality, ZEnginMaterialQualityVo> {
 
+    List<ZEnginMaterialQualityVo> getEnginMaterialQualityList();
 }

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

@@ -9,6 +9,8 @@ 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接口
  *
@@ -19,4 +21,5 @@ public interface ZEnginSpecificationsMapper extends BaseMapperPlus<ZEnginSpecifi
     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/service/IZEnginMaterialQualityService.java

@@ -1,6 +1,7 @@
 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;
@@ -46,4 +47,6 @@ public interface IZEnginMaterialQualityService {
      * 校验并批量删除工程材质信息
      */
     Boolean deleteWithValidByIds(Collection<String> ids, Boolean isValid);
+
+    List<ZEnginMaterialQualityVo> getEnginMaterialQualityList();
 }

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

@@ -46,4 +46,6 @@ public interface IZEnginSpecificationsService {
      * 校验并批量删除工程材质规格信息
      */
     Boolean deleteWithValidByIds(Collection<String> ids, Boolean isValid);
+
+    List<ZEnginSpecificationsVo> getEnginSpecifications(String materId);
 }

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

@@ -107,4 +107,9 @@ public class ZEnginMaterialQualityServiceImpl implements IZEnginMaterialQualityS
         }
         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

@@ -109,4 +109,9 @@ public class ZEnginSpecificationsServiceImpl implements IZEnginSpecificationsSer
         }
         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/resources/mapper/zdsz/ZEnginMaterialQualityMapper.xml

@@ -16,4 +16,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </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

@@ -44,4 +44,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             </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/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>