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

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

@@ -51,8 +51,8 @@ public class ZEnginMaterialQualityController extends BaseController {
      * 工程材质下拉
      */
     @GetMapping("/getEnginMaterialQualityList")
-    public R getEnginMaterialQualityList() {
-        return R.ok(iZEnginMaterialQualityService.getEnginMaterialQualityList());
+    public R getEnginMaterialQualityList(String enginType) {
+        return R.ok(iZEnginMaterialQualityService.getEnginMaterialQualityList(enginType));
     }
 
     /**

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

@@ -43,7 +43,8 @@ public class ZEngineeringIndustryController extends BaseController {
      */
     @SaCheckPermission("zdsz:engineeringIndustry:list")
     @GetMapping("/list")
-    public TableDataInfo<ZEngineeringIndustryVo> list(ZEngineeringIndustryBo bo, PageQuery pageQuery) {
+    public TableDataInfo<ZEngineeringIndustryVo> list(ZEngineeringIndustryBo bo, PageQuery pageQuery,String type) {
+        bo.setType(type);
         return iZEngineeringIndustryService.queryPageList(bo, pageQuery);
     }
 

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

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

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

@@ -78,20 +78,25 @@ public class ZEngineeringCivilBo extends BaseEntity {
     /**
      * 完工状态
      */
-    @NotBlank(message = "完工状态不能为空", groups = { AddGroup.class, EditGroup.class })
     private String completionStatus;
 
     /**
      * 默认图片地址
      */
-    @NotBlank(message = "默认图片地址不能为空", groups = { AddGroup.class, EditGroup.class })
     private String imgUrl;
 
     /**
      * 备注
      */
-    @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
     private String remark;
 
+    private ZEngineeringNodeBo zEngineeringNodeBo;
 
+    public ZEngineeringNodeBo getzEngineeringNodeBo() {
+        return zEngineeringNodeBo;
+    }
+
+    public void setzEngineeringNodeBo(ZEngineeringNodeBo zEngineeringNodeBo) {
+        this.zEngineeringNodeBo = zEngineeringNodeBo;
+    }
 }

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

@@ -85,13 +85,13 @@ public class ZEngineeringPipeJackingBo extends BaseEntity {
 //    @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
     private String remark;
 
-    private ZEngineeringNodeBo nodeBo;
+    private ZEngineeringNodeBo zEngineeringNodeBo;
 
-    public ZEngineeringNodeBo getNodeBo() {
-        return nodeBo;
+    public ZEngineeringNodeBo getzEngineeringNodeBo() {
+        return zEngineeringNodeBo;
     }
 
-    public void setNodeBo(ZEngineeringNodeBo nodeBo) {
-        this.nodeBo = nodeBo;
+    public void setzEngineeringNodeBo(ZEngineeringNodeBo zEngineeringNodeBo) {
+        this.zEngineeringNodeBo = zEngineeringNodeBo;
     }
 }

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

@@ -4,6 +4,7 @@ import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.ruoyi.common.annotation.ExcelDictFormat;
 import com.ruoyi.common.convert.ExcelDictConvert;
+import com.ruoyi.common.core.domain.BaseEntity;
 import lombok.Data;
 import java.util.Date;
 
@@ -19,7 +20,7 @@ import java.util.Map;
  */
 @Data
 @ExcelIgnoreUnannotated
-public class ZComprehensiveVo implements Serializable {
+public class ZComprehensiveVo extends BaseEntity implements Serializable {
 
     private static final long serialVersionUID = 1L;
 

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

@@ -4,10 +4,13 @@ import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.ruoyi.common.annotation.ExcelDictFormat;
 import com.ruoyi.common.convert.ExcelDictConvert;
+import com.ruoyi.common.core.domain.BaseEntity;
+import com.ruoyi.zdsz.domain.bo.ZEngineeringNodeBo;
 import lombok.Data;
 import java.util.Date;
 
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * 民用工程视图对象 z_engineering_civil
@@ -17,7 +20,7 @@ import java.io.Serializable;
  */
 @Data
 @ExcelIgnoreUnannotated
-public class ZEngineeringCivilVo implements Serializable {
+public class ZEngineeringCivilVo extends BaseEntity implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
@@ -94,5 +97,13 @@ public class ZEngineeringCivilVo implements Serializable {
     @ExcelProperty(value = "备注")
     private String remark;
 
+    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/mapper/ZEnginMaterialQualityMapper.java

@@ -14,5 +14,5 @@ import java.util.List;
  */
 public interface ZEnginMaterialQualityMapper extends BaseMapperPlus<ZEnginMaterialQualityMapper, ZEnginMaterialQuality, ZEnginMaterialQualityVo> {
 
-    List<ZEnginMaterialQualityVo> getEnginMaterialQualityList();
+    List<ZEnginMaterialQualityVo> getEnginMaterialQualityList(String enginType);
 }

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

@@ -48,5 +48,5 @@ public interface IZEnginMaterialQualityService {
      */
     Boolean deleteWithValidByIds(Collection<String> ids, Boolean isValid);
 
-    List<ZEnginMaterialQualityVo> getEnginMaterialQualityList();
+    List<ZEnginMaterialQualityVo> getEnginMaterialQualityList(String enginType);
 }

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

@@ -9,12 +9,16 @@ import com.ruoyi.common.core.domain.PageQuery;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.ruoyi.framework.obs.ObsService;
 import com.ruoyi.zdsz.domain.ZEngiineeringPhoto;
 import com.ruoyi.zdsz.domain.bo.ZEngiineeringPhotoBo;
+import com.ruoyi.zdsz.domain.bo.ZEngineeringNodeBo;
 import com.ruoyi.zdsz.domain.bo.ZHouseBo;
 import com.ruoyi.zdsz.domain.vo.ZEngiineeringPhotoVo;
+import com.ruoyi.zdsz.domain.vo.ZEngineeringPipeJackingVo;
 import com.ruoyi.zdsz.domain.vo.ZHouseVo;
 import com.ruoyi.zdsz.mapper.ZEngiineeringPhotoMapper;
+import com.ruoyi.zdsz.service.IZEngiineeringPhotoService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import com.ruoyi.zdsz.domain.bo.ZComprehensiveBo;
@@ -42,6 +46,10 @@ public class ZComprehensiveServiceImpl implements IZComprehensiveService {
 
     @Resource
     private ZEngiineeringPhotoMapper photoMapper;
+    @Resource
+    private ObsService obsService;
+    @Resource
+    private IZEngiineeringPhotoService photoService;
 
     /**
      * 查询开栓|安检|维修
@@ -113,7 +121,7 @@ public class ZComprehensiveServiceImpl implements IZComprehensiveService {
                 pic.setUpdateTime(new Date());
                 list.add(pic);
             });
-            if (list.size()>0) {
+            if (!list.isEmpty()) {
                 photoMapper.insertBatch(list);
             }
         }
@@ -143,7 +151,7 @@ public class ZComprehensiveServiceImpl implements IZComprehensiveService {
                     pic.setCreateTime(new Date());
                     list.add(pic);
                 });
-                if (list.size()>0) {
+                if (!list.isEmpty()) {
                     photoMapper.insertBatch(list);
                 }
             }
@@ -167,6 +175,17 @@ public class ZComprehensiveServiceImpl implements IZComprehensiveService {
         if(isValid){
             //TODO 做一些业务上的校验,判断是否需要校验
         }
+        ids.forEach(item -> {
+            ZComprehensiveVo vo = baseMapper.selectVoById(item);
+            ZEngiineeringPhotoBo bo = new ZEngiineeringPhotoBo();
+            bo.setCreateTime(vo.getCreateTime());
+            bo.setParentId(vo.getId());
+            List<ZEngiineeringPhotoVo> queriedList = photoService.queryList(bo);
+            if (!queriedList.isEmpty()) {
+                obsService.deleteFiles(queriedList.stream().map(ZEngiineeringPhotoVo::getPicUrl).collect(Collectors.toList()));
+                photoService.deleteWithValidByIds(queriedList.stream().map(ZEngiineeringPhotoVo::getId).collect(Collectors.toList()),true);
+            }
+        });
         return baseMapper.deleteBatchIds(ids) > 0;
     }
 }

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/ZEnginMaterialQualityServiceImpl.java

@@ -109,7 +109,7 @@ public class ZEnginMaterialQualityServiceImpl implements IZEnginMaterialQualityS
     }
 
     @Override
-    public List<ZEnginMaterialQualityVo> getEnginMaterialQualityList() {
-        return baseMapper.getEnginMaterialQualityList();
+    public List<ZEnginMaterialQualityVo> getEnginMaterialQualityList(String enginType) {
+        return baseMapper.getEnginMaterialQualityList(enginType);
     }
 }

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

@@ -1,6 +1,8 @@
 package com.ruoyi.zdsz.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
+import com.ruoyi.common.annotation.Translation;
+import com.ruoyi.common.helper.LoginHelper;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.core.domain.PageQuery;
@@ -8,14 +10,21 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.ruoyi.zdsz.domain.ZBuilding;
+import com.ruoyi.zdsz.domain.bo.ZEngineeringInfoBo;
+import com.ruoyi.zdsz.domain.bo.ZEngineeringNodeBo;
+import com.ruoyi.zdsz.service.IZEngineeringInfoService;
+import com.ruoyi.zdsz.service.IZEngineeringNodeService;
 import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.zdsz.domain.bo.ZEngineeringCivilBo;
 import com.ruoyi.zdsz.domain.vo.ZEngineeringCivilVo;
 import com.ruoyi.zdsz.domain.ZEngineeringCivil;
 import com.ruoyi.zdsz.mapper.ZEngineeringCivilMapper;
 import com.ruoyi.zdsz.service.IZEngineeringCivilService;
+import org.springframework.transaction.annotation.Transactional;
 
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import java.util.Collection;
@@ -32,12 +41,20 @@ public class ZEngineeringCivilServiceImpl implements IZEngineeringCivilService {
 
     private final ZEngineeringCivilMapper baseMapper;
 
+    @Autowired
+    private IZEngineeringNodeService izEngineeringNodeService;
+
     /**
      * 查询民用工程
      */
     @Override
-    public ZEngineeringCivilVo queryById(String id){
-        return baseMapper.selectVoById(id);
+    public ZEngineeringCivilVo queryById(String id) {
+        ZEngineeringCivilVo zEngineeringCivilVo = baseMapper.selectVoById(id);
+        ZEngineeringNodeBo zEngineeringNodeBo = new ZEngineeringNodeBo();
+        zEngineeringNodeBo.setCreateTime(zEngineeringCivilVo.getCreateTime());
+        zEngineeringNodeBo.setCivliId(zEngineeringCivilVo.getId());
+        zEngineeringCivilVo.setzEngineeringNodeBoList(izEngineeringNodeService.queryListDetails(zEngineeringNodeBo));
+        return zEngineeringCivilVo;
     }
 
     /**
@@ -75,16 +92,24 @@ public class ZEngineeringCivilServiceImpl implements IZEngineeringCivilService {
         return lqw;
     }
 
+    @Autowired
+    private ZEngineeringNodeServiceImpl zEngineeringNodeService;
+
     /**
      * 新增民用工程
      */
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public Boolean insertByBo(ZEngineeringCivilBo bo) {
         ZEngineeringCivil add = BeanUtil.toBean(bo, ZEngineeringCivil.class);
         validEntityBeforeSave(add);
         boolean flag = baseMapper.insert(add) > 0;
         if (flag) {
             bo.setId(add.getId());
+            ZEngineeringNodeBo zEngineeringNodeBo = bo.getzEngineeringNodeBo();
+            zEngineeringNodeBo.setCivliId(add.getId());
+            zEngineeringNodeBo.setCreateTime(add.getCreateTime());
+            zEngineeringNodeService.insert(zEngineeringNodeBo);
         }
         return flag;
     }
@@ -93,16 +118,25 @@ public class ZEngineeringCivilServiceImpl implements IZEngineeringCivilService {
      * 修改民用工程
      */
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public Boolean updateByBo(ZEngineeringCivilBo bo) {
         ZEngineeringCivil update = BeanUtil.toBean(bo, ZEngineeringCivil.class);
         validEntityBeforeSave(update);
-        return baseMapper.updateById(update) > 0;
+        boolean flag = baseMapper.updateById(update) > 0;
+        if (flag) {
+            ZEngineeringCivilVo zEngineeringCivilVo = baseMapper.selectVoById(update.getId());
+            ZEngineeringNodeBo zEngineeringNodeBo = bo.getzEngineeringNodeBo();
+            zEngineeringNodeBo.setCivliId(zEngineeringCivilVo.getId());
+            zEngineeringNodeBo.setCreateTime(zEngineeringCivilVo.getCreateTime());
+            zEngineeringNodeService.update(zEngineeringNodeBo);
+        }
+        return flag;
     }
 
     /**
      * 保存前的数据校验
      */
-    private void validEntityBeforeSave(ZEngineeringCivil entity){
+    private void validEntityBeforeSave(ZEngineeringCivil entity) {
         //TODO 做一些数据校验,如唯一约束
     }
 
@@ -111,10 +145,19 @@ public class ZEngineeringCivilServiceImpl implements IZEngineeringCivilService {
      */
     @Override
     public Boolean deleteWithValidByIds(Collection<String> ids, Boolean isValid) {
-        if(isValid){
+        if (isValid) {
             //TODO 做一些业务上的校验,判断是否需要校验
         }
-        return baseMapper.deleteBatchIds(ids) > 0;
+        ids.forEach(item -> {
+            ZEngineeringCivilVo zEngineeringCivilVo = baseMapper.selectVoById(item);
+            if(zEngineeringCivilVo==null)
+            {return;}
+            ZEngineeringNodeBo zEngineeringNodeBo = new ZEngineeringNodeBo();
+            zEngineeringNodeBo.setCreateTime(zEngineeringCivilVo.getCreateTime());
+            zEngineeringNodeBo.setCivliId(zEngineeringCivilVo.getId());
+            List<ZEngineeringNodeBo> zEngineeringNodeBos = izEngineeringNodeService.queryListDetails(zEngineeringNodeBo);
+            zEngineeringNodeBos.forEach(ite -> zEngineeringNodeService.delete(ite));
+        }); return baseMapper.deleteBatchIds(ids) > 0;
     }
 
     @Override

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

@@ -9,6 +9,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.zdsz.domain.ZEngineeringIndustry;
 import com.ruoyi.zdsz.domain.bo.ZEngineeringIndustryBo;
+import com.ruoyi.zdsz.domain.bo.ZEngineeringNodeBo;
 import com.ruoyi.zdsz.domain.vo.ZEngineeringIndustryVo;
 import com.ruoyi.zdsz.mapper.ZEngineeringIndustryMapper;
 import com.ruoyi.zdsz.service.IZEngineeringIndustryService;
@@ -42,8 +43,12 @@ public class ZEngineeringIndustryServiceImpl implements IZEngineeringIndustrySer
      * 查询工业工程|市政工程
      */
     @Override
-    public ZEngineeringIndustryVo queryById(String id){
-        return baseMapper.selectVoById(id);
+    public ZEngineeringIndustryVo queryById(String id) {
+        ZEngineeringIndustryVo zEngineeringIndustryVo = baseMapper.selectVoById(id);
+        ZEngineeringNodeBo zEngineeringNodeBo = new ZEngineeringNodeBo();
+        zEngineeringNodeBo.setCivliId(id);
+        izEngineeringNodeService.queryListDetails(zEngineeringNodeBo);
+        return zEngineeringIndustryVo;
 
     }
 
@@ -87,7 +92,7 @@ public class ZEngineeringIndustryServiceImpl implements IZEngineeringIndustrySer
      * 新增工业工程|市政工程
      */
     @Override
-    @Transactional(rollbackFor=Exception.class)
+    @Transactional(rollbackFor = Exception.class)
     public Boolean insertByBo(ZEngineeringIndustryBo bo) {
         ZEngineeringIndustry add = BeanUtil.toBean(bo, ZEngineeringIndustry.class);
         validEntityBeforeSave(add);
@@ -118,7 +123,7 @@ public class ZEngineeringIndustryServiceImpl implements IZEngineeringIndustrySer
     /**
      * 保存前的数据校验
      */
-    private void validEntityBeforeSave(ZEngineeringIndustry entity){
+    private void validEntityBeforeSave(ZEngineeringIndustry entity) {
         //TODO 做一些数据校验,如唯一约束
     }
 
@@ -127,12 +132,12 @@ public class ZEngineeringIndustryServiceImpl implements IZEngineeringIndustrySer
      */
     @Override
     public Boolean deleteWithValidByIds(Collection<String> ids, Boolean isValid) {
-        if(isValid){
+        if (isValid) {
             //TODO 做一些业务上的校验,判断是否需要校验
         }
         boolean flag = false;
         Boolean b = izEngineeringNodeService.queryIdByCivliId(ids);
-        if (!b){
+        if (!b) {
             flag = baseMapper.deleteBatchIds(ids) > 0;
         }
         return flag;

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

@@ -20,6 +20,7 @@ import com.ruoyi.zdsz.service.IZEngineeringInfoService;
 import com.ruoyi.zdsz.service.IZEngineeringNodeService;
 import com.ruoyi.zdsz.service.IZEngineeringReviewService;
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
 import org.springframework.stereotype.Service;
@@ -31,6 +32,7 @@ import java.text.SimpleDateFormat;
 import java.util.*;
 
 import static cn.hutool.core.date.DateUtil.format;
+import static com.ruoyi.common.core.mapper.BaseMapperPlus.log;
 
 /**
  * 工程节点Service业务层处理
@@ -40,7 +42,7 @@ import static cn.hutool.core.date.DateUtil.format;
  */
 @RequiredArgsConstructor
 @Service
-
+@Slf4j
 public class ZEngineeringNodeServiceImpl implements IZEngineeringNodeService {
 
     private final ZEngineeringNodeMapper baseMapper;
@@ -123,19 +125,19 @@ public class ZEngineeringNodeServiceImpl implements IZEngineeringNodeService {
         return lqw;
     }
     @Override
-    @Async
+
     public String ZEngineeringReview(ZEngineeringNodeBo bo) {
-        String userId=LoginHelper.getLoginUser().getUserId().toString();
+        String userId=LoginHelper.getLoginUser().getUsername().toString();
         SimpleDateFormat formatter= new SimpleDateFormat("yyyy-MM-dd");
         Date date = new Date(System.currentTimeMillis());
-        formatter.format(date);
-        List<String>dateList= getMonthBetweenDates("2023-12","2024-01");
+
+        List<String>dateList= getMonthBetweenDates("2023-09",formatter.format(date));
         dateList.stream().forEach(item->{
             Runnable runnable=new Runnable() {
                 @Override
                 public void run( ) {
                     try {
-                        getZEngineeringNodeList(item,userId);
+                        getZEngineeringNodeList(item,userId,bo);
                         Thread.sleep(30000);
                     } catch (InterruptedException e) {
                         throw new RuntimeException(e);
@@ -147,7 +149,7 @@ public class ZEngineeringNodeServiceImpl implements IZEngineeringNodeService {
         });
         return null;
     }
-    public  List getZEngineeringNodeList(String date,String UserId)
+    public  List getZEngineeringNodeList(String date,String UserId,ZEngineeringNodeBo bo)
     {
         SimpleDateFormat format = new SimpleDateFormat("yyyy-MM");
         List<ZEngineeringNodeVo> list= new ArrayList<>();
@@ -155,9 +157,17 @@ public class ZEngineeringNodeServiceImpl implements IZEngineeringNodeService {
             Date startdate = format.parse(date);
             ZEngineeringNodeBo zEngineeringNodeBo=new ZEngineeringNodeBo();
             zEngineeringNodeBo.setCreateTime(startdate);
+            zEngineeringNodeBo.setType(bo.getType());
             SimpleDateFormat format2 = new SimpleDateFormat("yyyy_MM");
             MonthTableNameHandler.setData(format2.format(startdate));
-            list  =queryList(zEngineeringNodeBo);
+            try {
+                list  =queryList(zEngineeringNodeBo);
+            }catch (Exception e)
+            {
+                log.info("没有{}该表",format2.format(startdate));
+
+                return null ;
+            }
             List zEngineeringReviewList=new ArrayList<>();
             list.stream().forEach(item->{
                 ZEngineeringReviewBo zEngineeringReview =new ZEngineeringReviewBo();
@@ -231,6 +241,7 @@ public class ZEngineeringNodeServiceImpl implements IZEngineeringNodeService {
     public Boolean update(ZEngineeringNodeBo bo) {
         ZEngineeringNode update = BeanUtil.toBean(bo, ZEngineeringNode.class);
         validEntityBeforeSave(update);
+        bo.getzEngineeringInfoBo().setCreateTime(bo.getCreateTime());
         izEngineeringInfoService.update(bo.getzEngineeringInfoBo());
         return baseMapper.updateById(update) > 0;
     }

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

@@ -11,6 +11,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.ruoyi.zdsz.domain.ZEngineeringNode;
 import com.ruoyi.zdsz.domain.bo.ZEngineeringNodeBo;
+import com.ruoyi.zdsz.domain.vo.ZEngineeringCivilVo;
 import com.ruoyi.zdsz.domain.vo.ZEngineeringNodeVo;
 import com.ruoyi.zdsz.service.IZEngineeringNodeService;
 import lombok.RequiredArgsConstructor;
@@ -50,7 +51,8 @@ public class ZEngineeringPipeJackingServiceImpl implements IZEngineeringPipeJack
     public ZEngineeringPipeJackingVo queryById(String id){
         ZEngineeringPipeJackingVo jackingVo = baseMapper.selectVoById(id);
         ZEngineeringNodeBo bo = new ZEngineeringNodeBo();
-        bo.setCreateTime(new Date());
+        bo.setCreateTime(jackingVo.getCreateTime());
+        bo.setCivliId(jackingVo.getId());
         jackingVo.setZEngineeringNodeBoList(nodeService.queryListDetails(bo));
         return jackingVo;
     }
@@ -125,9 +127,9 @@ public class ZEngineeringPipeJackingServiceImpl implements IZEngineeringPipeJack
         boolean flag = baseMapper.insert(add) > 0;
         if (flag) {
             bo.setId(add.getId());
-            bo.getNodeBo().setCivliId(add.getId());
-            bo.getNodeBo().setCreateTime(bo.getCreateTime());
-            nodeService.insert(bo.getNodeBo());
+            bo.getzEngineeringNodeBo().setCivliId(add.getId());
+            bo.getzEngineeringNodeBo().setCreateTime(bo.getCreateTime());
+            nodeService.insert(bo.getzEngineeringNodeBo());
         }
         return flag;
     }
@@ -136,6 +138,7 @@ public class ZEngineeringPipeJackingServiceImpl implements IZEngineeringPipeJack
      * 修改顶管工程
      */
     @Override
+    @Transactional(rollbackFor=Exception.class)
     public Boolean updateByBo(ZEngineeringPipeJackingBo bo) {
         ZEngineeringPipeJacking update = BeanUtil.toBean(bo, ZEngineeringPipeJacking.class);
         validEntityBeforeSave(update);
@@ -165,9 +168,9 @@ public class ZEngineeringPipeJackingServiceImpl implements IZEngineeringPipeJack
                 update.setEnginAddre((String) civil.get(0).get("address"));
             }
         }
-        bo.getNodeBo().setCivliId(bo.getId());
-        bo.getNodeBo().setCreateTime(bo.getCreateTime());
-        nodeService.update(bo.getNodeBo());
+        bo.getzEngineeringNodeBo().setCivliId(bo.getId());
+        bo.getzEngineeringNodeBo().setCreateTime(bo.getCreateTime());
+        nodeService.update(bo.getzEngineeringNodeBo());
         return baseMapper.updateById(update) > 0;
     }
 
@@ -182,11 +185,21 @@ public class ZEngineeringPipeJackingServiceImpl implements IZEngineeringPipeJack
      * 批量删除顶管工程
      */
     @Override
+    @Transactional(rollbackFor=Exception.class)
     public Boolean deleteWithValidByIds(Collection<String> ids, Boolean isValid) {
         if(isValid){
             //TODO 做一些业务上的校验,判断是否需要校验
         }
-        nodeService.queryIdByCivliId(ids);
+        ids.forEach(item -> {
+            ZEngineeringPipeJackingVo 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/ZEngineeringReviewServiceImpl.java

@@ -53,6 +53,7 @@ public class ZEngineeringReviewServiceImpl implements IZEngineeringReviewService
         return baseMapper.selectVoById(id);
     }
 
+
     @Override
     @DynamicName(spel = "#bo.createTime")
     public ZEngineeringReviewBo query(ZEngineeringNodeBo bo) {

ruoyi-zdsz/src/main/resources/mapper/zdsz/ZEnginMaterialQualityMapper.xml

@@ -17,7 +17,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
 
     <select id="getEnginMaterialQualityList" resultType="com.ruoyi.zdsz.domain.vo.ZEnginMaterialQualityVo">
-        select * from z_engin_material_quality zc where zc.del_flag = '0'
+        select * from z_engin_material_quality zc
+        <where>
+            zc.del_flag = '0'
+            <if test="enginType != null and enginType != ''">
+                and zc.engin_type LIKE CONCAT('%',#{enginType},'%')
+            </if>
+        </where>
     </select>
 
 </mapper>

ruoyi-zdsz/src/main/resources/mapper/zdsz/ZEngineeringPipeJackingMapper.xml

@@ -33,7 +33,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 COALESCE ( unit.NAME, '无' ),
                 '-',
                 COALESCE ( house.NAME, '无' )
-            ) AS NAME
+            ) AS name
         FROM
             z_engineering_civil as m
                 left join z_area as area on area.del_flag = '0' and area.id = m.area_id