民用添加调压柜

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

@@ -146,6 +146,48 @@ public class ZEngineeringInfoBo extends BaseEntity {
     // 市政施工-沟下施工 回填
     public List<String> backfilling;
 
+    public List<String> getBoxBrand() {
+        return boxBrand;
+    }
+
+    public void setBoxBrand(List<String> boxBrand) {
+        this.boxBrand = boxBrand;
+    }
+
+    public List<String> getLightning() {
+        return Lightning;
+    }
+
+    public void setLightning(List<String> lightning) {
+        Lightning = lightning;
+    }
+
+    public List<String> getBottomLeg() {
+        return BottomLeg;
+    }
+
+    public void setBottomLeg(List<String> bottomLeg) {
+        BottomLeg = bottomLeg;
+    }
+
+    public List<String> getGroundHardening() {
+        return GroundHardening;
+    }
+
+    public void setGroundHardening(List<String> groundHardening) {
+        GroundHardening = groundHardening;
+    }
+
+    // 调压箱名牌
+    public List<String> boxBrand;
+    //调压箱防雷接地
+    public List<String> Lightning;
+    //调压箱底腿连接
+    public List<String> BottomLeg;
+    //调压箱护栏及地面硬化（远景）
+    public List<String> GroundHardening;
+
+
     public List<String> getBeforeBottom() {
         return beforeBottom;
     }

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/enums/photoType.java

@@ -60,15 +60,43 @@ public enum photoType {
      */
     onTheDitch,
 
-    // 市政施工-沟上施工 焊接
+    /**
+     市政施工-沟上施工 焊接
+     */
     welding,
-    // 市政施工-沟上施工 防腐
+    /**
+     *  市政施工-沟上施工 防腐
+     */
     aczoiling,
-    // 市政施工-沟下施工 管道下沟
+    /**
+     * 市政施工-沟下施工 管道下沟
+     */
     piping,
-    // 市政施工-沟下施工 警示带铺设
+    /**
+     * 市政施工-沟下施工 警示带铺设
+      */
+
     warning,
-    // 市政施工-沟下施工 回填
-    backfilling
+    /**
+     * 市政施工-沟下施工 回填
+     */
+    backfilling,
+    /**
+     * 调压箱名牌
+      */
+     boxBrand,
+    /**
+     * 调压箱防雷接地
+     */
+    Lightning,
+    /**
+     * 调压箱底腿连接
+     */
+    BottomLeg,
+    /**
+     * 调压箱护栏及地面硬化（远景）
+     *
+     */
+    GroundHardening;
 
 }

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

@@ -91,6 +91,10 @@ public class ZEngineeringInfoServiceImpl implements IZEngineeringInfoService {
             List<ZEngineeringMaterialBo> zEngineeringMaterialBo = izEngineeringMaterialService.query(zEngineeringInfoBo1);
             zEngineeringInfoBo1.setzEngiineeringPhotoBoList(photoList);
             zEngineeringInfoBo1.setzEngineeringMaterialBo(zEngineeringMaterialBo);
+            zEngineeringInfoBo1.setBoxBrand(izEngiineeringPhotoService.queryTypeList(zEngineeringInfoBo1,photoType.boxBrand.name()));
+            zEngineeringInfoBo1.setLightning(izEngiineeringPhotoService.queryTypeList(zEngineeringInfoBo1,photoType.Lightning.name()));
+            zEngineeringInfoBo1.setBottomLeg(izEngiineeringPhotoService.queryTypeList(zEngineeringInfoBo1,photoType.BottomLeg.name()));
+            zEngineeringInfoBo1.setGroundHardening(izEngiineeringPhotoService.queryTypeList(zEngineeringInfoBo1,photoType.GroundHardening.name()));
             zEngineeringInfoBo1.setPhotosAfter(izEngiineeringPhotoService.queryTypeList(zEngineeringInfoBo1,photoType.photosAfter.name()));
             zEngineeringInfoBo1.setStonePowder(izEngiineeringPhotoService.queryTypeList(zEngineeringInfoBo1,photoType.stonePowder.name()));
             zEngineeringInfoBo1.setDuctalEpithelium(izEngiineeringPhotoService.queryTypeList(zEngineeringInfoBo1,photoType.ductalEpithelium.name()));
@@ -149,6 +153,10 @@ public class ZEngineeringInfoServiceImpl implements IZEngineeringInfoService {
             List<ZEngineeringMaterialBo> zEngineeringMaterialBo = izEngineeringMaterialService.query(zEngineeringInfoBo1);
             zEngineeringInfoBo1.setzEngiineeringPhotoBoList(photoList);
             zEngineeringInfoBo1.setzEngineeringMaterialBo(zEngineeringMaterialBo);
+            zEngineeringInfoBo1.setBoxBrand(izEngiineeringPhotoService.queryTypeList(zEngineeringInfoBo1,photoType.boxBrand.name()));
+            zEngineeringInfoBo1.setLightning(izEngiineeringPhotoService.queryTypeList(zEngineeringInfoBo1,photoType.Lightning.name()));
+            zEngineeringInfoBo1.setBottomLeg(izEngiineeringPhotoService.queryTypeList(zEngineeringInfoBo1,photoType.BottomLeg.name()));
+            zEngineeringInfoBo1.setGroundHardening(izEngiineeringPhotoService.queryTypeList(zEngineeringInfoBo1,photoType.GroundHardening.name()));
             zEngineeringInfoBo1.setPhotosAfter(izEngiineeringPhotoService.queryTypeList(zEngineeringInfoBo1,photoType.photosAfter.name()));
             zEngineeringInfoBo1.setStonePowder(izEngiineeringPhotoService.queryTypeList(zEngineeringInfoBo1,photoType.stonePowder.name()));
             zEngineeringInfoBo1.setDuctalEpithelium(izEngiineeringPhotoService.queryTypeList(zEngineeringInfoBo1,photoType.ductalEpithelium.name()));
@@ -262,6 +270,62 @@ public class ZEngineeringInfoServiceImpl implements IZEngineeringInfoService {
 
 
         }
+        if (!ObjectUtils.isEmpty(bo.getBoxBrand()))
+        {
+            bo.getBoxBrand().forEach(item -> {
+                ZEngiineeringPhoto zEngiineeringPhoto = new ZEngiineeringPhoto();
+                zEngiineeringPhoto.setParentId(bo.getId());
+                zEngiineeringPhoto.setPicUrl(item);
+                zEngiineeringPhoto.setCreateTime(bo.getCreateTime());
+                zEngiineeringPhoto.setUpdateTime(new Date());
+                zEngiineeringPhoto.setType(photoType.boxBrand.name().toString());
+                photoList.add(zEngiineeringPhoto);
+            });
+
+
+        }
+        if (!ObjectUtils.isEmpty(bo.getLightning()))
+        {
+            bo.getLightning().forEach(item -> {
+                ZEngiineeringPhoto zEngiineeringPhoto = new ZEngiineeringPhoto();
+                zEngiineeringPhoto.setParentId(bo.getId());
+                zEngiineeringPhoto.setPicUrl(item);
+                zEngiineeringPhoto.setCreateTime(bo.getCreateTime());
+                zEngiineeringPhoto.setUpdateTime(new Date());
+                zEngiineeringPhoto.setType(photoType.Lightning.name().toString());
+                photoList.add(zEngiineeringPhoto);
+            });
+
+
+        }
+        if (!ObjectUtils.isEmpty(bo.getBottomLeg()))
+        {
+            bo.getBottomLeg().forEach(item -> {
+                ZEngiineeringPhoto zEngiineeringPhoto = new ZEngiineeringPhoto();
+                zEngiineeringPhoto.setParentId(bo.getId());
+                zEngiineeringPhoto.setPicUrl(item);
+                zEngiineeringPhoto.setCreateTime(bo.getCreateTime());
+                zEngiineeringPhoto.setUpdateTime(new Date());
+                zEngiineeringPhoto.setType(photoType.BottomLeg.name().toString());
+                photoList.add(zEngiineeringPhoto);
+            });
+
+
+        }
+        if (!ObjectUtils.isEmpty(bo.getGroundHardening()))
+        {
+            bo.getGroundHardening().forEach(item -> {
+                ZEngiineeringPhoto zEngiineeringPhoto = new ZEngiineeringPhoto();
+                zEngiineeringPhoto.setParentId(bo.getId());
+                zEngiineeringPhoto.setPicUrl(item);
+                zEngiineeringPhoto.setCreateTime(bo.getCreateTime());
+                zEngiineeringPhoto.setUpdateTime(new Date());
+                zEngiineeringPhoto.setType(photoType.GroundHardening.name().toString());
+                photoList.add(zEngiineeringPhoto);
+            });
+
+
+        }
         if (!ObjectUtils.isEmpty(bo.getOnTheDitch()))
         {
             bo.getOnTheDitch().forEach(item -> {
@@ -535,6 +599,62 @@ public class ZEngineeringInfoServiceImpl implements IZEngineeringInfoService {
             });
 
         }
+        if (!ObjectUtils.isEmpty(bo.getBoxBrand()))
+        {
+            bo.getBoxBrand().forEach(item -> {
+                ZEngiineeringPhoto zEngiineeringPhoto = new ZEngiineeringPhoto();
+                zEngiineeringPhoto.setParentId(bo.getId());
+                zEngiineeringPhoto.setPicUrl(item);
+                zEngiineeringPhoto.setCreateTime(bo.getCreateTime());
+                zEngiineeringPhoto.setUpdateTime(new Date());
+                zEngiineeringPhoto.setType(photoType.boxBrand.name().toString());
+                photoList2.add(zEngiineeringPhoto);
+            });
+
+
+        }
+        if (!ObjectUtils.isEmpty(bo.getLightning()))
+        {
+            bo.getLightning().forEach(item -> {
+                ZEngiineeringPhoto zEngiineeringPhoto = new ZEngiineeringPhoto();
+                zEngiineeringPhoto.setParentId(bo.getId());
+                zEngiineeringPhoto.setPicUrl(item);
+                zEngiineeringPhoto.setCreateTime(bo.getCreateTime());
+                zEngiineeringPhoto.setUpdateTime(new Date());
+                zEngiineeringPhoto.setType(photoType.Lightning.name().toString());
+                photoList2.add(zEngiineeringPhoto);
+            });
+
+
+        }
+        if (!ObjectUtils.isEmpty(bo.getBottomLeg()))
+        {
+            bo.getBottomLeg().forEach(item -> {
+                ZEngiineeringPhoto zEngiineeringPhoto = new ZEngiineeringPhoto();
+                zEngiineeringPhoto.setParentId(bo.getId());
+                zEngiineeringPhoto.setPicUrl(item);
+                zEngiineeringPhoto.setCreateTime(bo.getCreateTime());
+                zEngiineeringPhoto.setUpdateTime(new Date());
+                zEngiineeringPhoto.setType(photoType.BottomLeg.name().toString());
+                photoList2.add(zEngiineeringPhoto);
+            });
+
+
+        }
+        if (!ObjectUtils.isEmpty(bo.getGroundHardening()))
+        {
+            bo.getGroundHardening().forEach(item -> {
+                ZEngiineeringPhoto zEngiineeringPhoto = new ZEngiineeringPhoto();
+                zEngiineeringPhoto.setParentId(bo.getId());
+                zEngiineeringPhoto.setPicUrl(item);
+                zEngiineeringPhoto.setCreateTime(bo.getCreateTime());
+                zEngiineeringPhoto.setUpdateTime(new Date());
+                zEngiineeringPhoto.setType(photoType.GroundHardening.name().toString());
+                photoList2.add(zEngiineeringPhoto);
+            });
+
+
+        }
         if (!ObjectUtils.isEmpty(bo.getOnTheDitch()))
         {
             bo.getOnTheDitch().forEach(item -> {