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

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

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

@@ -102,16 +102,6 @@ public class ZEngineeringCivilController extends BaseController {
     public R<Void> add(@Validated(AddGroup.class) @RequestBody ZEngineeringCivilBo bo) {
         return toAjax(iZEngineeringCivilService.insertByBo(bo));
     }
-    /**
-     * 新增民用工程
-     */
-    @SaCheckPermission("zdsz:engineeringCivil:add")
-    @Log(title = "民用工程", businessType = BusinessType.INSERT)
-    @RepeatSubmit()
-    @PostMapping("add")
-    public R<Void> addList(@Validated(AddGroup.class) @RequestBody ZEngineeringCivilBo bo) {
-        return toAjax(iZEngineeringCivilService.insertByBo(bo));
-    }
 
     /**
      * 修改民用工程

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

@@ -58,7 +58,7 @@ public class ZEngineeringPipeJackingController extends BaseController {
      * @param bo
      * @return
      */
-    @GetMapping("/nameList")
+    @GetMapping("/queryListNew")
     public R<List<Map<String,Object>>> nameList(ZEngineeringPipeJackingBo bo) {
         return R.ok(iZEngineeringPipeJackingService.nameList(bo));
     }

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

@@ -112,7 +112,7 @@ public class ZEngineeringReviewController extends BaseController {
         return toAjax(iZEngineeringReviewService.deleteWithValidByIds(Arrays.asList(ids), true));
     }
     /**
-     * 删除工程审核
+     * 批量审核
      *
      * @param ids 主键串
      */
@@ -120,7 +120,6 @@ public class ZEngineeringReviewController extends BaseController {
     @Log(title = "工程审核", businessType = BusinessType.DELETE)
     @GetMapping("/ZEngineeringReview")
     public R ZEngineeringReview(ZEngineeringNodeBo bo) {
-
         return R.ok(izEngineeringNodeService.ZEngineeringReview(bo));
     }
 }

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

@@ -51,8 +51,8 @@ public class ZUnitController extends BaseController {
      * @return
      */
     @GetMapping("/getUnitList")
-    public R getUnitList(@RequestParam("areaId") String areaId, @RequestParam("buildingId") String buildingId) {
-        return R.ok(iZUnitService.getUnitList(areaId, buildingId));
+    public R getUnitList(@RequestParam("buildingId") String buildingId) {
+        return R.ok(iZUnitService.getUnitList(buildingId));
     }
 
     /**

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

@@ -2,6 +2,7 @@ package com.ruoyi.zdsz.domain.bo;
 
 import com.ruoyi.common.core.validate.AddGroup;
 import com.ruoyi.common.core.validate.EditGroup;
+import com.ruoyi.zdsz.domain.vo.ZEngiineeringPhotoVo;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import javax.validation.constraints.*;
@@ -244,13 +245,13 @@ public class ZEngineeringDangerousBo extends BaseEntity {
         this.zEngineeringNodeBo = zEngineeringNodeBo;
     }
 
-    public List<ZFileBo> getFiles() {
-        return files;
-    }
+    private List<ZEngiineeringPhotoVo> pics;
 
-    public void setFiles(List<ZFileBo> files) {
-        this.files = files;
+    public List<ZEngiineeringPhotoVo> getPics() {
+        return pics;
     }
 
-    private List<ZFileBo> files;
+    public void setPics(List<ZEngiineeringPhotoVo> pics) {
+        this.pics = pics;
+    }
 }

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

@@ -101,4 +101,14 @@ public class ZEngineeringInfrastructureBo extends BaseEntity {
     public void setzEngineeringNodeBoList(List<ZEngineeringNodeBo> zEngineeringNodeBoList) {
         this.zEngineeringNodeBoList = zEngineeringNodeBoList;
     }
+
+    private List<ZFileBo> files;
+
+    public List<ZFileBo> getFiles() {
+        return files;
+    }
+
+    public void setFiles(List<ZFileBo> files) {
+        this.files = files;
+    }
 }

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

@@ -8,6 +8,7 @@ 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 com.ruoyi.zdsz.service.IZEngiineeringPhotoService;
 import lombok.Data;
 import java.util.Date;
 
@@ -102,4 +103,14 @@ public class ZEngineeringInfrastructureVo extends BaseEntity implements Serializ
     public void setzEngineeringNodeBo(ZEngineeringNodeBo zEngineeringNodeBo) {
         this.zEngineeringNodeBo = zEngineeringNodeBo;
     }
+
+    private List<ZEngiineeringPhotoVo> pics;
+
+    public List<ZEngiineeringPhotoVo> getPics() {
+        return pics;
+    }
+
+    public void setPics(List<ZEngiineeringPhotoVo> pics) {
+        this.pics = pics;
+    }
 }

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/mapper/ZUnitMapper.java

@@ -20,5 +20,5 @@ import java.util.List;
 public interface ZUnitMapper extends BaseMapperPlus<ZUnitMapper, ZUnit, ZUnitVo> {
     Page<ZUnitVo> getPageList(@Param("p") ZUnitBo bo, Page<?> page);
 
-    List<ZUnitVo> getUnitList(@Param("areaId")String areaId,@Param("buildingId") String buildingId);
+    List<ZUnitVo> getUnitList(@Param("buildingId") String buildingId);
 }

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

@@ -21,7 +21,7 @@ public interface IZUnitService {
     /**
      * 单元下拉
      * */
-    List<ZUnitVo> getUnitList(String areaId,String buildingId);
+    List<ZUnitVo> getUnitList(String buildingId);
 
 
     /**

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

@@ -168,8 +168,12 @@ public class ZEngineeringCivilServiceImpl implements IZEngineeringCivilService {
         } else {
             if (ObjectUtils.isEmpty(bo.getzEngineeringNodeBo())) {
                 for (ZEngineeringNodeBo zEngineeringNodeBo : bo.getzEngineeringNodeBoList()) {
-                    zEngineeringNodeBo.setCivliId(add.getId());
-                    zEngineeringNodeBo.setCreateTime(add.getCreateTime());
+                    zEngineeringNodeBo.setCivliId(zEngineeringCivilVo.getId());
+                    zEngineeringNodeBo.setCreateTime(zEngineeringCivilVo.getCreateTime());
+                    ZEngineeringNodeBo query = zEngineeringNodeService.query(zEngineeringNodeBo);
+                    if (!ObjectUtils.isEmpty(query)){
+                        zEngineeringNodeBo.setId(query.getId());
+                    }
                     zEngineeringNodeService.insert(zEngineeringNodeBo);
                 }
 
@@ -200,9 +204,11 @@ public class ZEngineeringCivilServiceImpl implements IZEngineeringCivilService {
         if (flag) {
             ZEngineeringCivilVo zEngineeringCivilVo = baseMapper.selectVoById(update.getId());
             ZEngineeringNodeBo zEngineeringNodeBo = bo.getzEngineeringNodeBo();
-            zEngineeringNodeBo.setCivliId(zEngineeringCivilVo.getId());
-            zEngineeringNodeBo.setCreateTime(zEngineeringCivilVo.getCreateTime());
-            zEngineeringNodeService.update(zEngineeringNodeBo);
+            if (!ObjectUtils.isEmpty(zEngineeringNodeBo)){
+                zEngineeringNodeBo.setCivliId(zEngineeringCivilVo.getId());
+                zEngineeringNodeBo.setCreateTime(zEngineeringCivilVo.getCreateTime());
+                zEngineeringNodeService.update(zEngineeringNodeBo);
+            }
         }
         return flag;
     }

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

@@ -116,10 +116,10 @@ public class ZEngineeringDangerousServiceImpl implements IZEngineeringDangerousS
         ZEngineeringNode entity = izEngineeringNodeService.insert(bo.getzEngineeringNodeBo());
         if (!ObjectUtil.isEmpty(entity)) {
             List<ZEngiineeringPhoto> list = new ArrayList<>();
-            bo.getFiles().stream().forEach(o -> {
+            bo.getPics().stream().forEach(o -> {
                 ZEngiineeringPhoto pic = new ZEngiineeringPhoto();
                 pic.setParentId(bo.getId());
-                pic.setPicUrl(o.getUrl());
+                pic.setPicUrl(o.getPicUrl());
                 pic.setUpdateBy(String.valueOf(LoginHelper.getUserId()));
                 pic.setUpdateTime(new Date());
                 pic.setCreateTime(bo.getCreateTime());
@@ -159,12 +159,12 @@ public class ZEngineeringDangerousServiceImpl implements IZEngineeringDangerousS
                 .collect(Collectors.toList());
 
             // 插入前端传来的新文件
-            for (ZFileBo pic : bo.getFiles()) {
-                if (!existingPhotos.contains(pic.getUrl())) {
+            for (ZEngiineeringPhotoVo pic : bo.getPics()) {
+                if (!existingPhotos.contains(pic.getPicUrl())) {
                     ZEngiineeringPhoto newPhoto = new ZEngiineeringPhoto();
                     newPhoto.setParentId(bo.getId());
-                    newPhoto.setPicUrl(pic.getUrl());
-                    newPhoto.setFileName(pic.getName());
+                    newPhoto.setPicUrl(pic.getPicUrl());
+                    newPhoto.setFileName(pic.getFileName());
                     newPhoto.setCreateBy(String.valueOf(LoginHelper.getUserId()));
                     newPhoto.setCreateTime(new Date());
                     list.add(newPhoto);
@@ -173,7 +173,7 @@ public class ZEngineeringDangerousServiceImpl implements IZEngineeringDangerousS
 
             // 删除数据库中多余的文件
             List<String> photosToDelete = existingPhotos.stream()
-                .filter(pic -> !bo.getFiles().stream().map(ZFileBo::getUrl).collect(Collectors.toList()).contains(pic))
+                .filter(pic -> !bo.getPics().stream().map(ZEngiineeringPhotoVo::getPicUrl).collect(Collectors.toList()).contains(pic))
                 .collect(Collectors.toList());
             if (!photosToDelete.isEmpty()) {
                 photosToDelete.forEach(item -> {
@@ -242,13 +242,13 @@ public class ZEngineeringDangerousServiceImpl implements IZEngineeringDangerousS
         if (flag) {
             bo.setId(add.getId());
         }
-        if (!bo.getFiles().isEmpty()) {
+        if (!bo.getPics().isEmpty()) {
             List<ZEngiineeringPhoto> list = new ArrayList<>();
-            bo.getFiles().stream().forEach(o -> {
+            bo.getPics().stream().forEach(o -> {
                 ZEngiineeringPhoto pic = new ZEngiineeringPhoto();
                 pic.setParentId(bo.getId());
-                pic.setPicUrl(o.getUrl());
-                pic.setFileName(o.getName());
+                pic.setPicUrl(o.getPicUrl());
+                pic.setFileName(o.getFileName());
                 pic.setCreateBy(String.valueOf(LoginHelper.getUserId()));
                 pic.setCreateTime(new Date());
                 pic.setUpdateBy(String.valueOf(LoginHelper.getUserId()));
@@ -281,12 +281,12 @@ public class ZEngineeringDangerousServiceImpl implements IZEngineeringDangerousS
                 .collect(Collectors.toList());
 
             // 插入前端传来的新文件
-            for (ZFileBo pic : bo.getFiles()) {
-                if (!existingPhotos.contains(pic.getUrl())) {
+            for (ZEngiineeringPhotoVo pic : bo.getPics()) {
+                if (!existingPhotos.contains(pic.getPicUrl())) {
                     ZEngiineeringPhoto newPhoto = new ZEngiineeringPhoto();
                     newPhoto.setParentId(bo.getId());
-                    newPhoto.setPicUrl(pic.getUrl());
-                    newPhoto.setFileName(pic.getName());
+                    newPhoto.setPicUrl(pic.getPicUrl());
+                    newPhoto.setFileName(pic.getFileName());
                     newPhoto.setCreateBy(String.valueOf(LoginHelper.getUserId()));
                     newPhoto.setCreateTime(new Date());
                     list.add(newPhoto);
@@ -295,7 +295,7 @@ public class ZEngineeringDangerousServiceImpl implements IZEngineeringDangerousS
 
             // 删除数据库中多余的文件
             List<String> photosToDelete = existingPhotos.stream()
-                .filter(pic -> !bo.getFiles().stream().map(ZFileBo::getUrl).collect(Collectors.toList()).contains(pic))
+                .filter(pic -> !bo.getPics().stream().map(ZEngiineeringPhotoVo::getPicUrl).collect(Collectors.toList()).contains(pic))
                 .collect(Collectors.toList());
             if (!photosToDelete.isEmpty()) {
                 photosToDelete.forEach(item -> {

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

@@ -27,9 +27,13 @@ import lombok.RequiredArgsConstructor;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.ObjectUtils;
 
 import javax.annotation.Resource;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
 
 /**
  * 工程详情Service业务层处理
@@ -50,11 +54,12 @@ public class ZEngineeringInfoServiceImpl implements IZEngineeringInfoService {
     private ISysUserService sysUserService;
     @Resource
     private IZEngineeringReviewService izEngineeringReviewService;
+
     /**
      * 查询工程详情
      */
     @Override
-    public ZEngineeringInfoVo queryById(String id){
+    public ZEngineeringInfoVo queryById(String id) {
         return baseMapper.selectVoById(id);
     }
 
@@ -62,20 +67,22 @@ public class ZEngineeringInfoServiceImpl implements IZEngineeringInfoService {
     @DynamicName(spel = "#bo.createTime")
     public List<ZEngineeringInfoBo> query(ZEngineeringNodeBo bo) {
         LambdaQueryWrapper<ZEngineeringInfo> lqw = Wrappers.lambdaQuery();
-        List<ZEngineeringInfo> zEngineeringInfoVoList= baseMapper.selectList(lqw.eq(StringUtils.isNotBlank(bo.getId()), ZEngineeringInfo::getEngInfoId, bo.getId()));
-        List<ZEngineeringInfoBo> zEngineeringInfoBoList=new ArrayList<>();
-        zEngineeringInfoVoList.stream().forEach(item->{
+        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.selectUserByUserName(item.getCreateBy());
-            zEngineeringInfoBo1.setHeadName(sysUser.getNickName());
-            zEngineeringInfoBo1.setConstructUser(sysUser.getNickName());
-            zEngineeringInfoBo1.setHeadPhone(sysUser.getPhonenumber());
-            zEngineeringInfoBo1.setConstructPhone(sysUser.getPhonenumber());
-            List<String> photoList=izEngiineeringPhotoService.queryList(zEngineeringInfoBo1);
-            List<ZEngineeringMaterialBo> zEngineeringMaterialBo=izEngineeringMaterialService.query(zEngineeringInfoBo1);
+            SysUser sysUser = sysUserService.selectUserByUserName(item.getCreateBy());
+            if (!ObjectUtils.isEmpty(sysUser)) {
+                zEngineeringInfoBo1.setHeadName(sysUser.getNickName());
+                zEngineeringInfoBo1.setConstructUser(sysUser.getNickName());
+                zEngineeringInfoBo1.setHeadPhone(sysUser.getPhonenumber());
+                zEngineeringInfoBo1.setConstructPhone(sysUser.getPhonenumber());
+            }
+            List<String> photoList = izEngiineeringPhotoService.queryList(zEngineeringInfoBo1);
+            List<ZEngineeringMaterialBo> zEngineeringMaterialBo = izEngineeringMaterialService.query(zEngineeringInfoBo1);
             zEngineeringInfoBo1.setzEngiineeringPhotoBoList(photoList);
             zEngineeringInfoBo1.setzEngineeringMaterialBo(zEngineeringMaterialBo);
-            ZEngineeringReviewBo zEngineeringReviewbo=izEngineeringReviewService.query(bo);
+            ZEngineeringReviewBo zEngineeringReviewbo = izEngineeringReviewService.query(bo);
             zEngineeringInfoBo1.setzEngineeringReviewBo(zEngineeringReviewbo);
             zEngineeringInfoBoList.add(zEngineeringInfoBo1);
         });
@@ -131,14 +138,16 @@ public class ZEngineeringInfoServiceImpl implements IZEngineeringInfoService {
         }
         return flag;
     }
+
     /**
-     *  新增工程详情(节点使用)
+     * 新增工程详情(节点使用)
+     *
      * @param bo
      * @return ZEngineeringInfo
      */
     @Override
     @DynamicName(spel = "#bo.createTime")
-    @Transactional(rollbackFor=Exception.class)
+    @Transactional(rollbackFor = Exception.class)
 
     public ZEngineeringInfo insert(ZEngineeringInfoBo bo) {
         ZEngineeringInfo add = BeanUtil.toBean(bo, ZEngineeringInfo.class);
@@ -158,16 +167,17 @@ public class ZEngineeringInfoServiceImpl implements IZEngineeringInfoService {
             izEngineeringMaterialService.insert(item);
         });
         }
-        List <ZEngiineeringPhoto> photoList=new ArrayList();
-            bo.getzEngiineeringPhotoBoList().stream().forEach(item->{
-            ZEngiineeringPhoto zEngiineeringPhoto=new ZEngiineeringPhoto();
+        List<ZEngiineeringPhoto> photoList = new ArrayList();
+        bo.getzEngiineeringPhotoBoList().forEach(item -> {
+            ZEngiineeringPhoto zEngiineeringPhoto = new ZEngiineeringPhoto();
             zEngiineeringPhoto.setParentId(add.getId());
             zEngiineeringPhoto.setPicUrl(item);
             zEngiineeringPhoto.setCreateTime(bo.getCreateTime());
             zEngiineeringPhoto.setUpdateTime(new Date());
                 photoList.add(zEngiineeringPhoto);
         });
-        izEngiineeringPhotoService.insertBatch(photoList);
+        if (photoList.size() > 0)
+            izEngiineeringPhotoService.insertBatch(photoList);
         return add;
     }
 
@@ -186,9 +196,9 @@ public class ZEngineeringInfoServiceImpl implements IZEngineeringInfoService {
     public Boolean update(ZEngineeringInfoBo bo) {
         ZEngineeringInfo update = BeanUtil.toBean(bo, ZEngineeringInfo.class);
         validEntityBeforeSave(update);
-        List <ZEngiineeringPhoto> photoList=new ArrayList();
-        bo.getzEngiineeringPhotoBoList().stream().forEach(item->{
-            ZEngiineeringPhoto zEngiineeringPhoto=new ZEngiineeringPhoto();
+        List<ZEngiineeringPhoto> photoList = new ArrayList();
+        bo.getzEngiineeringPhotoBoList().stream().forEach(item -> {
+            ZEngiineeringPhoto zEngiineeringPhoto = new ZEngiineeringPhoto();
             zEngiineeringPhoto.setParentId(update.getId());
             zEngiineeringPhoto.setPicUrl(item);
             zEngiineeringPhoto.setCreateTime(bo.getCreateTime());
@@ -202,7 +212,7 @@ public class ZEngineeringInfoServiceImpl implements IZEngineeringInfoService {
     /**
      * 保存前的数据校验
      */
-    private void validEntityBeforeSave(ZEngineeringInfo entity){
+    private void validEntityBeforeSave(ZEngineeringInfo entity) {
         //TODO 做一些数据校验,如唯一约束
     }
 
@@ -211,7 +221,7 @@ public class ZEngineeringInfoServiceImpl implements IZEngineeringInfoService {
      */
     @Override
     public Boolean deleteWithValidByIds(Collection<String> ids, Boolean isValid) {
-        if(isValid){
+        if (isValid) {
             //TODO 做一些业务上的校验,判断是否需要校验
         }
         return baseMapper.deleteBatchIds(ids) > 0;
@@ -223,8 +233,8 @@ public class ZEngineeringInfoServiceImpl implements IZEngineeringInfoService {
     public Boolean delete(ZEngineeringNodeBo bo) {
         LambdaQueryWrapper<ZEngineeringInfo> lqw = Wrappers.lambdaQuery();
         lqw.eq(StringUtils.isNotBlank(bo.getId()), ZEngineeringInfo::getEngInfoId, bo.getId());
-        List<ZEngineeringInfo> zEngineeringInfo= baseMapper.selectList(lqw);
-        zEngineeringInfo.stream().forEach(item->{
+        List<ZEngineeringInfo> zEngineeringInfo = baseMapper.selectList(lqw);
+        zEngineeringInfo.stream().forEach(item -> {
             ZEngineeringInfoBo zEngineeringInfobo = BeanUtil.toBean(item, ZEngineeringInfoBo.class);
             izEngiineeringPhotoService.delete(zEngineeringInfobo);
             izEngineeringMaterialService.delete(zEngineeringInfobo);
@@ -237,10 +247,10 @@ public class ZEngineeringInfoServiceImpl implements IZEngineeringInfoService {
     public List<ZEngineeringMaterialBo> getzEngineeringMaterialBoList(ZEngineeringNodeBo bo) {
         LambdaQueryWrapper<ZEngineeringInfo> lqw = Wrappers.lambdaQuery();
         lqw.eq(StringUtils.isNotBlank(bo.getId()), ZEngineeringInfo::getEngInfoId, bo.getId());
-        List<ZEngineeringInfo> zEngineeringInfo= baseMapper.selectList(lqw);
-        List<ZEngineeringMaterialBo> zEngineeringMaterialBoList=new ArrayList<>();
+        List<ZEngineeringInfo> zEngineeringInfo = baseMapper.selectList(lqw);
+        List<ZEngineeringMaterialBo> zEngineeringMaterialBoList = new ArrayList<>();
 
-        zEngineeringInfo.stream().forEach(item->{
+        zEngineeringInfo.stream().forEach(item -> {
             ZEngineeringInfoBo zEngineeringInfoBo = BeanUtil.toBean(item, ZEngineeringInfoBo.class);
             zEngineeringMaterialBoList.addAll(izEngineeringMaterialService.query(zEngineeringInfoBo));
         });

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

@@ -1,22 +1,20 @@
 package com.ruoyi.zdsz.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
+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;
 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.ZEngiineeringPhoto;
 import com.ruoyi.zdsz.domain.ZEngineeringInfrastructure;
-import com.ruoyi.zdsz.domain.bo.ZEngineeringInfoBo;
-import com.ruoyi.zdsz.domain.bo.ZEngineeringInfrastructureBo;
-import com.ruoyi.zdsz.domain.bo.ZEngineeringNodeBo;
-import com.ruoyi.zdsz.domain.bo.ZEngineeringReviewBo;
-import com.ruoyi.zdsz.domain.vo.ZEngineeringInfrastructureSelectVo;
-import com.ruoyi.zdsz.domain.vo.ZEngineeringInfrastructureVo;
-import com.ruoyi.zdsz.domain.vo.ZEngineeringNodeVo;
-import com.ruoyi.zdsz.domain.vo.ZEngineeringReviewVo;
+import com.ruoyi.zdsz.domain.ZEngineeringPipeJacking;
+import com.ruoyi.zdsz.domain.bo.*;
+import com.ruoyi.zdsz.domain.vo.*;
 import com.ruoyi.zdsz.mapper.ZEngineeringInfrastructureMapper;
+import com.ruoyi.zdsz.service.IZEngiineeringPhotoService;
 import com.ruoyi.zdsz.service.IZEngineeringInfrastructureService;
 import com.ruoyi.zdsz.service.IZEngineeringNodeService;
 import com.ruoyi.zdsz.service.IZEngineeringReviewService;
@@ -27,6 +25,7 @@ import org.springframework.util.ObjectUtils;
 
 import javax.annotation.Resource;
 import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * 基建工程Service业务层处理
@@ -43,6 +42,8 @@ public class ZEngineeringInfrastructureServiceImpl implements IZEngineeringInfra
 
     @Resource
     private final IZEngineeringNodeService izEngineeringNodeService;
+    @Resource
+    private IZEngiineeringPhotoService photoService;
 
     @Resource
     private final IZEngineeringReviewService izEngineeringReviewService;
@@ -58,6 +59,12 @@ public class ZEngineeringInfrastructureServiceImpl implements IZEngineeringInfra
         zEngineeringNodeBo.setCivliId(vo.getId());
         vo.setzEngineeringNodeBoList(izEngineeringNodeService.queryListDetails(zEngineeringNodeBo));
         List<ZEngineeringNodeBo> nodeList = vo.getzEngineeringNodeBoList();
+        //文件
+        ZEngiineeringPhotoBo bo1 = new ZEngiineeringPhotoBo();
+        bo1.setParentId(vo.getId());
+        bo1.setCreateTime(vo.getCreateTime());
+        vo.setPics(photoService.queryList(bo1));
+
         if(nodeList != null && nodeList.size() > 0){
             for (ZEngineeringNodeBo node : nodeList) {
                 String type = node.getType();
@@ -189,10 +196,68 @@ public class ZEngineeringInfrastructureServiceImpl implements IZEngineeringInfra
                 }
                 izEngineeringNodeService.insert(bo.getzEngineeringNodeBo());
             }
+            //文件集合
+            if (!bo.getFiles().isEmpty()){
+                List<ZEngiineeringPhoto> list = new ArrayList<>();
+                bo.getFiles().forEach(o->{
+                    ZEngiineeringPhoto pic = new ZEngiineeringPhoto();
+                    pic.setParentId(bo.getId());
+                    pic.setPicUrl(o.getUrl());
+                    pic.setFileName(o.getName());
+                    pic.setCreateBy(String.valueOf(LoginHelper.getUserId()));
+                    pic.setCreateTime(new Date());
+                    pic.setUpdateBy(String.valueOf(LoginHelper.getUserId()));
+                    pic.setUpdateTime(new Date());
+                    list.add(pic);
+                });
+                if (!list.isEmpty()) {
+                    photoService.insertBatch(list);
+                }
+            }
         }
         return flag;
     }
+    private void doPhotos(ZEngineeringInfrastructure update, ZEngineeringInfrastructureBo bo) {
+        List<ZEngiineeringPhoto> list = new ArrayList<>();
+
+        // 查询数据库中已存在的文件列表
+        ZEngiineeringPhotoBo bo1 = new ZEngiineeringPhotoBo();
+        bo1.setParentId(update.getId());
+        bo1.setCreateTime(update.getCreateTime());
+        List<String> existingPhotos = photoService.queryList(bo1).stream()
+            .map(ZEngiineeringPhotoVo::getPicUrl)
+            .collect(Collectors.toList());
+
+        // 插入前端传来的新文件
+        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(new Date());
+                newPhoto.setUpdateBy(String.valueOf(LoginHelper.getUserId()));
+                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->{
+                photoService.deleteWithValidByurls(item);
+            });
+        }
 
+        // 批量插入新图片
+        if (!list.isEmpty()) {
+            photoService.insertBatch(list);
+        }
+    }
     /**
      * 新增基建工程审核
      */
@@ -221,8 +286,8 @@ public class ZEngineeringInfrastructureServiceImpl implements IZEngineeringInfra
         boolean flag = baseMapper.updateById(update) > 0;
         if (flag) {
             ZEngineeringInfrastructureVo vo = baseMapper.selectVoById(update.getId());
-
-
+            //文件
+            this.doPhotos(update,bo);
             List<ZEngineeringNodeBo> nodeBoList = bo.getzEngineeringNodeBoList();
             if(nodeBoList != null && nodeBoList.size() != 0){
                 for (ZEngineeringNodeBo nodeBo:nodeBoList) {

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

@@ -135,7 +135,7 @@ public class ZEngineeringPipeJackingServiceImpl implements IZEngineeringPipeJack
         validEntityBeforeSave(add);
 
         LambdaQueryWrapper<ZEngineeringPipeJacking> lqw = Wrappers.lambdaQuery();
-        lqw.like(StringUtils.isNotBlank(bo.getEnginId()), ZEngineeringPipeJacking::getEnginId, bo.getEnginId());
+        lqw.eq(StringUtils.isNotBlank(bo.getEnginId()), ZEngineeringPipeJacking::getEnginId, bo.getEnginId());
         ZEngineeringPipeJackingVo jackingVo = baseMapper.selectVoOne(lqw);
         boolean flag = false;
         if (ObjectUtil.isEmpty(jackingVo)) {
@@ -144,7 +144,7 @@ public class ZEngineeringPipeJackingServiceImpl implements IZEngineeringPipeJack
             if (flag) {
                 bo.setId(add.getId());
                 //多表单
-                if (!bo.getzEngineeringNodeBoList().isEmpty()){
+                if (ObjectUtil.isEmpty(bo.getzEngineeringNodeBo())){
                     for (int i = 0; i < bo.getzEngineeringNodeBoList().size(); i++) {
                         bo.getzEngineeringNodeBoList().get(i).setCivliId(add.getId());
                         bo.getzEngineeringNodeBoList().get(i).setCreateTime(add.getCreateTime());
@@ -178,7 +178,7 @@ public class ZEngineeringPipeJackingServiceImpl implements IZEngineeringPipeJack
             }
         }else {
             //多表单
-            if (!bo.getzEngineeringNodeBoList().isEmpty()){
+            if (ObjectUtil.isEmpty(bo.getzEngineeringNodeBo())){
                 for (int i = 0; i < bo.getzEngineeringNodeBoList().size(); i++) {
                     bo.getzEngineeringNodeBoList().get(i).setCivliId(add.getId());
                     bo.getzEngineeringNodeBoList().get(i).setCreateTime(add.getCreateTime());
@@ -188,9 +188,9 @@ public class ZEngineeringPipeJackingServiceImpl implements IZEngineeringPipeJack
             //单表单
             else {
                 ZEngineeringNodeBo zEngineeringNodeBo = bo.getzEngineeringNodeBo();
-                zEngineeringNodeBo.setCivliId(add.getId());
+                zEngineeringNodeBo.setCivliId(jackingVo.getId());
                 zEngineeringNodeBo.setType(zEngineeringNodeBo.getType());
-                zEngineeringNodeBo.setCreateTime(add.getCreateTime());
+                zEngineeringNodeBo.setCreateTime(jackingVo.getCreateTime());
                 ZEngineeringNodeBo query = nodeService.query(zEngineeringNodeBo);
                 if (!ObjectUtils.isEmpty(query)) {
                     zEngineeringNodeBo.setId(query.getId());

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

@@ -35,8 +35,8 @@ public class ZUnitServiceImpl implements IZUnitService {
     private final ZUnitMapper baseMapper;
 
     @Override
-    public List<ZUnitVo> getUnitList(String areaId, String buildingId) {
-        return baseMapper.getUnitList(areaId,buildingId);
+    public List<ZUnitVo> getUnitList(String buildingId) {
+        return baseMapper.getUnitList(buildingId);
     }
 
     /**

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

@@ -23,9 +23,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         name as name
         from z_unit
         where del_flag = '0'
-        <if test="areaId != null and areaId != ''">
-            and area_id = #{areaId}
-        </if>
         <if test="buildingId != null and buildingId != ''">
             and building_id = #{buildingId}
         </if>