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

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

@@ -0,0 +1,113 @@
+package com.ruoyi.web.controller.zdsz;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Arrays;
+import java.util.concurrent.TimeUnit;
+
+import com.ruoyi.zdsz.service.IZEngineeringNodeService;
+import lombok.RequiredArgsConstructor;
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.constraints.*;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.validation.annotation.Validated;
+import com.ruoyi.common.annotation.RepeatSubmit;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.PageQuery;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.validate.AddGroup;
+import com.ruoyi.common.core.validate.EditGroup;
+import com.ruoyi.common.core.validate.QueryGroup;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.zdsz.domain.vo.ZEngineeringPipeJackingVo;
+import com.ruoyi.zdsz.domain.bo.ZEngineeringPipeJackingBo;
+import com.ruoyi.zdsz.service.IZEngineeringPipeJackingService;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 顶管工程
+ *
+ * @author ruoyi
+ * @date 2024-01-02
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/zdsz/engineeringPipeJacking")
+public class ZEngineeringPipeJackingController extends BaseController {
+
+    private final IZEngineeringPipeJackingService iZEngineeringPipeJackingService;
+    @Autowired
+    private IZEngineeringNodeService nodeService;
+    /**
+     * 查询顶管工程列表
+     */
+    @SaCheckPermission("zdsz:engineeringPipeJacking:list")
+    @GetMapping("/list")
+    public TableDataInfo<ZEngineeringPipeJackingVo> list(ZEngineeringPipeJackingBo bo, PageQuery pageQuery) {
+        return iZEngineeringPipeJackingService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出顶管工程列表
+     */
+    @SaCheckPermission("zdsz:engineeringPipeJacking:export")
+    @Log(title = "顶管工程", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(ZEngineeringPipeJackingBo bo, HttpServletResponse response) {
+        List<ZEngineeringPipeJackingVo> list = iZEngineeringPipeJackingService.queryList(bo);
+        ExcelUtil.exportExcel(list, "顶管工程", ZEngineeringPipeJackingVo.class, response);
+    }
+
+    /**
+     * 获取顶管工程详细信息
+     *
+     * @param id 主键
+     */
+    @SaCheckPermission("zdsz:engineeringPipeJacking:query")
+    @GetMapping("/{id}")
+    public R<ZEngineeringPipeJackingVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable String id) {
+        return R.ok(iZEngineeringPipeJackingService.queryById(id));
+    }
+
+    /**
+     * 新增顶管工程
+     */
+    @SaCheckPermission("zdsz:engineeringPipeJacking:add")
+    @Log(title = "顶管工程", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody ZEngineeringPipeJackingBo bo) {
+        bo.setCreateTime(new Date());
+        return toAjax(iZEngineeringPipeJackingService.insertByBo(bo));
+    }
+
+    /**
+     * 修改顶管工程
+     */
+    @SaCheckPermission("zdsz:engineeringPipeJacking:edit")
+    @Log(title = "顶管工程", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody ZEngineeringPipeJackingBo bo) {
+        return toAjax(iZEngineeringPipeJackingService.updateByBo(bo));
+    }
+
+    /**
+     * 删除顶管工程
+     *
+     * @param ids 主键串
+     */
+    @SaCheckPermission("zdsz:engineeringPipeJacking:remove")
+    @Log(title = "顶管工程", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable String[] ids) {
+        return toAjax(iZEngineeringPipeJackingService.deleteWithValidByIds(Arrays.asList(ids), true));
+    }
+}

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

@@ -0,0 +1,73 @@
+    package com.ruoyi.zdsz.domain;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import java.io.Serializable;
+import java.util.Date;
+import java.math.BigDecimal;
+
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 顶管工程对象 z_engineering_pipe_jacking
+ *
+ * @author ruoyi
+ * @date 2024-01-02
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("z_engineering_pipe_jacking")
+public class ZEngineeringPipeJacking extends BaseEntity {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     *
+     */
+    @TableId(value = "id")
+    private String id;
+    /**
+     * 工程id
+     */
+    private String enginName;
+    /**
+     * 工程地址
+     */
+    private String enginAddre;
+    /**
+     * 工程编码
+     */
+    private String enginCode;
+    /**
+     * 施工单位
+     */
+    private String constructUnit;
+    /**
+     * 工程规模
+     */
+    private String enginScale;
+    /**
+     * 施工质量
+     */
+    private String constructQuality;
+    /**
+     * 施工进度
+     */
+    private String constructSchedule;
+    /**
+     * 乐观锁
+     */
+    @Version
+    private String version;
+    /**
+     * 备注
+     */
+    private String remark;
+    /**
+     * 删除标识
+     */
+    @TableLogic
+    private String delFlag;
+
+}

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

@@ -58,5 +58,5 @@ public class ZEngineeringNodeBo extends BaseEntity {
     /**
      * 工程详情
      */
-    private  ZEngineeringInfoBo zEngineeringInfoBo;
+    private ZEngineeringInfoBo zEngineeringInfoBo;
 }

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

@@ -0,0 +1,94 @@
+package com.ruoyi.zdsz.domain.bo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.ruoyi.common.core.validate.AddGroup;
+import com.ruoyi.common.core.validate.EditGroup;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import javax.validation.constraints.*;
+
+import java.util.Date;
+
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 顶管工程业务对象 z_engineering_pipe_jacking
+ *
+ * @author ruoyi
+ * @date 2024-01-02
+ */
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class ZEngineeringPipeJackingBo extends BaseEntity {
+
+    /**
+     *
+     */
+    @NotBlank(message = "不能为空", groups = { EditGroup.class })
+    @TableId(type = IdType.ASSIGN_UUID)
+    private String id;
+
+    /**
+     * 工程id
+     */
+    @NotBlank(message = "工程id不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String enginName;
+    /**
+     * type
+     */
+    private Integer type;
+
+    /**
+     * 工程地址
+     */
+//    @NotBlank(message = "工程地址不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String enginAddre;
+
+    /**
+     * 工程编码
+     */
+//    @NotBlank(message = "工程编码不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String enginCode;
+
+    /**
+     * 施工单位
+     */
+//    @NotBlank(message = "施工单位不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String constructUnit;
+
+    /**
+     * 工程规模
+     */
+//    @NotBlank(message = "工程规模不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String enginScale;
+
+    /**
+     * 施工质量
+     */
+//    @NotBlank(message = "施工质量不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String constructQuality;
+
+    /**
+     * 施工进度
+     */
+//    @NotBlank(message = "施工进度不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String constructSchedule;
+
+    /**
+     * 备注
+     */
+//    @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String remark;
+
+    private ZEngineeringNodeBo nodeBo;
+
+    public ZEngineeringNodeBo getNodeBo() {
+        return nodeBo;
+    }
+
+    public void setNodeBo(ZEngineeringNodeBo nodeBo) {
+        this.nodeBo = nodeBo;
+    }
+}

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

@@ -0,0 +1,83 @@
+package com.ruoyi.zdsz.domain.vo;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+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
+ *
+ * @author ruoyi
+ * @date 2024-01-02
+ */
+@Data
+@ExcelIgnoreUnannotated
+public class ZEngineeringPipeJackingVo extends BaseEntity implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     *
+     */
+    @ExcelProperty(value = "")
+    private String id;
+
+    /**
+     * 工程id
+     */
+    @ExcelProperty(value = "工程id")
+    private String enginName;
+
+    /**
+     * 工程地址
+     */
+    @ExcelProperty(value = "工程地址")
+    private String enginAddre;
+
+    /**
+     * 工程编码
+     */
+    @ExcelProperty(value = "工程编码")
+    private String enginCode;
+
+    /**
+     * 施工单位
+     */
+    @ExcelProperty(value = "施工单位")
+    private String constructUnit;
+
+    /**
+     * 工程规模
+     */
+    @ExcelProperty(value = "工程规模")
+    private String enginScale;
+
+    /**
+     * 施工质量
+     */
+    @ExcelProperty(value = "施工质量")
+    private String constructQuality;
+
+    /**
+     * 施工进度
+     */
+    @ExcelProperty(value = "施工进度")
+    private String constructSchedule;
+
+    /**
+     * 备注
+     */
+    @ExcelProperty(value = "备注")
+    private String remark;
+
+    private List<ZEngineeringNodeBo> zEngineeringNodeBoList;
+
+}

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

@@ -0,0 +1,19 @@
+package com.ruoyi.zdsz.mapper;
+
+import com.ruoyi.zdsz.domain.ZEngineeringPipeJacking;
+import com.ruoyi.zdsz.domain.vo.ZEngineeringPipeJackingVo;
+import com.ruoyi.common.core.mapper.BaseMapperPlus;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 顶管工程Mapper接口
+ *
+ * @author ruoyi
+ * @date 2024-01-02
+ */
+public interface ZEngineeringPipeJackingMapper extends BaseMapperPlus<ZEngineeringPipeJackingMapper, ZEngineeringPipeJacking, ZEngineeringPipeJackingVo> {
+    List<Map<String,Object>> getCivil(String enginName);
+
+}

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

@@ -51,7 +51,6 @@ public interface IZEngineeringInfoService {
      * @return ZEngineeringInfo
      */
     ZEngineeringInfo insert(ZEngineeringInfoBo bo);
-
     /**
      * 修改工程详情
      */
@@ -64,9 +63,11 @@ public interface IZEngineeringInfoService {
      */
     Boolean update(ZEngineeringInfoBo bo);
 
+
     /**
      * 校验并批量删除工程详情信息
      */
     Boolean deleteWithValidByIds(Collection<String> ids, Boolean isValid);
     Boolean delete(ZEngineeringNodeBo bo);
+
 }

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

@@ -78,4 +78,5 @@ public interface IZEngineeringNodeService {
      * 校验并批量删除工程节点信息
      */
     Boolean deleteWithValidByIds(Collection<String> ids, Boolean isValid);
+
 }

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

@@ -0,0 +1,49 @@
+package com.ruoyi.zdsz.service;
+
+import com.ruoyi.zdsz.domain.ZEngineeringPipeJacking;
+import com.ruoyi.zdsz.domain.vo.ZEngineeringPipeJackingVo;
+import com.ruoyi.zdsz.domain.bo.ZEngineeringPipeJackingBo;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.core.domain.PageQuery;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 顶管工程Service接口
+ *
+ * @author ruoyi
+ * @date 2024-01-02
+ */
+public interface IZEngineeringPipeJackingService {
+
+    /**
+     * 查询顶管工程
+     */
+    ZEngineeringPipeJackingVo queryById(String id);
+
+    /**
+     * 查询顶管工程列表
+     */
+    TableDataInfo<ZEngineeringPipeJackingVo> queryPageList(ZEngineeringPipeJackingBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询顶管工程列表
+     */
+    List<ZEngineeringPipeJackingVo> queryList(ZEngineeringPipeJackingBo bo);
+
+    /**
+     * 新增顶管工程
+     */
+    Boolean insertByBo(ZEngineeringPipeJackingBo bo);
+
+    /**
+     * 修改顶管工程
+     */
+    Boolean updateByBo(ZEngineeringPipeJackingBo bo);
+
+    /**
+     * 校验并批量删除顶管工程信息
+     */
+    Boolean deleteWithValidByIds(Collection<String> ids, Boolean isValid);
+}

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

@@ -111,7 +111,11 @@ public class ZEngineeringIndustryServiceImpl implements IZEngineeringIndustrySer
     public Boolean updateByBo(ZEngineeringIndustryBo bo) {
         ZEngineeringIndustry update = BeanUtil.toBean(bo, ZEngineeringIndustry.class);
         validEntityBeforeSave(update);
-        return baseMapper.updateById(update) > 0;
+        boolean flag = baseMapper.updateById(update) > 0;
+        bo.getzEngineeringNodeBo().setCivliId(bo.getId());
+        bo.getzEngineeringNodeBo().setType(bo.getType());
+        izEngineeringNodeService.update(bo.getzEngineeringNodeBo());
+        return flag;
     }
 
     /**
@@ -129,6 +133,8 @@ public class ZEngineeringIndustryServiceImpl implements IZEngineeringIndustrySer
         if(isValid){
             //TODO 做一些业务上的校验,判断是否需要校验
         }
-        return baseMapper.deleteBatchIds(ids) > 0;
+        boolean flag = baseMapper.deleteBatchIds(ids) > 0;
+        izEngineeringNodeService.deleteWithValidByIds(ids,true);
+        return flag;
     }
 }

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

@@ -0,0 +1,148 @@
+package com.ruoyi.zdsz.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.ruoyi.common.annotation.DynamicName;
+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.bo.ZEngineeringNodeBo;
+import com.ruoyi.zdsz.domain.vo.ZEngineeringNodeVo;
+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;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.Collection;
+
+/**
+ * 顶管工程Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2024-01-02
+ */
+@RequiredArgsConstructor
+@Service
+public class ZEngineeringPipeJackingServiceImpl implements IZEngineeringPipeJackingService {
+
+    private final ZEngineeringPipeJackingMapper baseMapper;
+
+    @Autowired
+    private IZEngineeringNodeService nodeService;
+
+    /**
+     * 查询顶管工程
+     */
+    @Override
+    public ZEngineeringPipeJackingVo queryById(String id){
+        ZEngineeringPipeJackingVo jackingVo = baseMapper.selectVoById(id);
+        ZEngineeringNodeBo bo = new ZEngineeringNodeBo();
+        bo.setCreateTime(new Date());
+        jackingVo.setZEngineeringNodeBoList(nodeService.queryListDetails(bo));
+        return jackingVo;
+    }
+
+    /**
+     * 查询顶管工程列表
+     */
+    @Override
+    public TableDataInfo<ZEngineeringPipeJackingVo> queryPageList(ZEngineeringPipeJackingBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<ZEngineeringPipeJacking> lqw = buildQueryWrapper(bo);
+        Page<ZEngineeringPipeJackingVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询顶管工程列表
+     */
+    @Override
+    public List<ZEngineeringPipeJackingVo> queryList(ZEngineeringPipeJackingBo bo) {
+        LambdaQueryWrapper<ZEngineeringPipeJacking> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<ZEngineeringPipeJacking> buildQueryWrapper(ZEngineeringPipeJackingBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<ZEngineeringPipeJacking> lqw = Wrappers.lambdaQuery();
+        lqw.like(StringUtils.isNotBlank(bo.getEnginName()), ZEngineeringPipeJacking::getEnginName, bo.getEnginName());
+        lqw.eq(StringUtils.isNotBlank(bo.getEnginAddre()), ZEngineeringPipeJacking::getEnginAddre, bo.getEnginAddre());
+        lqw.eq(StringUtils.isNotBlank(bo.getEnginCode()), ZEngineeringPipeJacking::getEnginCode, bo.getEnginCode());
+        lqw.eq(StringUtils.isNotBlank(bo.getConstructUnit()), ZEngineeringPipeJacking::getConstructUnit, bo.getConstructUnit());
+        lqw.eq(StringUtils.isNotBlank(bo.getEnginScale()), ZEngineeringPipeJacking::getEnginScale, bo.getEnginScale());
+        lqw.eq(StringUtils.isNotBlank(bo.getConstructQuality()), ZEngineeringPipeJacking::getConstructQuality, bo.getConstructQuality());
+        lqw.eq(StringUtils.isNotBlank(bo.getConstructSchedule()), ZEngineeringPipeJacking::getConstructSchedule, bo.getConstructSchedule());
+        return lqw;
+    }
+
+    /**
+     * 新增顶管工程
+     */
+    @Transactional(rollbackFor=Exception.class)
+    @Override
+    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(bo.getCreateTime());
+            nodeService.insert(bo.getNodeBo());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改顶管工程
+     */
+    @Override
+    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.update(bo.getNodeBo());
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(ZEngineeringPipeJacking entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    /**
+     * 批量删除顶管工程
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<String> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return baseMapper.deleteBatchIds(ids) > 0;
+    }
+}

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

@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.zdsz.mapper.ZEngineeringPipeJackingMapper">
+
+    <resultMap type="com.ruoyi.zdsz.domain.ZEngineeringPipeJacking" id="ZEngineeringPipeJackingResult">
+        <result property="id" column="id"/>
+        <result property="enginName" column="engin_name"/>
+        <result property="enginAddre" column="engin_addre"/>
+        <result property="enginCode" column="engin_code"/>
+        <result property="constructUnit" column="construct_unit"/>
+        <result property="enginScale" column="engin_scale"/>
+        <result property="constructQuality" column="construct_quality"/>
+        <result property="constructSchedule" column="construct_schedule"/>
+        <result property="version" column="version"/>
+        <result property="remark" column="remark"/>
+        <result property="delFlag" column="del_flag"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
+    </resultMap>
+
+    <select id="getCivil" resultType="java.util.Map">
+        SELECT
+            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
+                left join z_building as build on build.del_flag = '0' and build.id = m.building_id
+                left join z_unit as unit on unit.del_flag = '0' and unit.id = m.unit_id
+                left join z_house as house on house.del_flag = '0' and house.id = m.house_id
+        WHERE
+            m.del_flag = '0'  where m.id = #{enginName}
+    </select>
+
+</mapper>