Bläddra i källkod

1、架空在除锈刷油后增加焊接步骤(材料、规格、米数、照片)
2、庭院工程在下沟节点删除管道施工记录照片,增加管道施工记录节点
3、庭院工程节点增加调压柜(铭牌、底腿连接、石粉回填、防雷接地、地面硬化)、阀井(套管、内壁抹灰、防护网、八角)节点
4、底腿:沟上部分更改为安装完成放到回填下面

JX.Li 10 månader sedan
förälder
incheckning
17137a4fe9

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

@@ -930,6 +930,56 @@ public class ZEngineeringInfoServiceImpl implements IZEngineeringInfoService {
                 photoList2.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());
+                photoList2.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());
+                photoList2.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());
+                photoList2.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());
+                photoList2.add(zEngiineeringPhoto);
+            });
+        }
         if (!ObjectUtils.isEmpty(bo.getzEngiineeringPhotoBoListTwo()))
         {
             bo.getzEngiineeringPhotoBoListTwo().forEach(item -> {