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

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

@@ -76,6 +76,21 @@ public class ZEngineeringPipeJackingController extends BaseController {
     }
 
     /**
+     * 获取顶管工程详细信息
+     *
+     * @param id 主键
+     * @param type 节点类型
+     */
+    @SaCheckPermission("zdsz:engineeringPipeJacking:query")
+    @GetMapping("/{id}/{type}")
+    public R<ZEngineeringPipeJackingVo> getInfo(@NotNull(message = "主键不能为空")
+                                                @PathVariable("id") String id,@NotNull(message = "节点类型不能为空")
+    @PathVariable("type") String type) {
+        return R.ok(iZEngineeringPipeJackingService.queryByIdType(id,type));
+    }
+
+
+    /**
      * 新增顶管工程
      */
     @SaCheckPermission("zdsz:engineeringPipeJacking:add")

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/domain/ZEngineeringIndustry.java

@@ -5,9 +5,13 @@ import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.Version;
 import com.ruoyi.common.core.domain.BaseEntity;
+import com.ruoyi.common.core.validate.AddGroup;
+import com.ruoyi.common.core.validate.EditGroup;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import javax.validation.constraints.NotBlank;
+
 /**
  * 工业工程|市政工程对象 z_engineering_industry
  *
@@ -71,6 +75,15 @@ public class ZEngineeringIndustry extends BaseEntity {
      */
     private String type;
     /**
+     * 工程名称
+     */
+    private String enginName;
+
+    /**
+     * 工程分类
+     */
+    private String enginClassification;
+    /**
      * 乐观锁
      */
     @Version
@@ -85,4 +98,6 @@ public class ZEngineeringIndustry extends BaseEntity {
     @TableLogic
     private String delFlag;
 
+
+
 }

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

