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

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

@@ -373,4 +373,40 @@ public class ZEngineeringInfoBo extends BaseEntity {
      */
     private  ZEngineeringReviewBo zEngineeringReviewBo;
 
+    public List<String> cannula;
+    public List<String> wallPlaster;
+    public List<String> protectiveNet;
+    public List<String> starAnise;
+
+    public List<String> getStarAnise() {
+        return starAnise;
+    }
+
+    public void setStarAnise(List<String> starAnise) {
+        this.starAnise = starAnise;
+    }
+
+    public List<String> getProtectiveNet() {
+        return protectiveNet;
+    }
+
+    public void setProtectiveNet(List<String> protectiveNet) {
+        this.protectiveNet = protectiveNet;
+    }
+
+    public List<String> getWallPlaster() {
+        return wallPlaster;
+    }
+
+    public void setWallPlaster(List<String> wallPlaster) {
+        this.wallPlaster = wallPlaster;
+    }
+
+    public List<String> getCannula() {
+        return cannula;
+    }
+
+    public void setCannula(List<String> cannula) {
+        this.cannula = cannula;
+    }
 }

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

@@ -61,11 +61,11 @@ public enum photoType {
     onTheDitch,
 
     /**
-     市政施工-沟上施工 焊接
+     * 市政施工-沟上施工 焊接
      */
     welding,
     /**
-     *  市政施工-沟上施工 防腐
+     * 市政施工-沟上施工 防腐
      */
     aczoiling,
     /**
@@ -74,7 +74,7 @@ public enum photoType {
     piping,
     /**
      * 市政施工-沟下施工 警示带铺设
-      */
+     */
     warning,
     /**
      * 市政施工-沟下施工 回填
@@ -82,47 +82,31 @@ public enum photoType {
     backfilling,
 
     // 带气封堵施工-PE封堵 鞍型焊接
-    peSaddleWelding,
-    // 带气封堵施工-PE封堵 气密实验
-    peAirtightTest,
-    // 带气封堵施工-PE封堵 开孔
-    peHolesOpening,
-    // 带气封堵施工-PE封堵 清扫
-    peCleaning,
-    // 带气封堵施工-PE封堵 封堵
-    pePlugging,
-    // 带气封堵施工-PE封堵 碰口作业
-    peCollisionOperating,
-    // 带气封堵施工-PE封堵 恢复通气捡漏
-    peAirrecovering,
-    // 带气封堵施工-PE封堵 作业完成
+    peSaddleWelding, // 带气封堵施工-PE封堵 气密实验
+    peAirtightTest, // 带气封堵施工-PE封堵 开孔
+    peHolesOpening, // 带气封堵施工-PE封堵 清扫
+    peCleaning, // 带气封堵施工-PE封堵 封堵
+    pePlugging, // 带气封堵施工-PE封堵 碰口作业
+    peCollisionOperating, // 带气封堵施工-PE封堵 恢复通气捡漏
+    peAirrecovering, // 带气封堵施工-PE封堵 作业完成
     peHomeworkDone,
 
     // 带气封堵施工-钢管带气封堵 管道壁厚
-    ironPipelineThickness,
-    // 带气封堵施工-钢管带气封堵 焊接四通
-    iron4Welding,
-    // 带气封堵施工-钢管带气封堵 焊接旁通
-    ironBypassWelding,
-    // 带气封堵施工-钢管带气封堵 开孔
-    ironHolesOpening,
-    // 带气封堵施工-钢管带气封堵 封堵
-    ironCleaning,
-    // 带气封堵施工-钢管带气封堵 氮气吹扫
-    ironNitrogenPurging,
-    // 带气封堵施工-钢管带气封堵 管道置换
-    ironPipelineReplacing,
-    // 带气封堵施工-钢管带气封堵 下堵
-    ironLowerEndCap,
-    // 带气封堵施工-钢管带气封堵 作业完成
-    ironHomeworkDone,
-    // 带气封堵施工-钢管带气封堵 四通防腐
+    ironPipelineThickness, // 带气封堵施工-钢管带气封堵 焊接四通
+    iron4Welding, // 带气封堵施工-钢管带气封堵 焊接旁通
+    ironBypassWelding, // 带气封堵施工-钢管带气封堵 开孔
+    ironHolesOpening, // 带气封堵施工-钢管带气封堵 封堵
+    ironCleaning, // 带气封堵施工-钢管带气封堵 氮气吹扫
+    ironNitrogenPurging, // 带气封堵施工-钢管带气封堵 管道置换
+    ironPipelineReplacing, // 带气封堵施工-钢管带气封堵 下堵
+    ironLowerEndCap, // 带气封堵施工-钢管带气封堵 作业完成
+    ironHomeworkDone, // 带气封堵施工-钢管带气封堵 四通防腐
     iron4Aczoiling,
 
     /**
      * 调压箱名牌
-      */
-     boxBrand,
+     */
+    boxBrand,
     /**
      * 调压箱防雷接地
      */
@@ -133,12 +117,7 @@ public enum photoType {
     BottomLeg,
     /**
      * 调压箱护栏及地面硬化（远景）
-     *
      */
-    GroundHardening,
-
-    beforeBack,
-    afterBack,
-    warnBack,
+    GroundHardening, beforeBack, afterBack, warnBack, cannula, wallPlaster, protectiveNet, starAnise,
 
 }

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

@@ -132,6 +132,10 @@ public class ZEngineeringInfoServiceImpl implements IZEngineeringInfoService {
             zEngineeringInfoBo1.setIronLowerEndCap(izEngiineeringPhotoService.queryTypeList(zEngineeringInfoBo1,photoType.ironLowerEndCap.name()));
             zEngineeringInfoBo1.setIronHomeworkDone(izEngiineeringPhotoService.queryTypeList(zEngineeringInfoBo1,photoType.ironHomeworkDone.name()));
             zEngineeringInfoBo1.setIron4Aczoiling(izEngiineeringPhotoService.queryTypeList(zEngineeringInfoBo1,photoType.iron4Aczoiling.name()));
+            zEngineeringInfoBo1.setCannula(izEngiineeringPhotoService.queryTypeList(zEngineeringInfoBo1,photoType.cannula.name()));
+            zEngineeringInfoBo1.setWallPlaster(izEngiineeringPhotoService.queryTypeList(zEngineeringInfoBo1,photoType.wallPlaster.name()));
+            zEngineeringInfoBo1.setProtectiveNet(izEngiineeringPhotoService.queryTypeList(zEngineeringInfoBo1,photoType.protectiveNet.name()));
+            zEngineeringInfoBo1.setStarAnise(izEngiineeringPhotoService.queryTypeList(zEngineeringInfoBo1,photoType.starAnise.name()));
             // 市政施工-查询 end
 
             // bo.setId(item.getId());
@@ -361,6 +365,57 @@ public class ZEngineeringInfoServiceImpl implements IZEngineeringInfoService {
                 photoList.add(zEngiineeringPhoto);
             });
         }
