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

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

@@ -0,0 +1,108 @@
+package com.ruoyi.web.controller.zdsz;
+
+import java.util.List;
+import java.util.Arrays;
+import java.util.concurrent.TimeUnit;
+
+import com.ruoyi.zdsz.domain.bo.ZEngineeringInfrastructureBo;
+import com.ruoyi.zdsz.domain.vo.ZEngineeringInfrastructureVo;
+import com.ruoyi.zdsz.service.IZEngineeringInfrastructureService;
+import lombok.RequiredArgsConstructor;
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.constraints.*;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+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.common.core.page.TableDataInfo;
+
+/**
+ * 基建工程
+ *
+ * @author ruoyi
+ * @date 2024-01-03
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/system/engineeringInfrastructure")
+public class ZEngineeringInfrastructureController extends BaseController {
+
+    private final IZEngineeringInfrastructureService iZEngineeringInfrastructureService;
+
+    /**
+     * 查询基建工程列表
+     */
+    @SaCheckPermission("system:engineeringInfrastructure:list")
+    @GetMapping("/list")
+    public TableDataInfo<ZEngineeringInfrastructureVo> list(ZEngineeringInfrastructureBo bo, PageQuery pageQuery) {
+        return iZEngineeringInfrastructureService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出基建工程列表
+     */
+    @SaCheckPermission("system:engineeringInfrastructure:export")
+    @Log(title = "基建工程", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(ZEngineeringInfrastructureBo bo, HttpServletResponse response) {
+        List<ZEngineeringInfrastructureVo> list = iZEngineeringInfrastructureService.queryList(bo);
+        ExcelUtil.exportExcel(list, "基建工程", ZEngineeringInfrastructureVo.class, response);
+    }
+
+    /**
+     * 获取基建工程详细信息
+     *
+     * @param id 主键
+     */
+    @SaCheckPermission("system:engineeringInfrastructure:query")
+    @GetMapping("/{id}")
+    public R<ZEngineeringInfrastructureVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable String id) {
+        return R.ok(iZEngineeringInfrastructureService.queryById(id));
+    }
+
+    /**
+     * 新增基建工程
+     */
+    @SaCheckPermission("system:engineeringInfrastructure:add")
+    @Log(title = "基建工程", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody ZEngineeringInfrastructureBo bo) {
+        return toAjax(iZEngineeringInfrastructureService.insertByBo(bo));
+    }
+
+    /**
+     * 修改基建工程
+     */
+    @SaCheckPermission("system:engineeringInfrastructure:edit")
+    @Log(title = "基建工程", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody ZEngineeringInfrastructureBo bo) {
+        return toAjax(iZEngineeringInfrastructureService.updateByBo(bo));
+    }
+
+    /**
+     * 删除基建工程
+     *
+     * @param ids 主键串
+     */
+    @SaCheckPermission("system:engineeringInfrastructure:remove")
+    @Log(title = "基建工程", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable String[] ids) {
+        return toAjax(iZEngineeringInfrastructureService.deleteWithValidByIds(Arrays.asList(ids), true));
+    }
+}

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

@@ -0,0 +1,75 @@
+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 java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 基建工程对象 z_engineering_infrastructure
+ *
+ * @author ruoyi
+ * @date 2024-01-03
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("z_engineering_infrastructure")
+public class ZEngineeringInfrastructure extends BaseEntity {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     *
+     */
+    @TableId(value = "id")
+    private String id;
+    /**
+     * 工程名称
+     */
+    private String enginName;
+    /**
+     * 工程地址
+     */
+    private String enginAddre;
+    /**
+     * 建设单位
+     */
+    private String constructUnit;
+    /**
+     * 开工时间
+     */
+    private Date startTime;
+    /**
+     * 计划工期
+     */
+    private String plannedDuration;
+    /**
+     * 竣工时间
+     */
+    private Date completedTime;
+    /**
+     * 工程内容
+     */
+    private String enginContent;
+    /**
+     * 乐观锁
+     */
+    @Version
+    private String version;
+    /**
+     * 备注
+     */
+    private String remark;
+    /**
+     * 删除标识
+     */
+    @TableLogic
+    private String delFlag;
+
+}

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

