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

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

@@ -112,4 +112,10 @@ public class ZEngineeringInfoController extends BaseController {
         return R.ok(iZEngineeringInfoService.deleteById(bo));
     }
 
+    @Log(title = "施工信息删除", businessType = BusinessType.DELETE)
+    @DeleteMapping("/deleteBySZGY")
+    public R deleteBySZGY(@RequestBody  ZEngineeringInfoBo bo) {
+        return R.ok(iZEngineeringInfoService.deleteBySZGY(bo));
+    }
+
 }

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

@@ -72,6 +72,7 @@ public interface IZEngineeringInfoService {
     Boolean deleteWithValidByIds(Collection<String> ids, Boolean isValid);
     Boolean delete(ZEngineeringNodeBo bo);
     Boolean deleteById(ZEngineeringInfoBo bo);
+    Boolean deleteBySZGY(ZEngineeringInfoBo bo);
     Boolean deleteByIdNoDelFiles(ZEngineeringInfoBo bo);
     List<ZEngineeringMaterialBo> getzEngineeringMaterialBoList(ZEngineeringNodeBo bo);
 

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

@@ -77,6 +77,9 @@ public class ZEngineeringGYServiceImpl implements IZEngineeringGYService {
         zEngineeringNodeBo.setCreateTime(zEngineeringIndustryVo.getCreateTime());
         List<ZEngineeringNodeBo> zEngineeringNodeBos = izEngineeringNodeService.queryListDetails(zEngineeringNodeBo);
         zEngineeringIndustryVo.setZEngineeringNodeBoList(zEngineeringNodeBos);
+        ArrayList<ZEngineeringGYVo> list = new ArrayList<>();
+        list.add(zEngineeringIndustryVo);
+        zEngineeringIndustryVo.setNodeReViewStateList(nodeService.ReViewGYList(list)!=null?nodeService.ReViewGYList(list).get(zEngineeringIndustryVo.getId()):Collections.EMPTY_LIST);
         return zEngineeringIndustryVo;
     }
 
@@ -204,47 +207,14 @@ public class ZEngineeringGYServiceImpl implements IZEngineeringGYService {
         boolean flag = baseMapper.updateById(update) > 0;
         ZEngineeringGYVo voById = baseMapper.selectVoById(bo.getId());
         bo.setCreateTime(voById.getCreateTime());
-        if (flag) {
-            List<ZEngiineeringPhoto> list = new ArrayList<>();
-            // 查询数据库中已存在的文件列表
-            ZEngiineeringPhotoBo zEngiineeringPhotoBo = new ZEngiineeringPhotoBo();
-            zEngiineeringPhotoBo.setParentId(update.getId());
-            zEngiineeringPhotoBo.setCreateTime(bo.getCreateTime());
-            List<String> existingPhotos = photoService.queryList(zEngiineeringPhotoBo).stream().map(ZEngiineeringPhotoVo::getPicUrl).collect(Collectors.toList());
-            // 插入前端传来的新文件
-            if (!ObjectUtils.isEmpty(bo.getFiles())) {
-                for (ZFileBo pic : bo.getFiles()) {
-                    if (!existingPhotos.contains(pic.getUrl())) {
-                        ZEngiineeringPhoto newPhoto = new ZEngiineeringPhoto();
-                        newPhoto.setParentId(bo.getId());
-                        newPhoto.setPicUrl(pic.getUrl());
-                        newPhoto.setFileName(pic.getName());
-                        newPhoto.setCreateBy(String.valueOf(LoginHelper.getUserId()));
-                        newPhoto.setCreateTime(bo.getCreateTime());
-                        newPhoto.setUpdateTime(new Date());
-                        list.add(newPhoto);
-                    }
-                }
-                // 删除数据库中多余的文件
-                List<String> photosToDelete = existingPhotos.stream().filter(pic -> !bo.getFiles().stream().map(ZFileBo::getUrl).collect(Collectors.toList()).contains(pic)).collect(Collectors.toList());
-                if (!photosToDelete.isEmpty()) {
-                    photosToDelete.forEach(item -> {
-                        ZEngiineeringPhoto zEngiineeringPhoto = new ZEngiineeringPhoto();
-                        zEngiineeringPhoto.setPicUrl(item);
-                        zEngiineeringPhoto.setCreateTime(bo.getCreateTime());
-                        photoService.deleteWithValid(zEngiineeringPhoto);
-                    });
-                }
-                // 批量插入新图片
-                if (!list.isEmpty()) {
-                    photoService.insertBatch(list);
-                }
-            }
-        }
         //节点表与info表
         if (!ObjectUtils.isEmpty(bo.getzEngineeringNodeBo())) {
             bo.getzEngineeringNodeBo().setCreateTime(voById.getCreateTime());
-            izEngineeringNodeService.update(bo.getzEngineeringNodeBo());
+            if (!ObjectUtils.isEmpty(bo.getzEngineeringNodeBo().getzEngineeringInfoBoList())) {
+                izEngineeringNodeService.updateMuch(bo.getzEngineeringNodeBo());
+            } else {
+                izEngineeringNodeService.update(bo.getzEngineeringNodeBo());
+            }
         }
         return flag;
     }

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

@@ -18,6 +18,7 @@ import com.ruoyi.zdsz.domain.ZEngiineeringPhoto;
 import com.ruoyi.zdsz.domain.ZEngineeringIndustry;
 import com.ruoyi.zdsz.domain.bo.*;
 import com.ruoyi.zdsz.domain.vo.ZEngiineeringPhotoVo;
+import com.ruoyi.zdsz.domain.vo.ZEngineeringGYVo;
 import com.ruoyi.zdsz.domain.vo.ZEngineeringIndustryTypeVo;
 import com.ruoyi.zdsz.domain.vo.ZEngineeringIndustryVo;
 import com.ruoyi.zdsz.mapper.ZEngineeringCivilMapper;
@@ -386,6 +387,9 @@ public class ZEngineeringIndustryServiceImpl implements IZEngineeringIndustrySer
         zEngineeringNodeBo.setCreateTime(zEngineeringIndustryVo.getCreateTime());
         List<ZEngineeringNodeBo> zEngineeringNodeBos = izEngineeringNodeService.queryListDetails(zEngineeringNodeBo);
         zEngineeringIndustryVo.setZEngineeringNodeBoList(zEngineeringNodeBos);
+        ArrayList<ZEngineeringIndustryVo> list = new ArrayList<>();
+        list.add(zEngineeringIndustryVo);
+        zEngineeringIndustryVo.setNodeReViewStateList(nodeService.ReViewSZList(list)!=null?nodeService.ReViewSZList(list).get(zEngineeringIndustryVo.getId()):Collections.EMPTY_LIST);
         return zEngineeringIndustryVo;
     }
 
