工业工程删除

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

@@ -2,6 +2,7 @@ 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 lombok.Data;
 
 import java.io.Serializable;
@@ -14,7 +15,7 @@ import java.io.Serializable;
  */
 @Data
 @ExcelIgnoreUnannotated
-public class ZEngineeringIndustryVo implements Serializable {
+public class ZEngineeringIndustryVo extends BaseEntity implements Serializable {
 
     private static final long serialVersionUID = 1L;
 

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

@@ -78,10 +78,5 @@ public interface IZEngineeringNodeService {
      */
     Boolean deleteWithValidByIds(Collection<String> ids, Boolean isValid);
 
-    /**
-     * 根据civliIds判断是否存在节点
-     */
-    Boolean queryIdByCivliId (Collection<String> civliIds);
-
     String ZEngineeringReview(ZEngineeringNodeBo bo);
 }

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

@@ -15,6 +15,7 @@ import com.ruoyi.zdsz.mapper.ZEngineeringIndustryMapper;
 import com.ruoyi.zdsz.service.IZEngineeringIndustryService;
 import com.ruoyi.zdsz.service.IZEngineeringNodeService;
 import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -39,6 +40,9 @@ public class ZEngineeringIndustryServiceImpl implements IZEngineeringIndustrySer
     @Resource
     private IZEngineeringNodeService izEngineeringNodeService;
 
+    @Autowired
+    private IZEngineeringNodeService nodeService;
+
     /**
      * 查询工业工程|市政工程
      */
@@ -135,11 +139,16 @@ public class ZEngineeringIndustryServiceImpl implements IZEngineeringIndustrySer
         if (isValid) {
             //TODO 做一些业务上的校验,判断是否需要校验
         }
-        boolean flag = false;
-        Boolean b = izEngineeringNodeService.queryIdByCivliId(ids);
-        if (!b) {
-            flag = baseMapper.deleteBatchIds(ids) > 0;
-        }
-        return flag;
+        ids.forEach(item -> {
+            ZEngineeringIndustryVo vo = baseMapper.selectVoById(item);
+            ZEngineeringNodeBo zEngineeringNodeBo = new ZEngineeringNodeBo();
+            zEngineeringNodeBo.setCreateTime(vo.getCreateTime());
+            zEngineeringNodeBo.setCivliId(vo.getId());
+            List<ZEngineeringNodeBo> zEngineeringNodeBos = nodeService.queryListDetails(zEngineeringNodeBo);
+            zEngineeringNodeBos.stream().forEach(ite ->
+                nodeService.delete(ite)
+            );
+        });
+        return baseMapper.deleteBatchIds(ids) > 0;
     }
 }

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

@@ -306,15 +306,4 @@ public class ZEngineeringNodeServiceImpl implements IZEngineeringNodeService {
         }
         return null;
     }
-
-
-    /**
-     * 根据civliIds判断是否存在节点
-     */
-    @Override
-    public Boolean queryIdByCivliId(Collection<String> civliIds) {
-        LambdaQueryWrapper<ZEngineeringNode> lqw = Wrappers.lambdaQuery();
-        lqw.in(ZEngineeringNode::getCivliId, civliIds);
-        return baseMapper.exists(lqw);
-    }
 }