Merge branch 'zdsz3.0' of http://192.168.10.18:3000/sunwei/zdsz_java into zdsz3.0

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/domain/vo/ZEngineeringIndustryVo.java

@@ -3,9 +3,11 @@ package com.ruoyi.zdsz.domain.vo;
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.ruoyi.common.core.domain.BaseEntity;
+import com.ruoyi.zdsz.domain.bo.ZEngineeringNodeBo;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * 工业工程|市政工程视图对象 z_engineering_industry
@@ -92,4 +94,5 @@ public class ZEngineeringIndustryVo extends BaseEntity implements Serializable {
     private String type;
 
 
+    private List<ZEngineeringNodeBo> zEngineeringNodeBo;
 }

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/mapper/ZEngineeringDangerousMapper.java

@@ -13,5 +13,4 @@ import org.apache.ibatis.annotations.Param;
  */
 public interface ZEngineeringDangerousMapper extends BaseMapperPlus<ZEngineeringDangerousMapper, ZEngineeringDangerous, ZEngineeringDangerousVo> {
 
-    String selectIdByCid (@Param("id") String id);
 }

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/service/IZEngineeringIndustryService.java

@@ -45,4 +45,9 @@ public interface IZEngineeringIndustryService {
      * 校验并批量删除工业工程|市政工程信息
      */
     Boolean deleteWithValidByIds(Collection<String> ids, Boolean isValid);
+
+    /**
+     * 审核工业工程|市政工程
+     */
+    Boolean auditById(String id);
 }

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

@@ -69,7 +69,6 @@ public class ZEngineeringDangerousServiceImpl implements IZEngineeringDangerousS
         ZEngineeringDangerousVo zEngineeringDangerousVo = baseMapper.selectVoById(bo.getId());
         ZEngineeringDangerousBo zEngineeringDangerousBo = BeanUtil.toBean(zEngineeringDangerousVo, ZEngineeringDangerousBo.class);
         ZEngineeringNodeBo zEngineeringNodeBo = new ZEngineeringNodeBo();
-        zEngineeringNodeBo.setId(baseMapper.selectIdByCid(bo.getId()));
         zEngineeringNodeBo.setCivliId(bo.getId());
         zEngineeringNodeBo.setCreateTime(bo.getCreateTime());
         ZEngineeringNodeBo query = izEngineeringNodeService.query(zEngineeringNodeBo);
@@ -153,6 +152,7 @@ public class ZEngineeringDangerousServiceImpl implements IZEngineeringDangerousS
             bo.setId(add.getId());
         }
         bo.getzEngineeringNodeBo().setCivliId(add.getId());
+        bo.getzEngineeringNodeBo().setCreateTime(add.getCreateTime());
         izEngineeringNodeService.insert(bo.getzEngineeringNodeBo());
         return flag;
     }
@@ -177,7 +177,6 @@ public class ZEngineeringDangerousServiceImpl implements IZEngineeringDangerousS
         ZEngineeringDangerous update = BeanUtil.toBean(bo, ZEngineeringDangerous.class);
         validEntityBeforeSave(update);
         ZEngineeringNodeBo zEngineeringNodeBo = bo.getzEngineeringNodeBo();
-        zEngineeringNodeBo.setId(baseMapper.selectIdByCid(update.getId()));
         zEngineeringNodeBo.setCivliId(update.getId());
         zEngineeringNodeBo.setCreateTime(update.getCreateTime());
         izEngineeringNodeService.update(zEngineeringNodeBo);

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

@@ -10,10 +10,13 @@ import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.zdsz.domain.ZEngineeringIndustry;
 import com.ruoyi.zdsz.domain.bo.ZEngineeringIndustryBo;
 import com.ruoyi.zdsz.domain.bo.ZEngineeringNodeBo;
+import com.ruoyi.zdsz.domain.bo.ZEngineeringReviewBo;
 import com.ruoyi.zdsz.domain.vo.ZEngineeringIndustryVo;
+import com.ruoyi.zdsz.domain.vo.ZEngineeringReviewVo;
 import com.ruoyi.zdsz.mapper.ZEngineeringIndustryMapper;
 import com.ruoyi.zdsz.service.IZEngineeringIndustryService;
 import com.ruoyi.zdsz.service.IZEngineeringNodeService;