@@ -41,6 +41,9 @@ public class ZEngineeringPipeJacking extends BaseEntity {
      * 工程编码
      */
     private String enginCode;
+
+    @TableField(exist = false)
+    private String type;
     /**
      * 施工单位
      */

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/domain/bo/ZEngineeringInfrastructureBo.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 java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 基建工程业务对象 z_engineering_infrastructure
+ *
+ * @author ruoyi
+ * @date 2024-01-03
+ */
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class ZEngineeringInfrastructureBo extends BaseEntity {
+
+    /**
+     * ID
+     */
+    @TableId(type = IdType.ASSIGN_UUID)
+    @NotBlank(message = "id不能为空", groups = { EditGroup.class })
+    private String id;
+
+    /**
+     * 工程名称
+     */
+    @NotBlank(message = "工程名称不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String enginName;
+
+    /**
+     * 工程地址
+     */
+    @NotBlank(message = "工程地址不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String enginAddre;
+
+    /**
+     * 建设单位
+     */
+    @NotBlank(message = "建设单位不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String constructUnit;
+
+    /**
+     * 开工时间
+     */
+//    @NotNull(message = "开工时间不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Date startTime;
+
+    /**
+     * 计划工期
+     */
+//    @NotBlank(message = "计划工期不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String plannedDuration;
+
+    /**
+     * 竣工时间
+     */
+//    @NotNull(message = "竣工时间不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Date completedTime;
+
+    /**
+     * 工程内容
+     */
+//    @NotBlank(message = "工程内容不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String enginContent;
+
+    /**
+     * 备注
+     */
+//    @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String remark;
+
+    private ZEngineeringNodeBo zEngineeringNodeBo;
+
+    public ZEngineeringNodeBo getzEngineeringNodeBo() {
+        return zEngineeringNodeBo;
+    }
+
+    public void setzEngineeringNodeBo(ZEngineeringNodeBo zEngineeringNodeBo) {
+        this.zEngineeringNodeBo = zEngineeringNodeBo;
+    }
+
+
+}

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

@@ -41,7 +41,7 @@ public class ZEngineeringPipeJackingBo extends BaseEntity {
     /**
      * type
      */
-    private Integer type;
+    private String type;
 
     /**
      * 工程地址

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

@@ -5,6 +5,7 @@ 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.ZEngiineeringPhoto;
 import lombok.Data;
 import java.util.Date;
 
@@ -97,6 +98,6 @@ public class ZComprehensiveVo extends BaseEntity implements Serializable {
     /**
      * 出参
      */
-    private List<Map<String,Object>> mapList;
+    private List<ZEngiineeringPhotoVo> mapList;
 
 }

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

@@ -0,0 +1,92 @@
+package com.ruoyi.zdsz.domain.vo;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+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_infrastructure
+ *
+ * @author ruoyi
+ * @date 2024-01-03
+ */
+@Data
+@ExcelIgnoreUnannotated
+public class ZEngineeringInfrastructureVo extends BaseEntity implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     *
+     */
+    @ExcelProperty(value = "")
+    private String id;
+
+    /**
+     * 工程名称
+     */
+    @ExcelProperty(value = "工程名称")
+    private String enginName;
+
+    /**
+     * 工程地址
+     */
+    @ExcelProperty(value = "工程地址")
+    private String enginAddre;
+
+    /**
+     * 建设单位
+     */
+    @ExcelProperty(value = "建设单位")
+    private String constructUnit;
+
+    /**
+     * 开工时间
+     */
+    @ExcelProperty(value = "开工时间")
+    private Date startTime;
+
+    /**
+     * 计划工期
+     */
+    @ExcelProperty(value = "计划工期")
+    private String plannedDuration;
+
+    /**
+     * 竣工时间
+     */
+    @ExcelProperty(value = "竣工时间")
+    private Date completedTime;
+
+    /**
+     * 工程内容
+     */
+    @ExcelProperty(value = "工程内容")
+    private String enginContent;
+
+    /**
+     * 备注
+     */
+    @ExcelProperty(value = "备注")
+    private String remark;
+
+    private List<ZEngineeringNodeBo> zEngineeringNodeBoList;
+
+    public List<ZEngineeringNodeBo> getzEngineeringNodeBoList() {
+        return zEngineeringNodeBoList;
+    }
+
+    public void setzEngineeringNodeBoList(List<ZEngineeringNodeBo> zEngineeringNodeBoList) {
+        this.zEngineeringNodeBoList = zEngineeringNodeBoList;
+    }
+}

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

@@ -0,0 +1,16 @@
+package com.ruoyi.zdsz.mapper;
+
+import com.ruoyi.common.core.mapper.BaseMapperPlus;
+import com.ruoyi.zdsz.domain.ZEngineeringInfrastructure;
+import com.ruoyi.zdsz.domain.vo.ZEngineeringInfrastructureVo;
+
+/**
+ * 基建工程Mapper接口
+ *
+ * @author ruoyi
+ * @date 2024-01-03
+ */
+public interface ZEngineeringInfrastructureMapper extends BaseMapperPlus<ZEngineeringInfrastructureMapper, ZEngineeringInfrastructure, ZEngineeringInfrastructureVo> {
+
+
+}

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

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

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

@@ -57,12 +57,10 @@ public class ZComprehensiveServiceImpl implements IZComprehensiveService {
     @Override
     public ZComprehensiveVo queryById(String id){
         ZComprehensiveVo vo = baseMapper.selectVoById(id);
-//        List<Map<String,Object>> list = new ArrayList<>();
-//        Map<String,Object> map = new HashMap<>();
-//        map.put("url","http://localhost/static/img/profile.f470f2a8.jpg");
-//        map.put("id","111");
-//        list.add(map);
-        vo.setMapList(photoMapper.getlist(id));
+        ZEngiineeringPhotoBo bo = new ZEngiineeringPhotoBo();
+        bo.setParentId(id);
+        bo.setCreateTime(vo.getCreateTime());
+        vo.setMapList(photoService.queryList(bo));
         return vo;
     }
 
@@ -71,9 +69,6 @@ public class ZComprehensiveServiceImpl implements IZComprehensiveService {
      */
     @Override
     public TableDataInfo<ZComprehensiveVo> queryPageList(ZComprehensiveBo bo, PageQuery pageQuery) {
-//        LambdaQueryWrapper<ZComprehensive> lqw = buildQueryWrapper(bo);
-//        Page<ZComprehensiveVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
-//        return TableDataInfo.build(result);
         Page<ZComprehensiveVo> page = new Page<>(pageQuery.getPageNum(), pageQuery.getPageSize());
         Page<ZComprehensiveVo> list = baseMapper.getPageList(bo,page);
         return PageUtils.buildDataInfo(list);
@@ -128,10 +123,12 @@ public class ZComprehensiveServiceImpl implements IZComprehensiveService {
         return flag;
     }
 
+
     /**
      * 修改开栓|安检|维修
      */
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public Boolean updateByBo(ZComprehensiveBo bo) {
         ZComprehensive update = BeanUtil.toBean(bo, ZComprehensive.class);
         validEntityBeforeSave(update);
@@ -139,10 +136,13 @@ public class ZComprehensiveServiceImpl implements IZComprehensiveService {
             bo.setId(bo.getId());
             List<ZEngiineeringPhoto> list = new ArrayList<>();
             if (!bo.getPicIds().isEmpty()) {
-                List<String> collect = photoMapper.getlist(bo.getId()).stream().map(ele -> String.valueOf(ele.get("url"))).collect(Collectors.toList());
-                if (!collect.isEmpty()) {
-                    bo.setPicIds(bo.getPicIds().stream().filter(pic -> !collect.contains(pic)).collect(Collectors.toList()));
-                }
+                ZEngiineeringPhotoBo bo1 = new ZEngiineeringPhotoBo();
+                bo1.setParentId(update.getId());
+                bo1.setCreateTime(update.getCreateTime());
+//                List<String> collect = photoService.queryList(bo1).stream().map(ele -> ele.getPicUrl()).collect(Collectors.toList());
+//                if (!collect.isEmpty()) {
+//                    bo.setPicIds(bo.getPicIds().stream().filter(pic -> !collect.contains(pic)).collect(Collectors.toList()));
+//                }
                 bo.getPicIds().stream().forEach(o -> {
                     ZEngiineeringPhoto pic = new ZEngiineeringPhoto();
                     pic.setParentId(bo.getId());
@@ -152,7 +152,7 @@ public class ZComprehensiveServiceImpl implements IZComprehensiveService {
                     list.add(pic);
                 });
                 if (!list.isEmpty()) {
-                    photoMapper.insertBatch(list);
+                    photoService.updateBatch(list);
                 }
             }
         }

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

@@ -0,0 +1,153 @@
+package com.ruoyi.zdsz.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+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.ZEngineeringInfrastructure;
+import com.ruoyi.zdsz.domain.bo.ZEngineeringInfrastructureBo;
+import com.ruoyi.zdsz.domain.bo.ZEngineeringNodeBo;
+import com.ruoyi.zdsz.domain.vo.ZEngineeringCivilVo;
+import com.ruoyi.zdsz.domain.vo.ZEngineeringInfrastructureVo;
+import com.ruoyi.zdsz.mapper.ZEngineeringInfrastructureMapper;
+import com.ruoyi.zdsz.service.IZEngineeringInfrastructureService;
+import com.ruoyi.zdsz.service.IZEngineeringNodeService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.Map;
+import java.util.Collection;
+
+/**
+ * 基建工程Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2024-01-03
+ */
+@RequiredArgsConstructor
+@Service
+public class ZEngineeringInfrastructureServiceImpl implements IZEngineeringInfrastructureService {
+
+    @Resource
+    private final ZEngineeringInfrastructureMapper baseMapper;
+
+    @Resource
+    private final IZEngineeringNodeService izEngineeringNodeService;
+
+    /**
+     * 查询基建工程
+     */
+    @Override
+    public ZEngineeringInfrastructureVo queryById(String id){
+        ZEngineeringInfrastructureVo vo = baseMapper.selectVoById(id);
+        ZEngineeringNodeBo zEngineeringNodeBo = new ZEngineeringNodeBo();
+        zEngineeringNodeBo.setCreateTime(vo.getCreateTime());
+        zEngineeringNodeBo.setCivliId(vo.getId());
+        vo.setzEngineeringNodeBoList(izEngineeringNodeService.queryListDetails(zEngineeringNodeBo));
+        return vo;
+    }
+
+    /**
+     * 查询基建工程列表
+     */
+    @Override
+    public TableDataInfo<ZEngineeringInfrastructureVo> queryPageList(ZEngineeringInfrastructureBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<ZEngineeringInfrastructure> lqw = buildQueryWrapper(bo);
+        Page<ZEngineeringInfrastructureVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询基建工程列表
+     */
+    @Override
+    public List<ZEngineeringInfrastructureVo> queryList(ZEngineeringInfrastructureBo bo) {
+        LambdaQueryWrapper<ZEngineeringInfrastructure> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<ZEngineeringInfrastructure> buildQueryWrapper(ZEngineeringInfrastructureBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<ZEngineeringInfrastructure> lqw = Wrappers.lambdaQuery();
+        lqw.like(StringUtils.isNotBlank(bo.getEnginName()), ZEngineeringInfrastructure::getEnginName, bo.getEnginName());
+        lqw.eq(StringUtils.isNotBlank(bo.getEnginAddre()), ZEngineeringInfrastructure::getEnginAddre, bo.getEnginAddre());
+        lqw.eq(StringUtils.isNotBlank(bo.getConstructUnit()), ZEngineeringInfrastructure::getConstructUnit, bo.getConstructUnit());
+        lqw.eq(bo.getStartTime() != null, ZEngineeringInfrastructure::getStartTime, bo.getStartTime());
+        lqw.eq(StringUtils.isNotBlank(bo.getPlannedDuration()), ZEngineeringInfrastructure::getPlannedDuration, bo.getPlannedDuration());
+        lqw.eq(bo.getCompletedTime() != null, ZEngineeringInfrastructure::getCompletedTime, bo.getCompletedTime());
+        lqw.eq(StringUtils.isNotBlank(bo.getEnginContent()), ZEngineeringInfrastructure::getEnginContent, bo.getEnginContent());
+        return lqw;
+    }
+
+    /**
+     * 新增基建工程
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean insertByBo(ZEngineeringInfrastructureBo bo) {
+        ZEngineeringInfrastructure add = BeanUtil.toBean(bo, ZEngineeringInfrastructure.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setId(add.getId());
+            ZEngineeringNodeBo zEngineeringNodeBo = bo.getzEngineeringNodeBo();
+            zEngineeringNodeBo.setCivliId(add.getId());
+            zEngineeringNodeBo.setCreateTime(add.getCreateTime());
+            izEngineeringNodeService.insert(zEngineeringNodeBo);
+        }
+        return flag;
+    }
+
+    /**
+     * 修改基建工程
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean updateByBo(ZEngineeringInfrastructureBo bo) {
+        ZEngineeringInfrastructure update = BeanUtil.toBean(bo, ZEngineeringInfrastructure.class);
+        validEntityBeforeSave(update);
+        boolean flag = baseMapper.updateById(update) > 0;
+        if (flag) {
+            ZEngineeringInfrastructureVo vo = baseMapper.selectVoById(update.getId());
+            ZEngineeringNodeBo zEngineeringNodeBo = bo.getzEngineeringNodeBo();
+            zEngineeringNodeBo.setCivliId(vo.getId());
+            zEngineeringNodeBo.setCreateTime(vo.getCreateTime());
+            izEngineeringNodeService.update(zEngineeringNodeBo);
+        }
+        return flag;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(ZEngineeringInfrastructure entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    /**
+     * 批量删除基建工程
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean deleteWithValidByIds(Collection<String> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        ids.forEach(item -> {
+            ZEngineeringInfrastructureVo vo = baseMapper.selectVoById(item);
+            if(vo==null)
+            {return;}
+            ZEngineeringNodeBo zEngineeringNodeBo = new ZEngineeringNodeBo();
+            zEngineeringNodeBo.setCreateTime(vo.getCreateTime());
+            zEngineeringNodeBo.setCivliId(vo.getId());
+            List<ZEngineeringNodeBo> zEngineeringNodeBos = izEngineeringNodeService.queryListDetails(zEngineeringNodeBo);
+            zEngineeringNodeBos.forEach(ite -> izEngineeringNodeService.delete(ite));
+        }); return baseMapper.deleteBatchIds(ids) > 0;
+    }
+}

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

@@ -99,17 +99,17 @@ public class ZEngineeringPipeJackingServiceImpl implements IZEngineeringPipeJack
         ZEngineeringPipeJacking add = BeanUtil.toBean(bo, ZEngineeringPipeJacking.class);
         validEntityBeforeSave(add);
         //民用
-        if (bo.getType()==1){
+        if ("1".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(bo.getType()==2){
+        else if("2".equals(bo.getType())){
         }
         // 危险
-        else if(bo.getType()==3){
+        else if("4".equals(bo.getType())){
             List<Map<String, Object>> civil = baseMapper.getDangerous(bo.getEnginId());
             if (!civil.isEmpty()){
                 add.setEnginName((String) civil.get(0).get("name"));
@@ -117,7 +117,7 @@ public class ZEngineeringPipeJackingServiceImpl implements IZEngineeringPipeJack
             }
         }
         //基建
-        else if(bo.getType()==4){
+        else if("5".equals(bo.getType())){
             List<Map<String, Object>> civil = baseMapper.getInfrastructure(bo.getEnginId());
             if (!civil.isEmpty()){
                 add.setEnginName((String) civil.get(0).get("name"));
@@ -143,17 +143,17 @@ public class ZEngineeringPipeJackingServiceImpl implements IZEngineeringPipeJack
         ZEngineeringPipeJacking update = BeanUtil.toBean(bo, ZEngineeringPipeJacking.class);
         validEntityBeforeSave(update);
         //民用
-        if (bo.getType()==1){
+        if ("1".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(bo.getType()==2){
+        else if("2".equals(bo.getType())){
         }
         // 危险
-        else if(bo.getType()==3){
+        else if("4".equals(bo.getType())){
             List<Map<String, Object>> civil = baseMapper.getDangerous(bo.getEnginId());
             if (!civil.isEmpty()){
                 update.setEnginName((String) civil.get(0).get("name"));
@@ -161,7 +161,7 @@ public class ZEngineeringPipeJackingServiceImpl implements IZEngineeringPipeJack
             }
         }
         //基建
-        else if(bo.getType()==4){
+        else if("5".equals(bo.getType())){
             List<Map<String, Object>> civil = baseMapper.getInfrastructure(bo.getEnginId());
             if (!civil.isEmpty()){
                 update.setEnginName((String) civil.get(0).get("name"));

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

@@ -0,0 +1,26 @@
+<?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.ZEngineeringInfrastructureMapper">
+
+    <resultMap type="com.ruoyi.zdsz.domain.ZEngineeringInfrastructure" id="ZEngineeringInfrastructureResult">
+        <result property="id" column="id"/>
+        <result property="enginName" column="engin_name"/>
+        <result property="enginAddre" column="engin_addre"/>
+        <result property="constructUnit" column="construct_unit"/>
+        <result property="startTime" column="start_time"/>
+        <result property="plannedDuration" column="planned_duration"/>
+        <result property="completedTime" column="completed_time"/>
+        <result property="enginContent" column="engin_content"/>
+        <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>
+
+
+</mapper>