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

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

@@ -110,6 +110,10 @@ public class ZEnginMaterialQualityController extends BaseController {
     @DeleteMapping("/{ids}")
     public R<Void> remove(@NotEmpty(message = "主键不能为空")
                           @PathVariable String[] ids) {
-        return toAjax(iZEnginMaterialQualityService.deleteWithValidByIds(Arrays.asList(ids), true));
+        Boolean b = iZEnginMaterialQualityService.deleteWithValidByIds(Arrays.asList(ids), true);
+        if (!b){
+            return R.fail("材质已绑定规格,不能删除");
+        }
+        return R.ok("删除成功");
     }
 }

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

@@ -109,6 +109,10 @@ public class ZEnginSpecificationsController extends BaseController {
     @DeleteMapping("/{ids}")
     public R<Void> remove(@NotEmpty(message = "主键不能为空")
                           @PathVariable String[] ids) {
-        return toAjax(iZEnginSpecificationsService.deleteWithValidByIds(Arrays.asList(ids), true));
+        Boolean b = iZEnginSpecificationsService.deleteWithValidByIds(Arrays.asList(ids), true);
+        if (!b){
+            return R.fail("规格已绑定用料预设,不能删除");
+        }
+        return R.ok("删除成功");
     }
 }

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

@@ -42,7 +42,7 @@ public class ZEngineeringMaterialsResets extends BaseEntity {
     /**
      * 预估尺寸
      */
-    private Long estimatedSize;
+    private Double estimatedSize;
     /**
      * 工程周期
      */

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

@@ -49,7 +49,7 @@ public class ZEngineeringMaterialsResetsBo extends BaseEntity {
      * 预估尺寸
      */
     @NotNull(message = "预估尺寸不能为空", groups = { AddGroup.class, EditGroup.class })
-    private Long estimatedSize;
+    private Double estimatedSize;
 
     /**
      * 工程周期

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

@@ -24,7 +24,7 @@ public class ZEnginMaterialQualityVo implements Serializable {
     /**
      * 
      */
-    @ExcelProperty(value = "")
+//    @ExcelProperty(value = "")
     private String id;
 
     /**
@@ -40,4 +40,7 @@ public class ZEnginMaterialQualityVo implements Serializable {
     private String name;
 
 
+    @ExcelProperty(value = "材质规格")
+    private String specificationsName;
+
 }

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

@@ -47,7 +47,7 @@ public class ZEngineeringMaterialsResetsVo implements Serializable {
      * 预估尺寸
      */
     @ExcelProperty(value = "预估尺寸")
-    private Long estimatedSize;
+    private Double estimatedSize;
 
     /**
      * 工程周期

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

@@ -300,6 +300,9 @@ public class ZAreaServiceImpl implements IZAreaService {
         ZArea add = BeanUtil.toBean(bo, ZArea.class);
         validEntityBeforeSave(add);
         add.setReleaseIs("001");
+        if (!ObjectUtils.isEmpty(baseMapper.getByName(add.getName()))) {
+            return false;
+        }
         boolean flag = baseMapper.insert(add) > 0;
         if (flag) {
             bo.setId(add.getId());

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

@@ -17,6 +17,7 @@ import com.ruoyi.zdsz.domain.vo.ZBuildingVo;
 import com.ruoyi.zdsz.domain.ZBuilding;
 import com.ruoyi.zdsz.mapper.ZBuildingMapper;
 import com.ruoyi.zdsz.service.IZBuildingService;
+import org.springframework.util.ObjectUtils;
 
 import java.util.Collections;
 import java.util.List;
@@ -94,6 +95,9 @@ public class ZBuildingServiceImpl implements IZBuildingService {
     public Boolean insertByBo(ZBuildingBo bo) {
         ZBuilding add = BeanUtil.toBean(bo, ZBuilding.class);
         validEntityBeforeSave(add);
+        if (!ObjectUtils.isEmpty(baseMapper.getByName(add.getName(), add.getAreaId()))){
+            return false;
+        }
         boolean flag = baseMapper.insert(add) > 0;
         if (flag) {
             bo.setId(add.getId());

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

@@ -1,14 +1,21 @@
 package com.ruoyi.zdsz.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ObjectUtil;
 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.ZEnginSpecifications;
 import com.ruoyi.zdsz.domain.ZEngineeringMaterialsResets;
+import com.ruoyi.zdsz.domain.bo.ZEnginSpecificationsBo;
+import com.ruoyi.zdsz.domain.vo.ZEnginSpecificationsVo;
+import com.ruoyi.zdsz.mapper.ZEnginSpecificationsMapper;
+import com.ruoyi.zdsz.service.IZEnginSpecificationsService;
 import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.zdsz.domain.bo.ZEnginMaterialQualityBo;
 import com.ruoyi.zdsz.domain.vo.ZEnginMaterialQualityVo;
@@ -16,6 +23,7 @@ import com.ruoyi.zdsz.domain.ZEnginMaterialQuality;
 import com.ruoyi.zdsz.mapper.ZEnginMaterialQualityMapper;
 import com.ruoyi.zdsz.service.IZEnginMaterialQualityService;
 
+import javax.annotation.Resource;
 import java.util.List;
 import java.util.Map;
 import java.util.Collection;
@@ -29,14 +37,15 @@ import java.util.Collection;
 @RequiredArgsConstructor
 @Service
 public class ZEnginMaterialQualityServiceImpl implements IZEnginMaterialQualityService {
-
+    @Resource
+    private ZEnginSpecificationsMapper specificationsMapper;
     private final ZEnginMaterialQualityMapper baseMapper;
 
     /**
      * 查询工程材质
      */
     @Override
-    public ZEnginMaterialQualityVo queryById(String id){
+    public ZEnginMaterialQualityVo queryById(String id) {
         return baseMapper.selectVoById(id);
     }
 
@@ -50,13 +59,30 @@ public class ZEnginMaterialQualityServiceImpl implements IZEnginMaterialQualityS
         return TableDataInfo.build(result);
     }
 
+    @Autowired
+    private IZEnginSpecificationsService service;
+
     /**
      * 查询工程材质列表
      */
     @Override
     public List<ZEnginMaterialQualityVo> queryList(ZEnginMaterialQualityBo bo) {
         LambdaQueryWrapper<ZEnginMaterialQuality> lqw = buildQueryWrapper(bo);
-        return baseMapper.selectVoList(lqw);
+        List<ZEnginMaterialQualityVo> vos = baseMapper.selectVoList(lqw);
+        vos.forEach(item -> {
+            ZEnginSpecificationsBo zEnginSpecificationsBo = new ZEnginSpecificationsBo();
+            zEnginSpecificationsBo.setMaterId(item.getId());
+            List<ZEnginSpecificationsVo> zEnginSpecificationsVos = service.queryList(zEnginSpecificationsBo);
+            StringBuilder it = new StringBuilder();
+            for (int i = 0; i < zEnginSpecificationsVos.size(); i++) {
+                if (i == 0)
+                    it = new StringBuilder(zEnginSpecificationsVos.get(i).getName());
+                else
+                    it.append(",").append(zEnginSpecificationsVos.get(i).getName());
+            }
+            item.setSpecificationsName(it.toString());
+        });
+        return vos;
     }
 
     private LambdaQueryWrapper<ZEnginMaterialQuality> buildQueryWrapper(ZEnginMaterialQualityBo bo) {
@@ -95,7 +121,7 @@ public class ZEnginMaterialQualityServiceImpl implements IZEnginMaterialQualityS
     /**
      * 保存前的数据校验
      */
-    private void validEntityBeforeSave(ZEnginMaterialQuality entity){
+    private void validEntityBeforeSave(ZEnginMaterialQuality entity) {
         //TODO 做一些数据校验,如唯一约束
     }
 
@@ -104,8 +130,14 @@ public class ZEnginMaterialQualityServiceImpl implements IZEnginMaterialQualityS
      */
     @Override
     public Boolean deleteWithValidByIds(Collection<String> ids, Boolean isValid) {
-        if(isValid){
-            //TODO 做一些业务上的校验,判断是否需要校验
+        if (isValid) {
+            if (!ObjectUtil.isEmpty(ids)) {
+                LambdaQueryWrapper<ZEnginSpecifications> lqw = Wrappers.lambdaQuery();
+                Long count = specificationsMapper.selectCount(lqw.in(ZEnginSpecifications::getMaterId, ids));
+                if (count > 0) {
+                    return false;
+                }
+            }
         }
         return baseMapper.deleteBatchIds(ids) > 0;
     }

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

@@ -1,14 +1,17 @@
 package com.ruoyi.zdsz.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ObjectUtil;
 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.ZEngineeringMaterialsResets;
 import com.ruoyi.zdsz.domain.bo.ZBuildingBo;
 import com.ruoyi.zdsz.domain.vo.ZBuildingVo;
+import com.ruoyi.zdsz.mapper.ZEngineeringMaterialsResetsMapper;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import com.ruoyi.zdsz.domain.bo.ZEnginSpecificationsBo;
@@ -17,9 +20,11 @@ import com.ruoyi.zdsz.domain.ZEnginSpecifications;
 import com.ruoyi.zdsz.mapper.ZEnginSpecificationsMapper;
 import com.ruoyi.zdsz.service.IZEnginSpecificationsService;
 
+import javax.annotation.Resource;
 import java.util.List;
 import java.util.Map;
 import java.util.Collection;
+import java.util.stream.Collectors;
 
 /**
  * 工程材质规格Service业务层处理
@@ -32,6 +37,8 @@ import java.util.Collection;
 public class ZEnginSpecificationsServiceImpl implements IZEnginSpecificationsService {
 
     private final ZEnginSpecificationsMapper baseMapper;
+    @Resource
+    private ZEngineeringMaterialsResetsMapper materialsResetsMapper;
 
     /**
      * 查询工程材质规格
@@ -105,8 +112,14 @@ public class ZEnginSpecificationsServiceImpl implements IZEnginSpecificationsSer
      */
     @Override
     public Boolean deleteWithValidByIds(Collection<String> ids, Boolean isValid) {
-        if(isValid){
-            //TODO 做一些业务上的校验,判断是否需要校验
+        if (isValid) {
+            if (!ObjectUtil.isEmpty(ids)) {
+                    LambdaQueryWrapper<ZEngineeringMaterialsResets> lqw1 = Wrappers.lambdaQuery();
+                    Long count = materialsResetsMapper.selectCount(lqw1.in(ZEngineeringMaterialsResets::getEstimatedSpecifications,ids));
+                    if (count > 0) {
+                        return false;
+                    }
+            }
         }
         return baseMapper.deleteBatchIds(ids) > 0;
     }

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

@@ -148,9 +148,9 @@ public class ZEngineeringCivilServiceImpl implements IZEngineeringCivilService {
         LambdaQueryWrapper<ZEngineeringCivil> lqw = Wrappers.lambdaQuery();
         lqw.eq(StringUtils.isNotBlank(bo.getDistrict()), ZEngineeringCivil::getDistrict, bo.getDistrict());
         lqw.eq(StringUtils.isNotBlank(bo.getAreaId()), ZEngineeringCivil::getAreaId, bo.getAreaId());
-        lqw.eq(ZEngineeringCivil::getBuildingId, bo.getBuildingId());
-        lqw.eq(ZEngineeringCivil::getUnitId, bo.getUnitId());
-        lqw.eq(ZEngineeringCivil::getHouseId, bo.getHouseId());
+        lqw.eq(StringUtils.isNotBlank(bo.getBuildingId()), ZEngineeringCivil::getBuildingId, bo.getBuildingId());
+        lqw.eq(StringUtils.isNotBlank(bo.getUnitId()), ZEngineeringCivil::getUnitId, bo.getUnitId());
+        lqw.eq(StringUtils.isNotBlank(bo.getHouseId()), ZEngineeringCivil::getHouseId, bo.getHouseId());
         lqw.orderByDesc(ZEngineeringCivil::getCreateTime);
         lqw.eq(StringUtils.isNotBlank(bo.getEnginType()), ZEngineeringCivil::getEnginType, bo.getEnginType());
         lqw.eq(StringUtils.isNotBlank(bo.getEnginClassification()), ZEngineeringCivil::getEnginClassification, bo.getEnginClassification());

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

@@ -15,6 +15,7 @@ import com.ruoyi.zdsz.domain.vo.ZHouseVo;
 import com.ruoyi.zdsz.domain.ZHouse;
 import com.ruoyi.zdsz.mapper.ZHouseMapper;
 import com.ruoyi.zdsz.service.IZHouseService;
+import org.springframework.util.ObjectUtils;
 
 import javax.annotation.Resource;
 import java.util.List;
@@ -82,6 +83,10 @@ public class ZHouseServiceImpl implements IZHouseService {
     public Boolean insertByBo(ZHouseBo bo) {
         ZHouse add = BeanUtil.toBean(bo, ZHouse.class);
         validEntityBeforeSave(add);
+        ZHouse byName = baseMapper.getByName(add.getName(), add.getUnitId());
+        if (!ObjectUtils.isEmpty(byName)){
+            return false;
+        }
         boolean flag = baseMapper.insert(add) > 0;
         if (flag) {
             bo.setId(add.getId());

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

@@ -17,6 +17,7 @@ import com.ruoyi.zdsz.domain.vo.ZUnitVo;
 import com.ruoyi.zdsz.domain.ZUnit;
 import com.ruoyi.zdsz.mapper.ZUnitMapper;
 import com.ruoyi.zdsz.service.IZUnitService;
+import org.springframework.util.ObjectUtils;
 
 import java.util.List;
 import java.util.Map;
@@ -83,6 +84,9 @@ public class ZUnitServiceImpl implements IZUnitService {
     public Boolean insertByBo(ZUnitBo bo) {
         ZUnit add = BeanUtil.toBean(bo, ZUnit.class);
         validEntityBeforeSave(add);
+        if (!ObjectUtils.isEmpty(baseMapper.getByName(add.getName(), add.getBuildingId()))){
+            return false;
+        }
         boolean flag = baseMapper.insert(add) > 0;
         if (flag) {
             bo.setId(add.getId());

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

@@ -38,6 +38,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="getPageList" resultType="com.ruoyi.zdsz.domain.vo.ZBuildingVo">
         select a.id as id,
         a.name as name,
+        a.remark as remark,
         (select b.name from z_area b where b.id = a.area_id) as areaName
         from z_building a
         <where>

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

@@ -30,6 +30,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="getPageList" resultType="com.ruoyi.zdsz.domain.vo.ZHouseVo">
         select a.id as id,
         a.name as name,
+        a.remark as remark,
         (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

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

@@ -39,6 +39,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="getPageList" resultType="com.ruoyi.zdsz.domain.vo.ZUnitVo">
         select a.id as id,
         a.name as name,
+        a.remark as remark,
         (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