市政工程|工业工程 删除方法添加非空校验,修改更改为批量修改

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

@@ -117,4 +117,14 @@ public class ZEngineeringIndustryBo extends BaseEntity {
     public void setzEngineeringNodeBo(ZEngineeringNodeBo zEngineeringNodeBo) {
         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/service/impl/ZEngineeringIndustryServiceImpl.java

@@ -250,9 +250,12 @@ public class ZEngineeringIndustryServiceImpl implements IZEngineeringIndustrySer
                 photoService.insertBatch(list);
             }
         }
-        bo.getzEngineeringNodeBo().setCivliId(bo.getId());
-        bo.getzEngineeringNodeBo().setType(bo.getType());
-        izEngineeringNodeService.update(bo.getzEngineeringNodeBo());
+        bo.getzEngineeringNodeBoList().stream().forEach(item->{
+            item.setCivliId(bo.getId());
+            item.setCreateTime(bo.getCreateTime());
+            item.setType(bo.getType());
+            izEngineeringNodeService.updateMuch(item);
+        });
         return flag;
     }
 
@@ -269,9 +272,7 @@ public class ZEngineeringIndustryServiceImpl implements IZEngineeringIndustrySer
      */
     @Override
     public Boolean deleteWithValidByIds(Collection<String> ids, Boolean isValid) {
-        if (isValid) {
-            //TODO 做一些业务上的校验,判断是否需要校验
-        }
+
         ids.forEach(item -> {
             // 查询数据库中已存在的文件列表
             ZEngiineeringPhotoBo zEngiineeringPhotoBo = new ZEngiineeringPhotoBo();

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

@@ -297,7 +297,9 @@ public class ZEngineeringNodeServiceImpl implements IZEngineeringNodeService {
         lqw.eq(StringUtils.isNotBlank(bo.getId()), ZEngineeringNode::getId,bo.getId());
         ZEngineeringNode zEngineeringNode=baseMapper.selectOne(lqw);
         ZEngineeringNodeBo zEngineeringNodeBo = BeanUtil.toBean(zEngineeringNode, ZEngineeringNodeBo.class);
-        izEngineeringInfoService.delete(zEngineeringNodeBo);
+        if (zEngineeringNodeBo != null) {
+            izEngineeringInfoService.delete(zEngineeringNodeBo);
+        }
         return baseMapper.deleteById(bo.getId()) > 0;
     }