基建修改

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

@@ -16,11 +16,6 @@ import java.util.Map;
  */
 public interface ZEngineeringPipeJackingMapper extends BaseMapperPlus<ZEngineeringPipeJackingMapper, ZEngineeringPipeJacking, ZEngineeringPipeJackingVo> {
     List<Map<String,Object>> getCivil(String enginId);
-    List<Map<String,Object>> getIndustry(String enginId);
-    List<Map<String,Object>> getDangerous(String enginId);
-    List<Map<String,Object>> getInfrastructure(String enginId);
-
-    List<Map<String, Object>> getSg(String enginId);
 
     List<Map<String, Object>> nameList(ZEngineeringPipeJackingBo bo);
 }

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

@@ -158,7 +158,7 @@ public class ZEngineeringInfoServiceImpl implements IZEngineeringInfoService {
         if (flag) {
             bo.setId(add.getId());
         }
-        if (bo.getzEngineeringMaterialBo()!=null&&bo.getzEngineeringMaterialBo().size()>0)
+        if (bo.getzEngineeringMaterialBo()!=null&& !bo.getzEngineeringMaterialBo().isEmpty())
         {
         bo.getzEngineeringMaterialBo().stream().forEach(item->{
             item.setDetailsId(add.getId());
@@ -167,7 +167,7 @@ public class ZEngineeringInfoServiceImpl implements IZEngineeringInfoService {
             izEngineeringMaterialService.insert(item);
         });
         }
-        List<ZEngiineeringPhoto> photoList = new ArrayList();
+        List<ZEngiineeringPhoto> photoList = new ArrayList<>();
         bo.getzEngiineeringPhotoBoList().forEach(item -> {
             ZEngiineeringPhoto zEngiineeringPhoto = new ZEngiineeringPhoto();
             zEngiineeringPhoto.setParentId(add.getId());
@@ -177,8 +177,9 @@ public class ZEngineeringInfoServiceImpl implements IZEngineeringInfoService {
                 photoList.add(zEngiineeringPhoto);
         });
 
-        if (photoList.size() > 0)
+        if (!photoList.isEmpty()) {
             izEngiineeringPhotoService.insertBatch(photoList);
+        }
 
         return add;
     }

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

@@ -14,19 +14,13 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.ruoyi.framework.obs.ObsService;
 import com.ruoyi.zdsz.domain.ZEngiineeringPhoto;
 import com.ruoyi.zdsz.domain.ZEngineeringNode;
-import com.ruoyi.zdsz.domain.bo.ZEngiineeringPhotoBo;
-import com.ruoyi.zdsz.domain.bo.ZEngineeringNodeBo;
-import com.ruoyi.zdsz.domain.bo.ZFileBo;
-import com.ruoyi.zdsz.domain.vo.ZEngiineeringPhotoVo;
-import com.ruoyi.zdsz.domain.vo.ZEngineeringCivilVo;
-import com.ruoyi.zdsz.domain.vo.ZEngineeringNodeVo;
+import com.ruoyi.zdsz.domain.bo.*;
+import com.ruoyi.zdsz.domain.vo.*;
 import com.ruoyi.zdsz.service.IZEngiineeringPhotoService;
 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.ZEngineeringPipeJackingBo;
-import com.ruoyi.zdsz.domain.vo.ZEngineeringPipeJackingVo;
 import com.ruoyi.zdsz.domain.ZEngineeringPipeJacking;
 import com.ruoyi.zdsz.mapper.ZEngineeringPipeJackingMapper;
 import com.ruoyi.zdsz.service.IZEngineeringPipeJackingService;
@@ -135,6 +129,7 @@ public class ZEngineeringPipeJackingServiceImpl implements IZEngineeringPipeJack
         validEntityBeforeSave(add);
 
         LambdaQueryWrapper<ZEngineeringPipeJacking> lqw = Wrappers.lambdaQuery();
+        lqw.eq(StringUtils.isNotBlank(bo.getId()), ZEngineeringPipeJacking::getId, bo.getId());
         lqw.eq(StringUtils.isNotBlank(bo.getEnginId()), ZEngineeringPipeJacking::getEnginId, bo.getEnginId());
         ZEngineeringPipeJackingVo jackingVo = baseMapper.selectVoOne(lqw);
         boolean flag = false;
@@ -144,61 +139,49 @@ public class ZEngineeringPipeJackingServiceImpl implements IZEngineeringPipeJack
             if (flag) {
                 bo.setId(add.getId());
                 //多表单
-                if (ObjectUtil.isEmpty(bo.getzEngineeringNodeBo())){
+                if (bo.getzEngineeringNodeBoList() != null && !bo.getzEngineeringNodeBoList().isEmpty()) {
                     for (int i = 0; i < bo.getzEngineeringNodeBoList().size(); i++) {
                         bo.getzEngineeringNodeBoList().get(i).setCivliId(add.getId());
                         bo.getzEngineeringNodeBoList().get(i).setCreateTime(add.getCreateTime());
                         nodeService.insert(bo.getzEngineeringNodeBoList().get(i));
                     }
                 }
-                //单表单
-                else {
-                    bo.getzEngineeringNodeBo().setCivliId(add.getId());
-                    bo.getzEngineeringNodeBo().setCreateTime(bo.getCreateTime());
-                    nodeService.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.getUsername()));
-                        pic.setCreateTime(new Date());
-                        pic.setUpdateBy(String.valueOf(LoginHelper.getUsername()));
-                        pic.setUpdateTime(new Date());
-                        list.add(pic);
-                    });
-                    if (!list.isEmpty()) {
-                        photoService.insertBatch(list);
-                    }
-                }
             }