@@ -507,47 +511,14 @@ public class ZEngineeringIndustryServiceImpl implements IZEngineeringIndustrySer
         boolean flag = baseMapper.updateById(update) > 0;
         ZEngineeringIndustryVo voById = baseMapper.selectVoById(bo.getId());
         bo.setCreateTime(voById.getCreateTime());
-        if (flag) {
-            List<ZEngiineeringPhoto> list = new ArrayList<>();
-            // 查询数据库中已存在的文件列表
-            ZEngiineeringPhotoBo zEngiineeringPhotoBo = new ZEngiineeringPhotoBo();
-            zEngiineeringPhotoBo.setParentId(update.getId());
-            zEngiineeringPhotoBo.setCreateTime(bo.getCreateTime());
-            List<String> existingPhotos = photoService.queryList(zEngiineeringPhotoBo).stream().map(ZEngiineeringPhotoVo::getPicUrl).collect(Collectors.toList());
-            // 插入前端传来的新文件
-            if (!ObjectUtils.isEmpty(bo.getFiles())) {
-                for (ZFileBo pic : bo.getFiles()) {
-                    if (!existingPhotos.contains(pic.getUrl())) {
-                        ZEngiineeringPhoto newPhoto = new ZEngiineeringPhoto();
-                        newPhoto.setParentId(bo.getId());
-                        newPhoto.setPicUrl(pic.getUrl());
-                        newPhoto.setFileName(pic.getName());
-                        newPhoto.setCreateBy(String.valueOf(LoginHelper.getUserId()));
-                        newPhoto.setCreateTime(bo.getCreateTime());
-                        newPhoto.setUpdateTime(new Date());
-                        list.add(newPhoto);
-                    }
-                }
-                // 删除数据库中多余的文件
-                List<String> photosToDelete = existingPhotos.stream().filter(pic -> !bo.getFiles().stream().map(ZFileBo::getUrl).collect(Collectors.toList()).contains(pic)).collect(Collectors.toList());
-                if (!photosToDelete.isEmpty()) {
-                    photosToDelete.forEach(item -> {
-                        ZEngiineeringPhoto zEngiineeringPhoto = new ZEngiineeringPhoto();
-                        zEngiineeringPhoto.setPicUrl(item);
-                        zEngiineeringPhoto.setCreateTime(bo.getCreateTime());
-                        photoService.deleteWithValid(zEngiineeringPhoto);
-                    });
-                }
-                // 批量插入新图片
-                if (!list.isEmpty()) {
-                    photoService.insertBatch(list);
-                }
-            }
-        }
         //节点表与info表
         if (!ObjectUtils.isEmpty(bo.getzEngineeringNodeBo())) {
             bo.getzEngineeringNodeBo().setCreateTime(voById.getCreateTime());
-            izEngineeringNodeService.update(bo.getzEngineeringNodeBo());
+            if (!ObjectUtils.isEmpty(bo.getzEngineeringNodeBo().getzEngineeringInfoBoList())) {
+                izEngineeringNodeService.updateMuch(bo.getzEngineeringNodeBo());
+            } else {
+                izEngineeringNodeService.update(bo.getzEngineeringNodeBo());
+            }
         }
         return flag;
     }

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

