Merge remote-tracking branch 'origin/zdsz3.0' into zdsz3.0

# Conflicts:
#	ruoyi-admin/src/main/java/com/ruoyi/web/controller/zdsz/ZEngineeringCivilController.java
#	ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/service/IZEngineeringCivilService.java

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

@@ -16,7 +16,10 @@ import com.ruoyi.zdsz.domain.bo.ZEngineeringCivilBo;
 import com.ruoyi.zdsz.domain.bo.ZEngineeringNodeBo;
 import com.ruoyi.zdsz.domain.bo.ZEngineeringReviewBo;
 import com.ruoyi.zdsz.domain.bo.switchBo;
-import com.ruoyi.zdsz.domain.vo.*;
+import com.ruoyi.zdsz.domain.vo.BulidingStatusVo;
+import com.ruoyi.zdsz.domain.vo.ZEngineeringCivilExportVo;
+import com.ruoyi.zdsz.domain.vo.ZEngineeringCivilVo;
+import com.ruoyi.zdsz.domain.vo.areaStatusVo;
 import com.ruoyi.zdsz.service.IZEngineeringCivilService;
 import com.ruoyi.zdsz.service.IZEngineeringReviewService;
 import lombok.RequiredArgsConstructor;
@@ -208,8 +211,8 @@ public class ZEngineeringCivilController extends BaseController {
      */
     @Log(title = "民用工程", businessType = BusinessType.OTHER)
     @PostMapping("/CivilReview")
-    public R Civilinsert( @RequestBody ZEngineeringReviewBo zEngineeringReviewBo) {
-        return R.ok(iZEngineeringCivilService.Civilinsert(zEngineeringReviewBo));
+    public R Civilinsert( @RequestBody ZEngineeringReviewBo zEngineeringReviewBo,@RequestBody infoIdList infoIdList) {
+        return R.ok(iZEngineeringCivilService.Civilinsert(zEngineeringReviewBo,infoIdList));
     }
     /**
      *民用获取各个节点状态

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/domain/ZEngineeringInfo.java

@@ -84,5 +84,9 @@ public class ZEngineeringInfo extends BaseEntity {
      */
     @TableLogic
     private String delFlag;
+    /**
+     * 状态
+     */
+    private String state;
 
 }

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

@@ -93,6 +93,10 @@ public class ZEngineeringInfoBo extends BaseEntity {
      * 备注
      */
     private String remark;
+    /**
+     * 状态
+     */
+    private String state;
 
     public List<String> getzEngiineeringPhotoBoList() {
         return zEngiineeringPhotoBoList;

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

@@ -66,4 +66,6 @@ public class ZEngineeringReviewBo extends BaseEntity {
     private String remark;
 
 
+
+
 }

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

@@ -0,0 +1,13 @@
+package com.ruoyi.zdsz.domain.bo;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class infoIdList {
+    //审核通过节点列表
+    private List<ZEngineeringInfoBo> infoIdList;
+    //删除节点列表
+    private List<String> delInfoIdList;
+}

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

@@ -24,7 +24,7 @@ public class ZEngineeringInfoVo implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /**
-     * 
+     *
      */
     @ExcelProperty(value = "")
     private String id;
@@ -95,6 +95,9 @@ public class ZEngineeringInfoVo implements Serializable {
      */
     @ExcelProperty(value = "备注")
     private String remark;
-
+    /**
+     * 状态
+     */
+    private String state;
 
 }

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

@@ -27,6 +27,7 @@ public interface IZEngiineeringPhotoService {
      * 查询照片列表
      */
     List<String> queryList(ZEngineeringInfoBo bo);
+    List<String> queryInsertList(ZEngineeringInfoBo bo);
 
     /**
      * 根据类型查询照片
@@ -73,6 +74,9 @@ public interface IZEngiineeringPhotoService {
      * 校验并批量删除照片信息
      */
     Boolean delete(ZEngineeringInfoBo bo);
+    //删除记录但不释放资源
+    Boolean deleteNodelFiles(ZEngineeringInfoBo bo);
+
     Boolean deleteWithValidByIds(Collection<String> ids, Boolean isValid);
 
     Boolean deleteWithValidByurls(String url);

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

@@ -5,10 +5,13 @@ import com.ruoyi.zdsz.domain.ZEngineeringCivil;
 import com.ruoyi.zdsz.domain.bo.ZEngineeringNodeBo;
 import com.ruoyi.zdsz.domain.bo.ZEngineeringReviewBo;
 import com.ruoyi.zdsz.domain.bo.switchBo;
-import com.ruoyi.zdsz.domain.vo.*;
+import com.ruoyi.zdsz.domain.vo.ZEngineeringCivilExportVo;
+import com.ruoyi.zdsz.domain.vo.ZEngineeringCivilVo;
 import com.ruoyi.zdsz.domain.bo.ZEngineeringCivilBo;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.core.domain.PageQuery;
+import com.ruoyi.zdsz.domain.vo.areaStatusVo;
+import com.ruoyi.zdsz.domain.vo.roomStatusVo;
 
 import java.util.Collection;
 import java.util.List;
@@ -36,7 +39,7 @@ public interface IZEngineeringCivilService {
      * 查询民用工程列表
      */
     TableDataInfo<ZEngineeringCivilVo> queryPageList(ZEngineeringCivilBo bo, PageQuery pageQuery);
-    List<ZEngineeringCivilExportVos> exportList(ZEngineeringCivilBo bo);
+    List<ZEngineeringCivilExportVo> exportList(ZEngineeringCivilBo bo);
 
     /**
      * 查询民用工程列表

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

@@ -30,6 +30,7 @@ public interface IZEngineeringInfoService {
      * @return
      */
     List<ZEngineeringInfoBo> query(ZEngineeringNodeBo bo);
+    List<ZEngineeringInfoBo> queryInsert(ZEngineeringNodeBo bo);
 
     /**
      * 查询工程详情列表
@@ -71,6 +72,7 @@ public interface IZEngineeringInfoService {
     Boolean deleteWithValidByIds(Collection<String> ids, Boolean isValid);
     Boolean delete(ZEngineeringNodeBo bo);
     Boolean deleteById(ZEngineeringInfoBo bo);
+    Boolean deleteByIdNoDelFiles(ZEngineeringInfoBo bo);
     List<ZEngineeringMaterialBo> getzEngineeringMaterialBoList(ZEngineeringNodeBo bo);
 
 }

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

@@ -37,6 +37,7 @@ public interface IZEngineeringNodeService {
      * @return
      */
     ZEngineeringNodeBo query(ZEngineeringNodeBo bo) ;
+    ZEngineeringNodeBo queryInsert(ZEngineeringNodeBo bo) ;
     ZEngineeringNodeBo Userquery(ZEngineeringNodeBo bo,String username);
     /**
      * 获取工程节点列表

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

@@ -80,4 +80,5 @@ public interface IZEngineeringReviewService {
 
     Boolean updateCivilStatus(ZEngineeringCivil zEngineeringCivil);
     Boolean deleteByNodeId(ZEngineeringInfoBo bo);
+    Boolean deleteByInfoId(ZEngineeringNodeBo bo);
 }

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

@@ -70,6 +70,22 @@ public class ZEngiineeringPhotoServiceImpl implements IZEngiineeringPhotoService
     }
     @Override
     @DynamicName(spel = "#bo.createTime")
+//    @Async("threadPoolTaskExecutor")
+    public List<String> queryInsertList(ZEngineeringInfoBo bo) {
+        List<String> list = new ArrayList<>();
+        LambdaQueryWrapper<ZEngiineeringPhoto> lqw = Wrappers.lambdaQuery();
+        lqw.orderByDesc(ZEngiineeringPhoto::getUpdateTime);
+        //lqw.isNull(ZEngiineeringPhoto::getType);
+        lqw.eq(StringUtils.isNotBlank(bo.getId()), ZEngiineeringPhoto::getParentId, bo.getId()).orderByDesc(ZEngiineeringPhoto::getCreateTime);
+        List<ZEngiineeringPhoto> zEngiineeringPhotoList = baseMapper.selectList(lqw);
+        zEngiineeringPhotoList.stream().forEach(item -> {
+            list.add(item.getPicUrl());
+        });
+        return list;
+    }
+
+    @Override
+    @DynamicName(spel = "#bo.createTime")
     public List<String> queryTypeList(ZEngineeringInfoBo bo,String Type) {
         List<String> list = new ArrayList<>();
         LambdaQueryWrapper<ZEngiineeringPhoto> lqw = Wrappers.lambdaQuery();
@@ -224,6 +240,29 @@ public class ZEngiineeringPhotoServiceImpl implements IZEngiineeringPhotoService
         ;
         return flag > 0;
     }
+    @Override
+    @DynamicName(spel = "#bo.createTime")
+    @Transactional(rollbackFor = Exception.class)
+//    @Async("threadPoolTaskExecutor")
+    public Boolean deleteNodelFiles(ZEngineeringInfoBo bo) {
+        LambdaQueryWrapper<ZEngiineeringPhoto> lqw = Wrappers.lambdaQuery();
+        lqw.eq(StringUtils.isNotBlank(bo.getId()), ZEngiineeringPhoto::getParentId, bo.getId());
+        List<ZEngiineeringPhoto> zEngiineeringPhoto = baseMapper.selectList(lqw);
+        List IdList = new ArrayList();
+        List UrlList = new ArrayList();
+        zEngiineeringPhoto.stream().forEach(item -> {
+            IdList.add(item.getId());
+            UrlList.add(item.getPicUrl());
+
+        });
+        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

@@ -31,6 +31,7 @@ import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.ObjectUtils;
+import org.springframework.web.bind.annotation.RequestBody;
 
 import javax.annotation.Resource;
 import java.math.BigDecimal;
@@ -70,6 +71,8 @@ public class ZEngineeringCivilServiceImpl implements IZEngineeringCivilService {
     private IZEngiineeringPhotoService izEngiineeringPhotoService;
     @Resource
     private ZEnginNotInstalledMapper zEnginNotInstalledMapper;
+    @Resource
+    private IZEngineeringInfoService izEngineeringInfoService;
 
     @Override
     public Map<String, List<?>> selectByDistrictStatistics(String district) {
@@ -459,6 +462,7 @@ public class ZEngineeringCivilServiceImpl implements IZEngineeringCivilService {
                 notInstalledLambdaQueryWrapper.eq(StringUtils.isNotBlank(bo.getHouseId()), ZEnginNotInstalled::getHouseId, bo.getHouseId());
                 zEnginNotInstalledMapper.delete(notInstalledLambdaQueryWrapper);
             }
+
             return true;
         }
     }
@@ -695,12 +699,22 @@ public class ZEngineeringCivilServiceImpl implements IZEngineeringCivilService {
 
     @Override
     @DynamicName(spel = "#zEngineeringReviewBo.createTime")
-    public int Civilinsert(ZEngineeringReviewBo zEngineeringReviewBo) {
+    public int Civilinsert(ZEngineeringReviewBo zEngineeringReviewBo, infoIdList infoIdList) {
         ZEngineeringNode zEngineeringNode = zEngineeringNodeMapper.selectById(zEngineeringReviewBo.getEngInfoId());
+        infoIdList.getDelInfoIdList().stream().forEach(item->{
+            ZEngineeringInfoBo zEngineeringInfoBo=new ZEngineeringInfoBo();
+            zEngineeringInfoBo.setCreateTime(zEngineeringNode.getCreateTime());
+            zEngineeringInfoBo.setId(item);
+            izEngineeringInfoService.deleteByIdNoDelFiles(zEngineeringInfoBo);
+        });
+        infoIdList.getInfoIdList().stream().forEach(item->{
+            item.setState("1");
+            izEngineeringInfoService.update(item);
+        });
         ZEngineeringCivil zEngineeringCivil = baseMapper.selectById(zEngineeringNode.getCivliId());
         ZEngineeringCivilBo zEngineeringCivilBo = BeanUtil.copyProperties(zEngineeringCivil, ZEngineeringCivilBo.class);
         ZEngineeringNodeBo zEngineeringNodeBo = BeanUtil.copyProperties(zEngineeringNode, ZEngineeringNodeBo.class);
-        zEngineeringCivilBo.setzEngineeringNodeBo(izEngineeringNodeService.query(zEngineeringNodeBo));
+        zEngineeringCivilBo.setzEngineeringNodeBo(izEngineeringNodeService.queryInsert(zEngineeringNodeBo));
         zEngineeringCivilBo.setCreateTime(zEngineeringReviewBo.getCreateTime());
         izEngineeringReviewService.Civilinsert(zEngineeringCivil, zEngineeringReviewBo);
         areaMessageVo areaMessageVo = new areaMessageVo();
@@ -750,6 +764,7 @@ public class ZEngineeringCivilServiceImpl implements IZEngineeringCivilService {
         return 0;
     }
 
+
     @Override
     public List<ZEngineeringNodeBo> getRivewStatus(String Id) {
         ZEngineeringCivil zEngineeringCivil1 = baseMapper.selectById(Id);

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

@@ -110,6 +110,45 @@ public class ZEngineeringInfoServiceImpl implements IZEngineeringInfoService {
 
         return zEngineeringInfoBoList;
     }
+    @Override
+    @DynamicName(spel = "#bo.createTime")
+    public List<ZEngineeringInfoBo> queryInsert(ZEngineeringNodeBo bo) {
+        LambdaQueryWrapper<ZEngineeringInfo> lqw = Wrappers.lambdaQuery();
+        lqw.orderByDesc(ZEngineeringInfo::getUpdateTime);
+        List<ZEngineeringInfo> zEngineeringInfoVoList = baseMapper.selectList(lqw.eq(StringUtils.isNotBlank(bo.getId()), ZEngineeringInfo::getEngInfoId, bo.getId()));
+        List<ZEngineeringInfoBo> zEngineeringInfoBoList = new ArrayList<>();
+        zEngineeringInfoVoList.stream().forEach(item -> {
+            ZEngineeringInfoBo zEngineeringInfoBo1 = BeanUtil.toBean(item, ZEngineeringInfoBo.class);
+            SysUser sysUser = sysUserService.selectUserById(Long.parseLong(item.getConstructUser()));
+            if (!ObjectUtils.isEmpty(sysUser)) {
+                zEngineeringInfoBo1.setHeadName(sysUser.getNickName());
+                zEngineeringInfoBo1.setConstructUser(sysUser.getNickName());
+                zEngineeringInfoBo1.setHeadPhone(sysUser.getPhonenumber());
+                zEngineeringInfoBo1.setConstructPhone(sysUser.getPhonenumber());
+            }
+            List<String> photoList = izEngiineeringPhotoService.queryInsertList(zEngineeringInfoBo1);
+            List<ZEngineeringMaterialBo> zEngineeringMaterialBo = izEngineeringMaterialService.query(zEngineeringInfoBo1);
+            zEngineeringInfoBo1.setzEngiineeringPhotoBoList(photoList);
+            zEngineeringInfoBo1.setzEngineeringMaterialBo(zEngineeringMaterialBo);
+            zEngineeringInfoBo1.setPhotosAfter(izEngiineeringPhotoService.queryTypeList(zEngineeringInfoBo1,photoType.photosAfter.name()));
+            zEngineeringInfoBo1.setStonePowder(izEngiineeringPhotoService.queryTypeList(zEngineeringInfoBo1,photoType.stonePowder.name()));
+            zEngineeringInfoBo1.setDuctalEpithelium(izEngiineeringPhotoService.queryTypeList(zEngineeringInfoBo1,photoType.ductalEpithelium.name()));
+            zEngineeringInfoBo1.setWarningtTape(izEngiineeringPhotoService.queryTypeList(zEngineeringInfoBo1,photoType.warningtTape.name()));
+            zEngineeringInfoBo1.setVideo(izEngiineeringPhotoService.queryTypeList(zEngineeringInfoBo1,photoType.Video.name()));
+            zEngineeringInfoBo1.setTrenchProspect(izEngiineeringPhotoService.queryTypeList(zEngineeringInfoBo1,photoType.trenchProspect.name()));
+            zEngineeringInfoBo1.setBeforeBottom(izEngiineeringPhotoService.queryTypeList(zEngineeringInfoBo1,photoType.beforeBottom.name()));
+            zEngineeringInfoBo1.setLegBackfilling(izEngiineeringPhotoService.queryTypeList(zEngineeringInfoBo1,photoType.legBackfilling.name()));
+            zEngineeringInfoBo1.setInferiorSulcus(izEngiineeringPhotoService.queryTypeList(zEngineeringInfoBo1,photoType.inferiorSulcus.name()));
+            zEngineeringInfoBo1.setConstructionRecords(izEngiineeringPhotoService.queryTypeList(zEngineeringInfoBo1,photoType.constructionRecords.name()));
+            zEngineeringInfoBo1.setOnTheDitch(izEngiineeringPhotoService.queryTypeList(zEngineeringInfoBo1,photoType.onTheDitch.name()));
+            // bo.setId(item.getId());
+            ZEngineeringReviewBo zEngineeringReviewbo = izEngineeringReviewService.query(bo);
+            zEngineeringInfoBo1.setzEngineeringReviewBo(zEngineeringReviewbo);
+            zEngineeringInfoBoList.add(zEngineeringInfoBo1);
+        });
+
+        return zEngineeringInfoBoList;
+    }
 
     /**
      *
@@ -547,7 +586,11 @@ public class ZEngineeringInfoServiceImpl implements IZEngineeringInfoService {
         }
         izEngineeringMaterialService.updateList(bo);
        // update.setUpdateTime(new Date());
-        return baseMapper.updateById(update) > 0;
+        SimpleDateFormat format =new SimpleDateFormat("yyyy_MM");
+        MonthTableNameHandler.setData(format.format(bo.getCreateTime()));
+     Boolean FLAG=  baseMapper.updateById(update) > 0;
+        MonthTableNameHandler.removeData();
+        return FLAG;
     }
 
     /**
@@ -636,6 +679,56 @@ public class ZEngineeringInfoServiceImpl implements IZEngineeringInfoService {
     }
 
     @Override
+    @DynamicName(spel = "#bo.createTime")
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean deleteByIdNoDelFiles(ZEngineeringInfoBo bo) {
+        ZEngineeringInfo zEngineeringInfo2=  baseMapper.selectById(bo.getId());
+        ZEngineeringNode zEngineeringNode=zEngineeringNodeMapper.selectById(zEngineeringInfo2.getEngInfoId());
+        ZEngineeringCivil zEngineeringCivil=zEngineeringCivilMapper.selectById(zEngineeringNode.getCivliId());
+        LambdaQueryWrapper<ZEngineeringMaterial> lqw3 = Wrappers.lambdaQuery();
+        lqw3.eq(ZEngineeringMaterial::getDetailsId,zEngineeringInfo2.getId());
+        List<ZEngineeringMaterial> zEngineeringMaterialList= zEngineeringMaterialMapper.selectList(lqw3);
+        zEngineeringMaterialList.stream().forEach(item->{
+            LambdaQueryWrapper<ZMaterialStatistics> lqwstatis = Wrappers.lambdaQuery();
+            lqwstatis.eq(StringUtils.isNotBlank(zEngineeringCivil.getAreaId()), ZMaterialStatistics::getAreaId, zEngineeringCivil.getAreaId());
+            lqwstatis.eq(StringUtils.isNotBlank(zEngineeringCivil.getBuildingId()), ZMaterialStatistics::getBuildingId, zEngineeringCivil.getBuildingId());
+            lqwstatis.eq(StringUtils.isNotBlank(zEngineeringCivil.getUnitId()), ZMaterialStatistics::getUnitId, zEngineeringCivil.getUnitId());
+            lqwstatis.eq(StringUtils.isNotBlank(zEngineeringCivil.getHouseId()), ZMaterialStatistics::getHouseId, zEngineeringCivil.getHouseId());
+            lqwstatis.eq(StringUtils.isNotBlank(item.getMaterialQuality()), ZMaterialStatistics::getRealityQuality, item.getMaterialQuality());
+            lqwstatis.eq(StringUtils.isNotBlank(item.getSpecifications()), ZMaterialStatistics::getRealitySpecifications, item.getSpecifications());
+            lqwstatis.eq(StringUtils.isNotBlank(zEngineeringCivil.getEnginCycle()), ZMaterialStatistics::getEnginCycle, zEngineeringCivil.getEnginCycle());
+            lqwstatis.eq(StringUtils.isNotBlank(zEngineeringCivil.getEnginClassification()), ZMaterialStatistics::getEnginClassification, zEngineeringCivil.getEnginClassification());
+            lqwstatis.eq(StringUtils.isNotBlank(zEngineeringCivil.getEnginType()), ZMaterialStatistics::getEnginType, zEngineeringCivil.getEnginType());
+            //lqwstatis.eq(StringUtils.isNotBlank(zEngineeringNode.getType()), ZMaterialStatistics::getNodeType, zEngineeringNode.getType());
+            ZMaterialStatistics zMaterialStatistics = zMaterialStatisticsMapper.selectOne(lqwstatis);
+            if (!ObjectUtils.isEmpty(zMaterialStatistics)) {
+                zMaterialStatistics.setRealitySize(BigDecimal.valueOf(zMaterialStatistics.getRealitySize()).subtract(BigDecimal.valueOf(item.getNumber())).doubleValue());
+                zMaterialStatisticsMapper.updateById(zMaterialStatistics);
+            }
+        });
+        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);
+        izEngiineeringPhotoService.delete(zEngineeringInfobo);
+        izEngineeringMaterialService.delete(zEngineeringInfobo);
+
+        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;
+    }
+    @Override
     public List<ZEngineeringMaterialBo> getzEngineeringMaterialBoList(ZEngineeringNodeBo bo) {
         LambdaQueryWrapper<ZEngineeringInfo> lqw = Wrappers.lambdaQuery();
         lqw.eq(StringUtils.isNotBlank(bo.getId()), ZEngineeringInfo::getEngInfoId, bo.getId());

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

@@ -109,6 +109,34 @@ public class ZEngineeringNodeServiceImpl implements IZEngineeringNodeService {
         zEngineeringNodeBo.setzEngineeringInfoBoList(zEngineeringInfoBo);
         return zEngineeringNodeBo;
     }
+    @Override
+    @DynamicName(spel = "#bo.createTime")
+    //    @Async("threadPoolTaskExecutor")
+    public ZEngineeringNodeBo queryInsert(ZEngineeringNodeBo bo) {
+        LambdaQueryWrapper<ZEngineeringNode> lqw = Wrappers.lambdaQuery();
+        lqw.eq(StringUtils.isNotBlank(bo.getCivliId()), ZEngineeringNode::getCivliId, bo.getCivliId());
+        lqw.eq(StringUtils.isNotBlank(bo.getType()), ZEngineeringNode::getType, bo.getType());
+        System.out.println(LoginHelper.getUserType());
+        System.out.println(UserType.SYS_USER);
+//        if (!LoginHelper.getUserType().equals(UserType.SYS_USER))
+//            lqw.eq(ZEngineeringNode::getCreateBy, LoginHelper.getLoginUser().getUsername());
+        ZEngineeringNode zEngineeringNode = baseMapper.selectOne(lqw);
+        //        ZEngineeringNode zEngineeringNodeVo=baseMapper.selectById(bo.getId());
+        if (zEngineeringNode == null) {
+            return null;
+        }
+        ZEngineeringNodeBo zEngineeringNodeBo = new ZEngineeringNodeBo();
+        //        ZEngineeringNodeBo zEngineeringNodeBo= BeanUtil.toBean(zEngineeringNode, ZEngineeringNodeBo.class);
+        BeanUtil.copyProperties(zEngineeringNode, zEngineeringNodeBo, "id");
+        zEngineeringNodeBo.setId(zEngineeringNode.getId());
+        List<ZEngineeringInfoBo> zEngineeringInfoBo = izEngineeringInfoService.queryInsert(zEngineeringNodeBo);
+        ZEngineeringReviewBo zEngineeringReview=  izEngineeringReviewService.query(zEngineeringNodeBo);
+        zEngineeringNodeBo.setReviewStatus(ObjectUtils.isEmpty(zEngineeringReview)?"0":zEngineeringReview.getReviewStatus());
+        zEngineeringNodeBo.setReviewContent(ObjectUtils.isEmpty(zEngineeringReview)?"0":zEngineeringReview.getReviewContent());
+        zEngineeringNodeBo.setId(zEngineeringNode.getId());
+        zEngineeringNodeBo.setzEngineeringInfoBoList(zEngineeringInfoBo);
+        return zEngineeringNodeBo;
+    }
 
     @Override
     @DynamicName(spel = "#bo.createTime")
@@ -540,7 +568,9 @@ public class ZEngineeringNodeServiceImpl implements IZEngineeringNodeService {
         bo.getzEngineeringInfoBo().setEngInfoId(add.getId());
         bo.getzEngineeringInfoBo().setCreateTime(bo.getCreateTime());
         bo.getzEngineeringInfoBo().setUpdateTime(new Date());
+        izEngineeringReviewService.deleteByInfoId(bo);
         izEngineeringInfoService.insert(bo.getzEngineeringInfoBo());
+
         return add;
     }
 

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

@@ -252,6 +252,13 @@ public class ZEngineeringReviewServiceImpl implements IZEngineeringReviewService
         lqw.eq(StringUtils.isNotBlank(bo.getEngInfoId()), ZEngineeringReview::getEngInfoId, bo.getEngInfoId());
         return baseMapper.delete(lqw)>0;
     }
+    @Override
+    @DynamicName(spel = "#bo.createTime")
+    public Boolean deleteByInfoId(ZEngineeringNodeBo bo) {
+        LambdaQueryWrapper<ZEngineeringReview> lqw = Wrappers.lambdaQuery();
+        lqw.eq(StringUtils.isNotBlank(bo.getId()), ZEngineeringReview::getEngInfoId, bo.getId()).eq(ZEngineeringReview::getReviewStatus,1);
+        return baseMapper.delete(lqw)>0;
+    }
 
     @Override
     @DynamicName(spel = "#zEngineeringCivil.createTime")