-        }else {
+        } else {
             //多表单
-            if (ObjectUtil.isEmpty(bo.getzEngineeringNodeBo())){
+            if (bo.getzEngineeringNodeBoList() != null && !bo.getzEngineeringNodeBoList().isEmpty()) {
                 for (int i = 0; i < bo.getzEngineeringNodeBoList().size(); i++) {
-                    bo.getzEngineeringNodeBoList().get(i).setCivliId(add.getId());
-                    bo.getzEngineeringNodeBoList().get(i).setCreateTime(add.getCreateTime());
-                    nodeService.insert(bo.getzEngineeringNodeBoList().get(i));
-                }
-            }
-            //单表单
-            else {
-                ZEngineeringNodeBo zEngineeringNodeBo = bo.getzEngineeringNodeBo();
-                zEngineeringNodeBo.setCivliId(jackingVo.getId());
-                zEngineeringNodeBo.setType(zEngineeringNodeBo.getType());
-                zEngineeringNodeBo.setCreateTime(jackingVo.getCreateTime());
-                ZEngineeringNodeBo query = nodeService.query(zEngineeringNodeBo);
-                if (!ObjectUtils.isEmpty(query)) {
-                    zEngineeringNodeBo.setId(query.getId());
+                    ZEngineeringNodeBo bo1 = bo.getzEngineeringNodeBoList().get(i);
+                    bo1.setCivliId(jackingVo.getId());
+                    bo1.setType(bo1.getType());
+                    bo1.setCreateTime(jackingVo.getCreateTime());
+                    ZEngineeringNodeBo query = nodeService.query(bo1);
+                    if (!ObjectUtils.isEmpty(query)){
+                        bo1.setId(query.getId());
+                    }
+                    nodeService.insert(bo1);
                 }
-                nodeService.insert(bo.getzEngineeringNodeBo());
             }
             flag = true;
         }
+        //文件集合
+        if (bo.getFiles()!=null&&!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.getUsername()));
+                pic.setCreateTime(new Date());
+                pic.setUpdateBy(String.valueOf(LoginHelper.getUsername()));
+                pic.setUpdateTime(new Date());
+                list.add(pic);
+            });
+            if (!list.isEmpty()) {
+                photoService.insertBatch(list);
+            }
+        }
         return flag;
     }
 
@@ -211,7 +194,6 @@ public class ZEngineeringPipeJackingServiceImpl implements IZEngineeringPipeJack
         LambdaQueryWrapper<ZEngineeringPipeJacking> lqw = Wrappers.lambdaQuery();
         lqw.eq(StringUtils.isNotBlank(bo.getId()), ZEngineeringPipeJacking::getId, bo.getId());
         ZEngineeringPipeJackingVo jackingVo = baseMapper.selectVoOne(lqw);
-        boolean flag = false;
                 ZEngineeringNodeBo zEngineeringNodeBo = bo.getzEngineeringNodeBo();
                 zEngineeringNodeBo.setCivliId(jackingVo.getId());
                 zEngineeringNodeBo.setType(zEngineeringNodeBo.getType());
@@ -221,42 +203,11 @@ public class ZEngineeringPipeJackingServiceImpl implements IZEngineeringPipeJack
                     zEngineeringNodeBo.setId(query.getId());
                 }
                 nodeService.insert(bo.getzEngineeringNodeBo());
-            flag = true;
-
-        return flag;
-    }
-
-    private ZEngineeringPipeJacking updateEnginAddre(ZEngineeringPipeJacking update, String type, String enginId) {
-        List<Map<String, Object>> civil = new ArrayList<>();
 
-        if ("民用工程".equals(type)) {
-            civil = baseMapper.getCivil(enginId);
-            if (!civil.isEmpty()) {
-                update.setEnginAddre((String) civil.get(0).get("name"));
-            }
-        } else if ("市政工程".equals(type) || "工业工程".equals(type)) {
-            civil = baseMapper.getSg(enginId);
-            if (!civil.isEmpty()) {
-                update.setEnginAddre((String) civil.get(0).get("name"));
-            }
-        } else if ("危险作业工程".equals(type)) {
-            civil = baseMapper.getDangerous(enginId);
-            if (!civil.isEmpty()) {
-                update.setEnginName((String) civil.get(0).get("name"));
-                update.setEnginAddre((String) civil.get(0).get("address"));
-            }
-        } else if ("基建工程".equals(type)) {
-            civil = baseMapper.getInfrastructure(enginId);
-            if (!civil.isEmpty()) {
-                update.setEnginName((String) civil.get(0).get("name"));
-                update.setEnginAddre((String) civil.get(0).get("address"));
-            }
-        }
-        return update;
+        return true;
     }
 
 
