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

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

@@ -931,6 +931,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 -> {