+
+        if (!ObjectUtils.isEmpty(bo.getCannula()))
+        {
+            bo.getCannula().forEach(item -> {
+                ZEngiineeringPhoto zEngiineeringPhoto = new ZEngiineeringPhoto();
+                zEngiineeringPhoto.setParentId(bo.getId());
+                zEngiineeringPhoto.setPicUrl(item);
+                zEngiineeringPhoto.setCreateTime(bo.getCreateTime());
+                zEngiineeringPhoto.setUpdateTime(new Date());
+                zEngiineeringPhoto.setType(photoType.cannula.name().toString());
+                photoList.add(zEngiineeringPhoto);
+            });
+        }
+
+        if (!ObjectUtils.isEmpty(bo.getWallPlaster()))
+        {
+            bo.getWallPlaster().forEach(item -> {
+                ZEngiineeringPhoto zEngiineeringPhoto = new ZEngiineeringPhoto();
+                zEngiineeringPhoto.setParentId(bo.getId());
+                zEngiineeringPhoto.setPicUrl(item);
+                zEngiineeringPhoto.setCreateTime(bo.getCreateTime());
+                zEngiineeringPhoto.setUpdateTime(new Date());
+                zEngiineeringPhoto.setType(photoType.wallPlaster.name().toString());
+                photoList.add(zEngiineeringPhoto);
+            });
+        }
+
+        if (!ObjectUtils.isEmpty(bo.getProtectiveNet()))
+        {
+            bo.getProtectiveNet().forEach(item -> {
+                ZEngiineeringPhoto zEngiineeringPhoto = new ZEngiineeringPhoto();
+                zEngiineeringPhoto.setParentId(bo.getId());
+                zEngiineeringPhoto.setPicUrl(item);
+                zEngiineeringPhoto.setCreateTime(bo.getCreateTime());
+                zEngiineeringPhoto.setUpdateTime(new Date());
+                zEngiineeringPhoto.setType(photoType.protectiveNet.name().toString());
+                photoList.add(zEngiineeringPhoto);
+            });
+        }
+        if (!ObjectUtils.isEmpty(bo.getStarAnise()))
+        {
+            bo.getStarAnise().forEach(item -> {
+                ZEngiineeringPhoto zEngiineeringPhoto = new ZEngiineeringPhoto();
+                zEngiineeringPhoto.setParentId(bo.getId());
+                zEngiineeringPhoto.setPicUrl(item);
+                zEngiineeringPhoto.setCreateTime(bo.getCreateTime());
+                zEngiineeringPhoto.setUpdateTime(new Date());
+                zEngiineeringPhoto.setType(photoType.starAnise.name().toString());
+                photoList.add(zEngiineeringPhoto);
+            });
+        }
         if (!ObjectUtils.isEmpty(bo.getLightning()))
         {
             bo.getLightning().forEach(item -> {
@@ -372,8 +427,6 @@ public class ZEngineeringInfoServiceImpl implements IZEngineeringInfoService {
                 zEngiineeringPhoto.setType(photoType.Lightning.name().toString());
                 photoList.add(zEngiineeringPhoto);
             });
-
-
         }
         if (!ObjectUtils.isEmpty(bo.getBottomLeg()))
         {