顶管新增修改查询

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

@@ -33,8 +33,12 @@ public class ZEngineeringPipeJackingBo extends BaseEntity {
     /**
      * 工程id
      */
-//    @NotBlank(message = "工程id不能为空", groups = { AddGroup.class, EditGroup.class })
+    @NotBlank(message = "工程id不能为空", groups = { AddGroup.class, EditGroup.class })
     private String enginName;
+    /**
+     * type
+     */
+    private Integer type;
 
     /**
      * 工程地址

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

@@ -5,10 +5,12 @@ 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_pipe_jacking
@@ -76,5 +78,6 @@ public class ZEngineeringPipeJackingVo extends BaseEntity implements Serializabl
     @ExcelProperty(value = "备注")
     private String remark;
 
+    private List<ZEngineeringNodeBo> zEngineeringNodeBoList;
 
 }

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

@@ -15,7 +15,5 @@ import java.util.Map;
  */
 public interface ZEngineeringPipeJackingMapper extends BaseMapperPlus<ZEngineeringPipeJackingMapper, ZEngineeringPipeJacking, ZEngineeringPipeJackingVo> {
     List<Map<String,Object>> getCivil(String enginName);
-    List<Map<String,Object>> getIndustry(String enginName,String type);
-    List<Map<String,Object>> getDangerous(String enginName);
-    List<Map<String,Object>> getInfrastructure(String enginName);
+
 }

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

@@ -51,8 +51,6 @@ public interface IZEngineeringInfoService {
      * @return ZEngineeringInfo
      */
     ZEngineeringInfo insert(ZEngineeringInfoBo bo);
-    ZEngineeringInfo insertDg(ZEngineeringInfoBo bo);
-
     /**
      * 修改工程详情
      */
@@ -65,7 +63,6 @@ public interface IZEngineeringInfoService {
      */
     Boolean update(ZEngineeringInfoBo bo);
 
-    Boolean updateDg(ZEngineeringInfoBo zEngineeringInfoBo);
 
     /**
      * 校验并批量删除工程详情信息

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

@@ -65,7 +65,6 @@ public interface IZEngineeringNodeService {
      * 修改工程节点
      */
     Boolean updateByBo(ZEngineeringNodeBo bo);
-    Boolean updateDg(ZEngineeringNodeBo bo);
 
     /**
      * 修改

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

@@ -159,36 +159,7 @@ public class ZEngineeringInfoServiceImpl implements IZEngineeringInfoService {
         izEngiineeringPhotoService.insertBatch(photoList);
         return add;
     }
-    /**
-     *  新增工程详情(节点使用)
-     * @param bo
-     * @return ZEngineeringInfo
-     */
-    @Override
-    @DynamicName(spel = "#bo.createTime")
-    @Transactional(rollbackFor=Exception.class)
-    public ZEngineeringInfo insertDg(ZEngineeringInfoBo bo) {
-        ZEngineeringInfo add = BeanUtil.toBean(bo, ZEngineeringInfo.class);
-        validEntityBeforeSave(add);
-        add.setConstructUser(String.valueOf(LoginHelper.getLoginUser().getUserId()));
-        add.setHeadName(String.valueOf(LoginHelper.getLoginUser().getUserId()));
-        boolean flag = baseMapper.insert(add) > 0;
-        if (flag) {
-            bo.setId(add.getId());
-        }
-        List <ZEngiineeringPhoto> photoList=new ArrayList();
-        bo.getzEngiineeringPhotoBoList().stream().forEach(item->{
-            ZEngiineeringPhoto zEngiineeringPhoto=new ZEngiineeringPhoto();
-            zEngiineeringPhoto.setParentId(add.getId());
-            zEngiineeringPhoto.setPicUrl(item);
-            zEngiineeringPhoto.setCreateTime(bo.getCreateTime());
-            photoList.add(zEngiineeringPhoto);
-        });
-        if (!photoList.isEmpty()) {
-            izEngiineeringPhotoService.insertBatch(photoList);
-        }
-        return add;
-    }
+
     /**
      * 修改工程详情
      */
@@ -216,25 +187,6 @@ public class ZEngineeringInfoServiceImpl implements IZEngineeringInfoService {
         izEngineeringMaterialService.update(bo.getzEngineeringMaterialBo());
         return baseMapper.updateById(update) > 0;
     }
-    @Override
-    @DynamicName(spel = "#bo.createTime")
-    public Boolean updateDg(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();
-            zEngiineeringPhoto.setParentId(update.getId());
-            zEngiineeringPhoto.setPicUrl(item);
-            zEngiineeringPhoto.setCreateTime(bo.getCreateTime());
-            photoList.add(zEngiineeringPhoto);
-        });
-        if (!photoList.isEmpty()) {
-            izEngiineeringPhotoService.updateBatch(photoList);
-        }
-        return baseMapper.updateById(update) > 0;
-    }
-
 
     /**
      * 保存前的数据校验

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

@@ -130,7 +130,7 @@ public class ZEngineeringNodeServiceImpl implements IZEngineeringNodeService {
         }
         bo.getzEngineeringInfoBo().setEngInfoId(add.getId());
         bo.getzEngineeringInfoBo().setCreateTime(bo.getCreateTime());
-        izEngineeringInfoService.insertDg(bo.getzEngineeringInfoBo());
+        izEngineeringInfoService.insert(bo.getzEngineeringInfoBo());
         return add;
     }
     /**
@@ -152,15 +152,6 @@ public class ZEngineeringNodeServiceImpl implements IZEngineeringNodeService {
         izEngineeringInfoService.update(bo.getzEngineeringInfoBo());
         return baseMapper.updateById(update) > 0;
     }
-    @Override
-    @DynamicName(spel = "#bo.createTime")
-    @Transactional(rollbackFor = Exception.class)
-    public Boolean updateDg(ZEngineeringNodeBo bo) {
-        ZEngineeringNode update = BeanUtil.toBean(bo, ZEngineeringNode.class);
-        validEntityBeforeSave(update);
-        izEngineeringInfoService.updateDg(bo.getzEngineeringInfoBo());
-        return baseMapper.updateById(update) > 0;
-    }
 
     @Override
     @DynamicName(spel = "#bo.createTime")

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

@@ -9,6 +9,7 @@ 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.bo.ZEngineeringNodeBo;
 import com.ruoyi.zdsz.domain.vo.ZEngineeringNodeVo;
 import com.ruoyi.zdsz.service.IZEngineeringNodeService;
 import lombok.RequiredArgsConstructor;
@@ -46,7 +47,11 @@ public class ZEngineeringPipeJackingServiceImpl implements IZEngineeringPipeJack
      */
     @Override
     public ZEngineeringPipeJackingVo queryById(String id){
-        return baseMapper.selectVoById(id);
+        ZEngineeringPipeJackingVo jackingVo = baseMapper.selectVoById(id);
+        ZEngineeringNodeBo bo = new ZEngineeringNodeBo();
+        bo.setCreateTime(new Date());
+        jackingVo.setZEngineeringNodeBoList(nodeService.queryListDetails(bo));
+        return jackingVo;
     }
 
     /**
@@ -89,11 +94,17 @@ public class ZEngineeringPipeJackingServiceImpl implements IZEngineeringPipeJack
     public Boolean insertByBo(ZEngineeringPipeJackingBo bo) {
         ZEngineeringPipeJacking add = BeanUtil.toBean(bo, ZEngineeringPipeJacking.class);
         validEntityBeforeSave(add);
+        if (bo.getType()==1){
+            List<Map<String, Object>> civil = baseMapper.getCivil(bo.getEnginName());
+            if (!civil.isEmpty()){
+                add.setEnginAddre((String) civil.get(0).get("name"));
+            }
+        }
         boolean flag = baseMapper.insert(add) > 0;
         if (flag) {
             bo.setId(add.getId());
             bo.getNodeBo().setCivliId(add.getId());
-            bo.getNodeBo().setCreateTime(new Date());
+            bo.getNodeBo().setCreateTime(bo.getCreateTime());
             nodeService.insert(bo.getNodeBo());
         }
         return flag;
@@ -106,8 +117,14 @@ public class ZEngineeringPipeJackingServiceImpl implements IZEngineeringPipeJack
     public Boolean updateByBo(ZEngineeringPipeJackingBo bo) {
         ZEngineeringPipeJacking update = BeanUtil.toBean(bo, ZEngineeringPipeJacking.class);
         validEntityBeforeSave(update);
+        if (bo.getType()==1){
+            List<Map<String, Object>> civil = baseMapper.getCivil(bo.getEnginName());
+            if (!civil.isEmpty()){
+                update.setEnginAddre((String) civil.get(0).get("name"));
+            }
+        }
         bo.getNodeBo().setCivliId(bo.getId());
-        nodeService.updateDg(bo.getNodeBo());
+        nodeService.update(bo.getNodeBo());
         return baseMapper.updateById(update) > 0;
     }
 

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

@@ -24,7 +24,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="getCivil" resultType="java.util.Map">
         SELECT
-            m.*,area.name,build.name,unit.name,house.name
+            m.*,
+            CONCAT(
+                COALESCE(area.name, ''),
+                COALESCE(build.name, ''),
+                COALESCE(unit.name, ''),
+                COALESCE(house.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
@@ -34,14 +40,5 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         WHERE
             m.del_flag = '0'  where m.id = #{enginName}
     </select>
-    <select id="getIndustry" resultType="java.util.Map">
-        SELECT m.* from z_engineering_industry as m where m.del_flag = '0' where id = #{enginName}
-    </select>
-    <select id="getDangerous" resultType="java.util.Map">
-        SELECT m.* from z_engineering_dangerous as m where m.del_flag = '0' where id = #{enginName}
-    </select>
-    <select id="getInfrastructure" resultType="java.util.Map">
-        SELECT m.* from z_engineering_infrastructure as m where m.del_flag = '0' where id = #{enginName}
-    </select>
 
 </mapper>