@@ -86,6 +86,19 @@ public class ZEngineeringIndustryBo extends BaseEntity {
     private String supervisionPhone;
 
     /**
+     * 工程名称
+     */
+    @NotBlank(message = "工程名称不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String enginName;
+
+    /**
+     * 工程分类
+     */
+    private String enginClassification;
+
+
+
+    /**
      * 类型(工业工程|市政工程)
      */
     @NotBlank(message = "类型(工业工程|市政工程)不能为空", groups = { AddGroup.class, EditGroup.class })

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

@@ -3,9 +3,12 @@ package com.ruoyi.zdsz.domain.vo;
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.ruoyi.common.core.domain.BaseEntity;
+import com.ruoyi.common.core.validate.AddGroup;
+import com.ruoyi.common.core.validate.EditGroup;
 import com.ruoyi.zdsz.domain.bo.ZEngineeringNodeBo;
 import lombok.Data;
 
+import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
 import java.util.List;
 
@@ -93,6 +96,18 @@ public class ZEngineeringIndustryVo extends BaseEntity implements Serializable {
     @ExcelProperty(value = "类型(工业工程|市政工程)")
     private String type;
 
+    /**
+     * 工程名称
+     */
+    @ExcelProperty(value = "工程名称")
+    private String enginName;
+
+    /**
+     * 工程分类
+     */
+    @ExcelProperty(value = "工程分类")
+    private String enginClassification;
+
 
     private List<ZEngineeringNodeBo> zEngineeringNodeBo;
 }

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

@@ -46,4 +46,6 @@ public interface IZEngineeringPipeJackingService {
      * 校验并批量删除顶管工程信息
      */
     Boolean deleteWithValidByIds(Collection<String> ids, Boolean isValid);
+
+    ZEngineeringPipeJackingVo queryByIdType(String id, String type);
 }

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

@@ -89,6 +89,8 @@ public class ZEngineeringIndustryServiceImpl implements IZEngineeringIndustrySer
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<ZEngineeringIndustry> lqw = Wrappers.lambdaQuery();
         lqw.eq(StringUtils.isNotBlank(bo.getEnginType()), ZEngineeringIndustry::getEnginType, bo.getEnginType());
+        lqw.eq(StringUtils.isNotBlank(bo.getEnginName()), ZEngineeringIndustry::getEnginName, bo.getEnginName());
+        lqw.eq(StringUtils.isNotBlank(bo.getEnginClassification()), ZEngineeringIndustry::getEnginClassification, bo.getEnginClassification());
         lqw.like(StringUtils.isNotBlank(bo.getConstructUnit()), ZEngineeringIndustry::getConstructUnit, bo.getConstructUnit());
         lqw.eq(StringUtils.isNotBlank(bo.getProjectHead()), ZEngineeringIndustry::getProjectHead, bo.getProjectHead());
         lqw.eq(StringUtils.isNotBlank(bo.getSceneHead()), ZEngineeringIndustry::getSceneHead, bo.getSceneHead());
@@ -155,7 +157,7 @@ public class ZEngineeringIndustryServiceImpl implements IZEngineeringIndustrySer
             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/java/com/ruoyi/zdsz/service/impl/ZEngineeringPipeJackingServiceImpl.java

@@ -1,6 +1,7 @@
 package com.ruoyi.zdsz.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.ruoyi.common.annotation.DynamicName;
 import com.ruoyi.common.utils.StringUtils;
@@ -23,6 +24,7 @@ import com.ruoyi.zdsz.domain.ZEngineeringPipeJacking;
 import com.ruoyi.zdsz.mapper.ZEngineeringPipeJackingMapper;
 import com.ruoyi.zdsz.service.IZEngineeringPipeJackingService;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.ObjectUtils;
 
 import java.util.Date;
 import java.util.List;
@@ -56,6 +58,19 @@ public class ZEngineeringPipeJackingServiceImpl implements IZEngineeringPipeJack
         jackingVo.setZEngineeringNodeBoList(nodeService.queryListDetails(bo));
         return jackingVo;
     }
+    /**
+     * 查询顶管工程
+     */
+    @Override
+    public ZEngineeringPipeJackingVo queryByIdType(String id,String type){
+        ZEngineeringPipeJackingVo jackingVo = baseMapper.selectVoById(id);
+        ZEngineeringNodeBo bo = new ZEngineeringNodeBo();
+        bo.setCreateTime(jackingVo.getCreateTime());
+        bo.setCivliId(jackingVo.getId());
+        bo.setType(type);
+        jackingVo.setZEngineeringNodeBoList(nodeService.queryListDetails(bo));
+        return jackingVo;
+    }
 
     /**
      * 查询顶管工程列表
@@ -99,13 +114,16 @@ public class ZEngineeringPipeJackingServiceImpl implements IZEngineeringPipeJack
         ZEngineeringPipeJacking add = BeanUtil.toBean(bo, ZEngineeringPipeJacking.class);
         validEntityBeforeSave(add);
         //民用
-        if ("1".equals(bo.getType())){
+        if ("0".equals(bo.getType())){
             List<Map<String, Object>> civil = baseMapper.getCivil(bo.getEnginId());
             if (!civil.isEmpty()){
                 add.setEnginAddre((String) civil.get(0).get("name"));
             }
         }
-        //工业市政
+        //市政
+        else if("1".equals(bo.getType())){
+        }
+        //工业
         else if("2".equals(bo.getType())){
         }
         // 危险
@@ -124,12 +142,32 @@ public class ZEngineeringPipeJackingServiceImpl implements IZEngineeringPipeJack
                 add.setEnginAddre((String) civil.get(0).get("address"));
             }
         }
-        boolean flag = baseMapper.insert(add) > 0;
-        if (flag) {
-            bo.setId(add.getId());
-            bo.getzEngineeringNodeBo().setCivliId(add.getId());
-            bo.getzEngineeringNodeBo().setCreateTime(bo.getCreateTime());
-            nodeService.insert(bo.getzEngineeringNodeBo());
+        //
+        LambdaQueryWrapper<ZEngineeringPipeJacking> lqw = Wrappers.lambdaQuery();
+        lqw.like(StringUtils.isNotBlank(bo.getEnginId()), ZEngineeringPipeJacking::getEnginId, bo.getEnginId());
+        ZEngineeringPipeJackingVo jackingVo = baseMapper.selectVoOne(lqw);
+        boolean flag = false;
+        if (ObjectUtil.isEmpty(jackingVo)) {
+            //不存在工程
+            flag = baseMapper.insert(add) > 0;
+            if (flag) {
+                bo.setId(add.getId());
+                bo.getzEngineeringNodeBo().setCivliId(add.getId());
+                bo.getzEngineeringNodeBo().setCreateTime(bo.getCreateTime());
+                nodeService.insert(bo.getzEngineeringNodeBo());
+            }
+        }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());
+            }
+            nodeService.insert(zEngineeringNodeBo);
+            flag = true;
         }
         return flag;
     }
@@ -143,13 +181,16 @@ public class ZEngineeringPipeJackingServiceImpl implements IZEngineeringPipeJack
         ZEngineeringPipeJacking update = BeanUtil.toBean(bo, ZEngineeringPipeJacking.class);
         validEntityBeforeSave(update);
         //民用
-        if ("1".equals(bo.getType())){
+        if ("0".equals(bo.getType())){
             List<Map<String, Object>> civil = baseMapper.getCivil(bo.getEnginId());
             if (!civil.isEmpty()){
                 update.setEnginAddre((String) civil.get(0).get("name"));
             }
         }
-        //工业市政
+        //市政
+        else if("1".equals(bo.getType())){
+        }
+        //工业
         else if("2".equals(bo.getType())){
         }
         // 危险