-
     /**
      * 修改顶管工程
      */
@@ -265,16 +216,28 @@ public class ZEngineeringPipeJackingServiceImpl implements IZEngineeringPipeJack
     public Boolean updateByBo(ZEngineeringPipeJackingBo bo) {
         ZEngineeringPipeJacking update = BeanUtil.toBean(bo, ZEngineeringPipeJacking.class);
         validEntityBeforeSave(update);
-        ZEngineeringPipeJackingVo jackingVo = baseMapper.selectVoById(update.getId());
-        ZEngineeringNodeBo zEngineeringNodeBo = bo.getzEngineeringNodeBo();
-        if (!ObjectUtils.isEmpty(zEngineeringNodeBo)){
-            zEngineeringNodeBo.setCivliId(jackingVo.getId());
-            zEngineeringNodeBo.setCreateTime(jackingVo.getCreateTime());
-            nodeService.update(zEngineeringNodeBo);
-        }
         int i = baseMapper.updateById(update);
-        if (bo.getFiles()!=null&&!bo.getFiles().isEmpty()) {
-            this.doPhotos(update,bo);
+        if (i>0){
+            ZEngineeringPipeJackingVo jackingVo = baseMapper.selectVoById(update.getId());
+            ZEngineeringNodeBo zEngineeringNodeBo = bo.getzEngineeringNodeBo();
+            if (!ObjectUtils.isEmpty(zEngineeringNodeBo)){
+                //多info
+                if (zEngineeringNodeBo.getzEngineeringInfoBoList()!=null&&!zEngineeringNodeBo.getzEngineeringInfoBoList().isEmpty()){
+                    List<ZEngineeringInfoBo> engineeringInfoBoList = zEngineeringNodeBo.getzEngineeringInfoBoList();
+                    if (engineeringInfoBoList != null && !engineeringInfoBoList.isEmpty()) {
+                        nodeService.updateMuch(zEngineeringNodeBo);
+                    }
+                }
+                //单info
+                if (!ObjectUtil.isEmpty(zEngineeringNodeBo.getzEngineeringInfoBo())) {
+                    zEngineeringNodeBo.setCivliId(jackingVo.getId());
+                    zEngineeringNodeBo.setCreateTime(jackingVo.getCreateTime());
+                    nodeService.update(zEngineeringNodeBo);
+                }
+            }
+            if (bo.getFiles()!=null&&!bo.getFiles().isEmpty()) {
+                this.doPhotos(update,bo);
+            }
         }
         return i>0;
     }
@@ -338,16 +301,14 @@ public class ZEngineeringPipeJackingServiceImpl implements IZEngineeringPipeJack
     @Override
     @Transactional(rollbackFor=Exception.class)
     public Boolean deleteWithValidByIds(Collection<String> ids, Boolean isValid) {
-        if(isValid){
-            //TODO 做一些业务上的校验,判断是否需要校验
-        }
+        //TODO 做一些业务上的校验,判断是否需要校验
         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 ->
+            zEngineeringNodeBos.forEach(ite ->
                 nodeService.delete(ite)
             );
         });

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

@@ -43,38 +43,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         WHERE
             m.del_flag = '0'  and m.id = #{enginId}
     </select>
-    <select id="getIndustry" resultType="java.util.Map">
-        SELECT
-            m.id,m.engin_name as name
-        FROM
-            z_engineering_industry as m
-        WHERE
-            m.del_flag = '0'  and m.id = #{enginId}
-    </select>
-    <select id="getDangerous" resultType="java.util.Map">
-        SELECT
-            m.id,m.engin_name as name,engin_addre as address
-        FROM
-            z_engineering_dangerous as m
-        WHERE
-            m.del_flag = '0'  and m.id = #{enginId}
-    </select>
-    <select id="getInfrastructure" resultType="java.util.Map">
-        SELECT
-            m.id,m.engin_name as name,engin_addre as address
-        FROM
-            z_engineering_infrastructure as m
-        WHERE
-            m.del_flag = '0'  and m.id = #{enginId}
-    </select>
-    <select id="getSg" resultType="java.util.Map">
-        SELECT
-            m.id,m.engin_name as name
-        FROM
-            z_engineering_industry as m
-        WHERE
-            m.del_flag = '0'  and m.id = #{enginId}
-    </select>
+
     <select id="nameList" resultType="java.util.Map">
         select id,engin_name as name from z_engineering_pipe_jacking where del_flag = '0'
         <if test="enginName != null  and enginName != ''">