创建时间

ruoyi-admin/src/main/java/com/ruoyi/web/controller/zdsz/ZEngineeringNodeController.java

@@ -68,7 +68,7 @@ public class ZEngineeringNodeController extends BaseController {
    // @SaCheckPermission("zdsz:engineeringNode:query")
     @GetMapping()
     public R  getInfo( @RequestBody ZEngineeringNodeBo bo) {
-        return R.ok(iZEngineeringNodeService.ZEngineeringReview(bo));
+        return R.ok(iZEngineeringNodeService.query(bo));
     }
 
     /**

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

@@ -188,8 +188,14 @@ public class ZEngiineeringPhotoServiceImpl implements IZEngiineeringPhotoService
             UrlList.add(item.getPicUrl());
 
         });
-        obsService.deleteFiles(UrlList);
-        return baseMapper.deleteBatchIds(IdList)>0;
+        int flag=0;
+        if(IdList.size()>0)
+        {
+            obsService.deleteFiles(UrlList);
+            flag=  baseMapper.deleteBatchIds(IdList);
+        }
+       ;
+        return flag>0;
     }
 
     /**

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

@@ -150,6 +150,8 @@ public class ZEngineeringCivilServiceImpl implements IZEngineeringCivilService {
         }
         ids.forEach(item -> {
             ZEngineeringCivilVo zEngineeringCivilVo = baseMapper.selectVoById(item);
+            if(zEngineeringCivilVo==null)
+            {return;}
             ZEngineeringNodeBo zEngineeringNodeBo = new ZEngineeringNodeBo();
             zEngineeringNodeBo.setCreateTime(zEngineeringCivilVo.getCreateTime());
             zEngineeringNodeBo.setCivliId(zEngineeringCivilVo.getId());

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

@@ -50,7 +50,6 @@ public class ZEngineeringMaterialServiceImpl implements IZEngineeringMaterialSer
         LambdaQueryWrapper<ZEngineeringMaterial> lqw = Wrappers.lambdaQuery();
         lqw.eq(StringUtils.isNotBlank(bo.getId()), ZEngineeringMaterial::getDetailsId, bo.getId());
         List<ZEngineeringMaterial> zEngineeringMaterialVo= baseMapper.selectList(lqw);
-
         List <ZEngineeringMaterialBo> zEngineeringMaterialBoList=new ArrayList<>();
         zEngineeringMaterialVo.stream().forEach(item->{
             ZEngineeringMaterialBo zEngineeringMaterialBo = BeanUtil.toBean(item, ZEngineeringMaterialBo.class);
@@ -189,8 +188,11 @@ public class ZEngineeringMaterialServiceImpl implements IZEngineeringMaterialSer
     public Boolean delete(ZEngineeringInfoBo bo) {
         LambdaQueryWrapper<ZEngineeringMaterial> lqw = Wrappers.lambdaQuery();
         lqw.eq(StringUtils.isNotBlank(bo.getId()), ZEngineeringMaterial::getDetailsId, bo.getId());
-        ZEngineeringMaterial zEngineeringMaterial= baseMapper.selectOne(lqw);
-        return baseMapper.deleteById(zEngineeringMaterial.getId()) > 0;
+        List<ZEngineeringMaterial> zEngineeringMaterial= baseMapper.selectList(lqw);
+        zEngineeringMaterial.stream().forEach(item->{
+             baseMapper.deleteById(item.getId()) ;
+        });
+        return null ;
     }
 
     /**

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

@@ -164,7 +164,7 @@ public class ZEngineeringNodeServiceImpl implements IZEngineeringNodeService {
                 list  =queryList(zEngineeringNodeBo);
             }catch (Exception e)
             {
-                log.info("没有{}该表",format2);
+                log.info("没有{}该表",format2.format(startdate));
 
                 return null ;
             }