+import com.ruoyi.zdsz.service.IZEngineeringReviewService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -21,6 +24,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.util.Collection;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -43,6 +47,8 @@ public class ZEngineeringIndustryServiceImpl implements IZEngineeringIndustrySer
     @Autowired
     private IZEngineeringNodeService nodeService;
 
+    @Resource
+    private IZEngineeringReviewService izEngineeringReviewService;
     /**
      * 查询工业工程|市政工程
      */
@@ -51,7 +57,9 @@ public class ZEngineeringIndustryServiceImpl implements IZEngineeringIndustrySer
         ZEngineeringIndustryVo zEngineeringIndustryVo = baseMapper.selectVoById(id);
         ZEngineeringNodeBo zEngineeringNodeBo = new ZEngineeringNodeBo();
         zEngineeringNodeBo.setCivliId(id);
-        izEngineeringNodeService.queryListDetails(zEngineeringNodeBo);
+        zEngineeringNodeBo.setCreateTime(zEngineeringIndustryVo.getCreateTime());
+        List<ZEngineeringNodeBo> zEngineeringNodeBos = izEngineeringNodeService.queryListDetails(zEngineeringNodeBo);
+        zEngineeringIndustryVo.setZEngineeringNodeBo(zEngineeringNodeBos);
         return zEngineeringIndustryVo;
 
     }
@@ -105,7 +113,7 @@ public class ZEngineeringIndustryServiceImpl implements IZEngineeringIndustrySer
             bo.setId(add.getId());
         }
         bo.getzEngineeringNodeBo().setCivliId(add.getId());
-        bo.getzEngineeringNodeBo().setType(add.getType());
+        bo.getzEngineeringNodeBo().setCreateTime(new Date());
         izEngineeringNodeService.insert(bo.getzEngineeringNodeBo());
         return flag;
     }
@@ -151,4 +159,28 @@ public class ZEngineeringIndustryServiceImpl implements IZEngineeringIndustrySer
         });
         return baseMapper.deleteBatchIds(ids) > 0;
     }
+
+    //审核工业工程|市政工程
+    @Override
+    public Boolean auditById(String id) {
+        Boolean flag = false;
+        ZEngineeringNodeBo bo = new ZEngineeringNodeBo();
+        bo.setCivliId(id);
+        List<ZEngineeringNodeBo> zEngineeringNodeBos = izEngineeringNodeService.queryListDetails(bo);
+        //根据节点的id查询审核状态
+        zEngineeringNodeBos.stream().forEach(item -> {
+            ZEngineeringReviewBo zEngineeringReviewBo = new ZEngineeringReviewBo();
+            zEngineeringReviewBo.setEngInfoId(item.getId());
+            List<ZEngineeringReviewVo> vos = izEngineeringReviewService.queryList(zEngineeringReviewBo);
+            //判断审核状态
+            vos.stream().forEach(item1 -> {
+                if (item1.getReviewStatus().equals("0")) {
+                }
+            });
+        });
+        return null;
+    }
+
+
+
 }

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

@@ -21,7 +21,6 @@ import com.ruoyi.zdsz.service.IZEngineeringNodeService;
 import com.ruoyi.zdsz.service.IZEngineeringReviewService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.scheduling.annotation.Async;
 import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -32,7 +31,6 @@ import java.text.SimpleDateFormat;
 import java.util.*;
 
 import static cn.hutool.core.date.DateUtil.format;
-import static com.ruoyi.common.core.mapper.BaseMapperPlus.log;
 
 /**
  * 工程节点Service业务层处理
@@ -219,6 +217,7 @@ public class ZEngineeringNodeServiceImpl implements IZEngineeringNodeService {
         }
         bo.getzEngineeringInfoBo().setEngInfoId(add.getId());
         bo.getzEngineeringInfoBo().setCreateTime(bo.getCreateTime());
+
         izEngineeringInfoService.insert(bo.getzEngineeringInfoBo());
         return add;
     }

ruoyi-zdsz/src/main/resources/mapper/zdsz/ZEngineeringDangerousMapper.xml

@@ -47,11 +47,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateBy" column="update_by"/>
         <result property="updateTime" column="update_time"/>
     </resultMap>
-    <select id="selectIdByCid" resultType="string">
-        select id
-        from z_engineering_node
-        where civli_id = #{id}
-    </select>
-
-
 </mapper>