审核bug修复

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

@@ -3,6 +3,7 @@ package com.ruoyi.zdsz.service;
 import com.ruoyi.zdsz.domain.ZEngineeringCivil;
 import com.ruoyi.zdsz.domain.ZEngineeringReview;
 import com.ruoyi.zdsz.domain.bo.ZEngineeringCivilBo;
+import com.ruoyi.zdsz.domain.bo.ZEngineeringInfoBo;
 import com.ruoyi.zdsz.domain.bo.ZEngineeringNodeBo;
 import com.ruoyi.zdsz.domain.vo.ZEngineeringNodeVo;
 import com.ruoyi.zdsz.domain.vo.ZEngineeringReviewVo;
@@ -78,4 +79,5 @@ public interface IZEngineeringReviewService {
     Boolean deleteWithValidByIds(Collection<String> ids, Boolean isValid);
 
     Boolean updateCivilStatus(ZEngineeringCivil zEngineeringCivil);
+    Boolean deleteByNodeId(ZEngineeringInfoBo bo);
 }

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

@@ -10,6 +10,7 @@ import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.helper.LoginHelper;
 import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.framework.handler.MonthTableNameHandler;
 import com.ruoyi.system.service.ISysUserService;
 import com.ruoyi.zdsz.domain.ZEngiineeringPhoto;
 import com.ruoyi.zdsz.domain.ZEngineeringInfo;
@@ -31,6 +32,7 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.ObjectUtils;
 
 import javax.annotation.Resource;
+import java.text.SimpleDateFormat;
 import java.util.*;
 
 /**
@@ -483,12 +485,23 @@ public class ZEngineeringInfoServiceImpl implements IZEngineeringInfoService {
         LambdaQueryWrapper<ZEngineeringInfo> lqw = Wrappers.lambdaQuery();
         lqw.eq(StringUtils.isNotBlank(bo.getId()), ZEngineeringInfo::getId, bo.getId());
         ZEngineeringInfo zEngineeringInfo = baseMapper.selectOne(lqw);
+        SimpleDateFormat simpleDateFormat=new SimpleDateFormat("yyyy_MM");
             ZEngineeringInfoBo zEngineeringInfobo =new ZEngineeringInfoBo();
         zEngineeringInfobo= BeanUtil.toBean(zEngineeringInfo, ZEngineeringInfoBo.class);
             //zEngineeringInfobo.setCreateTime(bo.getCreateTime());
             izEngiineeringPhotoService.delete(zEngineeringInfobo);
             izEngineeringMaterialService.delete(zEngineeringInfobo);
-            baseMapper.deleteById(zEngineeringInfo.getId());
+
+            MonthTableNameHandler.setData(simpleDateFormat.format(bo.getCreateTime()));
+            baseMapper.deleteById(bo.getId());
+        LambdaQueryWrapper<ZEngineeringInfo> lqw2 = Wrappers.lambdaQuery();
+        lqw2.eq(StringUtils.isNotBlank(bo.getEngInfoId()), ZEngineeringInfo::getEngInfoId, bo.getEngInfoId());
+        List<ZEngineeringInfo> zEngineeringInfoList = baseMapper.selectList(lqw2);
+        MonthTableNameHandler.removeData();
+        if (zEngineeringInfoList.size()==0)
+        {
+            izEngineeringReviewService.deleteByNodeId(zEngineeringInfobo);
+        }
         return null;
     }
 

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

@@ -16,6 +16,7 @@ import com.ruoyi.system.service.ISysDictTypeService;
 import com.ruoyi.zdsz.domain.ZEngineeringCivil;
 import com.ruoyi.zdsz.domain.ZEngineeringNode;
 import com.ruoyi.zdsz.domain.bo.ZEngineeringCivilBo;
+import com.ruoyi.zdsz.domain.bo.ZEngineeringInfoBo;
 import com.ruoyi.zdsz.domain.bo.ZEngineeringNodeBo;
 import com.ruoyi.zdsz.domain.vo.ZEngineeringCivilVo;
 import com.ruoyi.zdsz.domain.vo.ZEngineeringNodeVo;
@@ -242,6 +243,15 @@ public class ZEngineeringReviewServiceImpl implements IZEngineeringReviewService
         }
         return baseMapper.deleteBatchIds(ids) > 0;
     }
+
+    @Override
+    @DynamicName(spel = "#bo.createTime")
+    public Boolean deleteByNodeId(ZEngineeringInfoBo bo) {
+        LambdaQueryWrapper<ZEngineeringReview> lqw = Wrappers.lambdaQuery();
+        lqw.eq(StringUtils.isNotBlank(bo.getEngInfoId()), ZEngineeringReview::getEngInfoId, bo.getEngInfoId());
+        return baseMapper.delete(lqw)>0;
+    }
+
     @Override
     @DynamicName(spel = "#zEngineeringCivil.createTime")
     public Boolean updateCivilStatus(ZEngineeringCivil zEngineeringCivil) {