@@ -1209,6 +1209,28 @@ public class ZEngineeringInfoServiceImpl implements IZEngineeringInfoService {
         return null;
     }
 
+
+    @Override
+    @DynamicName(spel = "#bo.createTime")
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean deleteBySZGY(ZEngineeringInfoBo bo) {
+        ZEngineeringInfo info = baseMapper.selectById(bo.getId());
+        ZEngineeringInfoBo zEngineeringInfobo =  BeanUtil.toBean(info, ZEngineeringInfoBo.class);
+        izEngiineeringPhotoService.delete(zEngineeringInfobo);
+        izEngineeringMaterialService.delete(zEngineeringInfobo);
+        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy_MM");
+        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);
+        if (zEngineeringInfoList.isEmpty()) {
+            izEngineeringReviewService.deleteByNodeId(zEngineeringInfobo);
+        }
+        MonthTableNameHandler.removeData();
+        return true;
+    }
+
     @Override
     @DynamicName(spel = "#bo.createTime")
     @Transactional(rollbackFor = Exception.class)

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

@@ -1052,7 +1052,12 @@ public class ZEngineeringNodeServiceImpl implements IZEngineeringNodeService {
                 }
             });
             List stateList = new ArrayList();
-            List<SysDictData> list = sysDictMap.get(item.getEnginType() + "_" + item.getEnginClassification());
+            List<SysDictData> list = Collections.EMPTY_LIST;
+            if (item.getEnginClassification().equals("pressure_regulating")) {
+                list = sysDictMap.get("gy_tyg");
+            } else {
+                list = sysDictMap.get(item.getEnginType() + "_" + item.getEnginClassification());
+            }
             if (list != null && !list.isEmpty()) {
                 list.stream().forEach(item3 -> {
                     Map<String, Object> map = new HashMap<>();