修改

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

@@ -1,5 +1,6 @@
 package com.ruoyi.web.controller.zdsz;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.annotation.RepeatSubmit;
 import com.ruoyi.common.core.controller.BaseController;
@@ -10,6 +11,7 @@ import com.ruoyi.common.core.validate.AddGroup;
 import com.ruoyi.common.core.validate.EditGroup;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.zdsz.domain.ZEngineeringGasOpening;
 import com.ruoyi.zdsz.domain.bo.ZEngineeringGasOpeningBo;
 import com.ruoyi.zdsz.domain.bo.ZEngineeringReviewBo;
 import com.ruoyi.zdsz.domain.vo.ZEngineeringGasOpeningVo;
@@ -50,6 +52,10 @@ public class ZEngineeringGasOpeningController extends BaseController {
 //        System.out.println("enginType==="+enginType);
         return iZEngineeringGasOpeningService.queryPageList(bo, pageQuery);
     }
+    @GetMapping("/queryPageListAndGetByCivi")
+    public ZEngineeringGasOpeningVo queryPageListAndGetByCivi(ZEngineeringGasOpeningBo bo, PageQuery pageQuery) {
+        return iZEngineeringGasOpeningService.queryPageListAndGetByCivi(bo, pageQuery);
+    }
 
     /**
      * 导出开栓施工列表

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

@@ -50,4 +50,6 @@ public interface IZEngineeringGasOpeningService {
     Boolean deleteWithValidByIds(Collection<String> ids, Boolean isValid);
 
     ZEngineeringGasOpeningVo query(String id, String type);
+
+    public ZEngineeringGasOpeningVo queryPageListAndGetByCivi(ZEngineeringGasOpeningBo bo, PageQuery pageQuery);
 }

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

@@ -87,6 +87,18 @@ public class ZEngineeringGasOpeningServiceImpl implements IZEngineeringGasOpenin
         return TableDataInfo.build(result);
     }
 
+    @Override
+    public ZEngineeringGasOpeningVo queryPageListAndGetByCivi(ZEngineeringGasOpeningBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<ZEngineeringGasOpening> lqw = buildQueryWrapper(bo);
+        List<ZEngineeringGasOpeningVo> vos = baseMapper.selectVoList(lqw);
+        if (!ObjectUtils.isEmpty(vos)){
+            ZEngineeringGasOpeningVo gasOpeningVo = vos.get(0);
+            return this.queryById(gasOpeningVo.getId());
+        }else {
+            throw new RuntimeException("暂无开栓数据!");
+        }
+    }
+
     /**
      * 查询开栓施工列表
      */