基建工程新增修改

基建工程审核

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

@@ -11,6 +11,8 @@ import javax.validation.constraints.*;
 import java.util.Date;
 
 import java.util.Date;
+import java.util.List;
+
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.core.domain.BaseEntity;
 
@@ -90,5 +92,13 @@ public class ZEngineeringInfrastructureBo extends BaseEntity {
         this.zEngineeringNodeBo = zEngineeringNodeBo;
     }
 
+    private List<ZEngineeringNodeBo> zEngineeringNodeBoList;
+
+    public List<ZEngineeringNodeBo> getzEngineeringNodeBoList() {
+        return zEngineeringNodeBoList;
+    }
 
+    public void setzEngineeringNodeBoList(List<ZEngineeringNodeBo> zEngineeringNodeBoList) {
+        this.zEngineeringNodeBoList = zEngineeringNodeBoList;
+    }
 }

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

@@ -43,6 +43,12 @@ public class ZEngineeringNodeBo extends BaseEntity {
     private String type;
 
     /**
+     * 审核状态(未审核、未通过-0 审核通过-1 无需审核-null)
+     */
+//    @NotBlank(message = "审核状态不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String reviewStatus;
+
+    /**
      * 备注
      */
 //    @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })

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

@@ -8,10 +8,12 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.ruoyi.zdsz.domain.ZEngineeringInfrastructure;
+import com.ruoyi.zdsz.domain.bo.ZEngineeringInfoBo;
 import com.ruoyi.zdsz.domain.bo.ZEngineeringInfrastructureBo;
 import com.ruoyi.zdsz.domain.bo.ZEngineeringNodeBo;
 import com.ruoyi.zdsz.domain.bo.ZEngineeringReviewBo;
 import com.ruoyi.zdsz.domain.vo.ZEngineeringInfrastructureVo;
+import com.ruoyi.zdsz.domain.vo.ZEngineeringNodeVo;
 import com.ruoyi.zdsz.domain.vo.ZEngineeringReviewVo;
 import com.ruoyi.zdsz.mapper.ZEngineeringInfrastructureMapper;
 import com.ruoyi.zdsz.service.IZEngineeringInfrastructureService;
@@ -22,9 +24,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
-import java.util.List;
-import java.util.Map;
-import java.util.Collection;
+import java.util.*;
 
 /**
  * 基建工程Service业务层处理
@@ -55,6 +55,18 @@ public class ZEngineeringInfrastructureServiceImpl implements IZEngineeringInfra
         zEngineeringNodeBo.setCreateTime(vo.getCreateTime());
         zEngineeringNodeBo.setCivliId(vo.getId());
         vo.setzEngineeringNodeBoList(izEngineeringNodeService.queryListDetails(zEngineeringNodeBo));
+        List<ZEngineeringNodeBo> nodeList = vo.getzEngineeringNodeBoList();
+        if(nodeList != null && nodeList.size() > 0){
+            for (ZEngineeringNodeBo node : nodeList) {
+                String type = node.getType();
+//                if(node.getType().equals("construction_entrance")){
+                if(type.equals("construction_hydroelectricity") || type.equals("construction_waterproof")){ // 水电施工、防水
+                    ZEngineeringReviewBo reviewBo = izEngineeringReviewService.query(node);
+                    boolean review = (reviewBo!=null) && (reviewBo.getReviewStatus().equals("1"));
+                    node.setReviewStatus(review?"1":"0"); // 通过-1 未通过、未审核-0 无需审核-null
+                }
+            } // else null
+        }
         return vo;
     }
 
@@ -68,7 +80,31 @@ public class ZEngineeringInfrastructureServiceImpl implements IZEngineeringInfra
         zEngineeringNodeBo.setCreateTime(vo.getCreateTime());
         zEngineeringNodeBo.setCivliId(vo.getId());
         zEngineeringNodeBo.setType(type);
-        vo.setzEngineeringNodeBo(izEngineeringNodeService.query(zEngineeringNodeBo));
+//        List<ZEngineeringNodeVo> zEngineeringNodeVoList = izEngineeringNodeService.queryList(zEngineeringNodeBo);
+        List<ZEngineeringNodeBo> zEngineeringNodeBoList = izEngineeringNodeService.queryListDetails(zEngineeringNodeBo);
+        for (ZEngineeringNodeBo node : zEngineeringNodeBoList) {
+            if(type.equals("construction_hydroelectricity") || type.equals("construction_waterproof")){ // 水电施工、防水
+                node.setCreateTime(new Date());
+                ZEngineeringReviewBo reviewBo = izEngineeringReviewService.query(node);
+                boolean review = (reviewBo!=null) && (reviewBo.getReviewStatus().equals("1"));
+                node.setReviewStatus(review?"1":"0"); // 通过-1 未通过、未审核-0 无需审核-null
+            }
+        }
+
+//        List<ZEngineeringNodeBo> zEngineeringNodeBoList = new ArrayList<>();
+//        for (ZEngineeringNodeVo zEngineeringNodeVo : zEngineeringNodeVoList) {
+//            ZEngineeringNodeBo bo = BeanUtil.toBean(zEngineeringNodeVo, ZEngineeringNodeBo.class);
+//            if(type.equals("construction_hydroelectricity") || type.equals("construction_waterproof")){ // 水电施工、防水
+//                bo.setCreateTime(new Date());
+//                ZEngineeringReviewBo reviewBo = izEngineeringReviewService.query(bo);
+//                boolean review = (reviewBo!=null) && (reviewBo.getReviewStatus().equals("1"));
+//                bo.setReviewStatus(review?"1":"0"); // 通过-1 未通过、未审核-0 无需审核-null
+//            }
+//            ZEngineeringInfoBo zEngineeringInfoBo = new ZEngineeringInfoBo();
+//            zEngineeringInfoBoS
+//            zEngineeringNodeBoList.add(bo);
+//        }
+        vo.setzEngineeringNodeBoList(zEngineeringNodeBoList);
         return vo;
     }
 
@@ -114,11 +150,22 @@ public class ZEngineeringInfrastructureServiceImpl implements IZEngineeringInfra
         validEntityBeforeSave(add);
         boolean flag = baseMapper.insert(add) > 0;
         if (flag) {
-            bo.setId(add.getId());
-            ZEngineeringNodeBo zEngineeringNodeBo = bo.getzEngineeringNodeBo();
-            zEngineeringNodeBo.setCivliId(add.getId());
-            zEngineeringNodeBo.setCreateTime(add.getCreateTime());
-            izEngineeringNodeService.insert(zEngineeringNodeBo);
+            List<ZEngineeringNodeBo> nodeBoList = bo.getzEngineeringNodeBoList();
+            if(nodeBoList != null && nodeBoList.size() != 0){
+                for (ZEngineeringNodeBo nodeBo:nodeBoList) {
+                    bo.setId(add.getId());
+                    ZEngineeringNodeBo zEngineeringNodeBo = nodeBo;
+                    zEngineeringNodeBo.setCivliId(add.getId());
+                    zEngineeringNodeBo.setCreateTime(add.getCreateTime());
+                    izEngineeringNodeService.insert(zEngineeringNodeBo);
+                }
+            }else {
+                bo.setId(add.getId());
+                ZEngineeringNodeBo zEngineeringNodeBo = bo.getzEngineeringNodeBo();
+                zEngineeringNodeBo.setCivliId(add.getId());
+                zEngineeringNodeBo.setCreateTime(add.getCreateTime());
+                izEngineeringNodeService.insert(zEngineeringNodeBo);
+            }
         }
         return flag;
     }