审核添加状态

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

@@ -127,6 +127,39 @@ public class ZEngineeringInfoBo extends BaseEntity {
     @NotNull(message = "视频不能为空", groups = { AddGroup.class, EditGroup.class })
     public List<String> video;
 
+    public List<String> getBeforeBottom() {
+        return beforeBottom;
+    }
+
+    public void setBeforeBottom(List<String> beforeBottom) {
+        this.beforeBottom = beforeBottom;
+    }
+
+    public List<String> getLegBackfilling() {
+        return legBackfilling;
+    }
+
+    public void setLegBackfilling(List<String> legBackfilling) {
+        this.legBackfilling = legBackfilling;
+    }
+
+    public List<String> getInferiorSulcus() {
+        return inferiorSulcus;
+    }
+
+    public void setInferiorSulcus(List<String> inferiorSulcus) {
+        this.inferiorSulcus = inferiorSulcus;
+    }
+
+    @NotNull(message = "底腿开挖前不能为空", groups = { AddGroup.class, EditGroup.class })
+    public List<String> beforeBottom;
+    @Valid
+    @NotNull(message = "底腿回填不能为空", groups = { AddGroup.class, EditGroup.class })
+    public List<String> legBackfilling;
+    @Valid
+    @NotNull(message = "底腿下沟不能为空", groups = { AddGroup.class, EditGroup.class })
+    public List<String> inferiorSulcus;
+
     public List<String> getDuctalEpithelium() {
         return ductalEpithelium;
     }

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

@@ -36,6 +36,18 @@ public enum photoType {
     /**
      * 视频
      */
-    Video;
+    Video,
+    /**
+     * 底腿开挖前
+     */
+    beforeBottom,
+    /**
+     * 底腿回填
+     */
+    legBackfilling,
+    /**
+     * 底腿下沟
+     */
+    inferiorSulcus;
 
 }

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

@@ -88,6 +88,9 @@ public class ZEngineeringInfoServiceImpl implements IZEngineeringInfoService {
             zEngineeringInfoBo1.setWarningtTape(izEngiineeringPhotoService.queryTypeList(zEngineeringInfoBo1,photoType.warningtTape.name()));
             zEngineeringInfoBo1.setVideo(izEngiineeringPhotoService.queryTypeList(zEngineeringInfoBo1,photoType.Video.name()));
             zEngineeringInfoBo1.setTrenchProspect(izEngiineeringPhotoService.queryTypeList(zEngineeringInfoBo1,photoType.trenchProspect.name()));
+            zEngineeringInfoBo1.setBeforeBottom(izEngiineeringPhotoService.queryTypeList(zEngineeringInfoBo1,photoType.beforeBottom.name()));
+            zEngineeringInfoBo1.setLegBackfilling(izEngiineeringPhotoService.queryTypeList(zEngineeringInfoBo1,photoType.legBackfilling.name()));
+            zEngineeringInfoBo1.setInferiorSulcus(izEngiineeringPhotoService.queryTypeList(zEngineeringInfoBo1,photoType.inferiorSulcus.name()));
             // bo.setId(item.getId());
             ZEngineeringReviewBo zEngineeringReviewbo = izEngineeringReviewService.query(bo);
             zEngineeringInfoBo1.setzEngineeringReviewBo(zEngineeringReviewbo);
@@ -190,6 +193,48 @@ public class ZEngineeringInfoServiceImpl implements IZEngineeringInfoService {
 
 
         }
+        if (!ObjectUtils.isEmpty(bo.getBeforeBottom()))
+        {
+            bo.getBeforeBottom().forEach(item -> {
+                ZEngiineeringPhoto zEngiineeringPhoto = new ZEngiineeringPhoto();
+                zEngiineeringPhoto.setParentId(bo.getId());
+                zEngiineeringPhoto.setPicUrl(item);
+                zEngiineeringPhoto.setCreateTime(bo.getCreateTime());
+                zEngiineeringPhoto.setUpdateTime(new Date());
+                zEngiineeringPhoto.setType(photoType.beforeBottom.name().toString());
+                photoList.add(zEngiineeringPhoto);
+            });
+
+
+        }
+        if (!ObjectUtils.isEmpty(bo.getLegBackfilling()))
+        {
+            bo.getLegBackfilling().forEach(item -> {
+                ZEngiineeringPhoto zEngiineeringPhoto = new ZEngiineeringPhoto();
+                zEngiineeringPhoto.setParentId(bo.getId());
+                zEngiineeringPhoto.setPicUrl(item);
+                zEngiineeringPhoto.setCreateTime(bo.getCreateTime());
+                zEngiineeringPhoto.setUpdateTime(new Date());
+                zEngiineeringPhoto.setType(photoType.legBackfilling.name().toString());
+                photoList.add(zEngiineeringPhoto);
+            });
+
+
+        }
+        if (!ObjectUtils.isEmpty(bo.getInferiorSulcus()))
+        {
+            bo.getInferiorSulcus().forEach(item -> {
+                ZEngiineeringPhoto zEngiineeringPhoto = new ZEngiineeringPhoto();
+                zEngiineeringPhoto.setParentId(bo.getId());
+                zEngiineeringPhoto.setPicUrl(item);
+                zEngiineeringPhoto.setCreateTime(bo.getCreateTime());
+                zEngiineeringPhoto.setUpdateTime(new Date());
+                zEngiineeringPhoto.setType(photoType.inferiorSulcus.name().toString());
+                photoList.add(zEngiineeringPhoto);
+            });
+
+
+        }
         if (!ObjectUtils.isEmpty(bo.getVideo()))
         {
 

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

@@ -498,33 +498,11 @@ public class ZEngineeringNodeServiceImpl implements IZEngineeringNodeService {
                 {
                     nodeTypeList.add(ReviewList.get(0));
                 }
-//                    sysDictMap.get(item.getEnginType()+"_"+item.getEnginClassification()).stream().forEach(item3 -> {
-//                        Map<String,Object> map=new HashMap<>();
-////                        if (item2.getType().equals(item3.getDictValue()))
-////                        {
-//                                map.put("Type",item2.getType());
-//                                if (ReviewList.size()>0)
-//                                {
-//                                    nodeTypeList.add(ReviewList.get(0));
-//                                }
-//
-//                                map.put("state",ReviewList.size()>0?ReviewList.get(0).getReviewStatus():"0");
-////                        }
-////                        else {
-////                            map.put("Type",item3.getDictValue());
-////                            map.put("state","0");
-////                        }
-//                        stateList.add(map);
-//
-//                    });
-//                System.out.println(stateList);
-//                ReViewStateMap.set(stateList);;
 
             });
             List stateList=new ArrayList();
             sysDictMap.get(item.getEnginType()+"_"+item.getEnginClassification()).stream().forEach(item3 -> {
                 Map<String,Object> map=new HashMap<>();
-                System.out.println(nodeList.stream().filter(x->x.getType().equals(item3.getDictValue())).collect(Collectors.toList()));
                         if (nodeList.stream().anyMatch(x->x.getType().equals(item3.getDictValue())))
                         {
                 map.put("Type",item3.getDictValue());