修改市政工程返回接口

查询APP碰口列表
工业工程竣工时间、通气时间、完工百分比
施工信息施工时间查询

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

@@ -131,7 +131,7 @@ public class ZEnginMaterialQualityController extends BaseController {
         List<Map> select1 = iZEnginMaterialQualityService.selectEnginQualty(tableName,id);//工业室内管线
         tableName = "z_engineering_gy";
         id = "1801130856355454978";
-        List<Map> select2 = iZEnginMaterialQualityService.selectEnginQualty(tableName,id);//工业室外管线
+        List<Map> select2 = iZEnginMaterialQualityService.selectEnginQualty(tableName,id);//工业室外管线 庭院
         tableName = "z_engineering_industry";
         id = "1801146254913916929";
         List<Map> select3 = iZEnginMaterialQualityService.selectEnginQualty(tableName,id);//市政工程
@@ -153,7 +153,7 @@ public class ZEnginMaterialQualityController extends BaseController {
         List<Map> select1 = iZEnginMaterialQualityService.selectEnginQualtyShenhe(tableName,id);//工业室内管线
         tableName = "z_engineering_gy";
         id = "1801130856355454978";
-        List<Map> select2 = iZEnginMaterialQualityService.selectEnginQualtyShenhe(tableName,id);//工业室外管线
+        List<Map> select2 = iZEnginMaterialQualityService.selectEnginQualtyShenhe(tableName,id);//工业室外管线 庭院
         tableName = "z_engineering_industry";
         id = "1801146254913916929";
         List<Map> select3 = iZEnginMaterialQualityService.selectEnginQualtyShenhe(tableName,id);//市政工程

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

@@ -8,6 +8,7 @@ import java.util.Map;
 import java.util.concurrent.TimeUnit;
 
 import com.ruoyi.common.utils.file.FolderToZipUtil;
+import com.ruoyi.zdsz.domain.bo.ZEngineeringIndustryGYBo;
 import com.ruoyi.zdsz.service.IZEngineeringNodeService;
 import lombok.RequiredArgsConstructor;
 import javax.servlet.http.HttpServletResponse;
@@ -181,4 +182,14 @@ public class ZEngineeringPipeJackingController extends BaseController {
                           @PathVariable String[] ids) {
         return toAjax(iZEngineeringPipeJackingService.deleteWithValidByIds(Arrays.asList(ids), true));
     }
+
+    /**
+     * 顶管列表查询
+     * @param bo
+     * @return
+     */
+    @GetMapping("/queryDGforApp")
+    public R<List<?>> queryDGforApp(ZEngineeringPipeJackingBo bo) {
+        return R.ok(iZEngineeringPipeJackingService.queryDGforApp(bo));
+    }
 }

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

@@ -3,6 +3,7 @@ package com.ruoyi.web.controller.zdsz;
 import java.util.List;
 import java.util.Arrays;
 
+import com.ruoyi.zdsz.domain.bo.ZEngineeringIndustryBo;
 import com.ruoyi.zdsz.domain.vo.ZEngineeringIndustryVo;
 import lombok.RequiredArgsConstructor;
 import javax.servlet.http.HttpServletResponse;
@@ -103,4 +104,13 @@ public class ZTouchOperationEngineeringController extends BaseController {
                           @PathVariable Long[] ids) {
         return toAjax(iZTouchOperationEngineeringService.deleteWithValidByIds(Arrays.asList(ids), true));
     }
+
+    /**
+     * 碰口工程列表
+     */
+    @GetMapping("/queryPKforApp")
+//    @SaCheckPermission("zdsz:engineeringIndustry:type")
+    public R<List<?>> queryPKforApp(ZTouchOperationEngineeringBo bo) {
+        return R.ok(iZTouchOperationEngineeringService.queryPKforApp(bo));
+    }
 }

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

@@ -115,13 +115,15 @@ public class ZEngineeringGYVo extends BaseEntity {
     private Double gsj=0.0;
     @ExcelProperty(value = "派发时间")
     private String createTimeStr; // 创建时间 派发时间
-    @ExcelProperty(value = "开工时间")
+    @ExcelProperty(value = "进场时间")
     private String startTimeStr; // 开工时间 进场时间
     private Date startTime;
     @ExcelProperty(value = "竣工时间")
+    private String beCompletedTimeStr; // 竣工时间
     private Date beCompletedTime; // 竣工时间
     @ExcelProperty(value = "通气时间")
-    private Date airTime; // 通气时间
+    private String airTimeStr; // 通气时间
+//    private Date airTime; // 通气时间
     @ExcelProperty(value = "完工百分比")
     private String donePercent; // 完工百分比
 

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

@@ -53,4 +53,6 @@ public interface IZEngineeringPipeJackingService {
     ZEngineeringPipeJackingVo queryByIdType(String id, String type);
 
     List<Map<String, Object>> nameList(ZEngineeringPipeJackingBo bo);
+
+    List<Map<String, Object>> queryDGforApp(ZEngineeringPipeJackingBo bo);
 }

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

@@ -1,6 +1,8 @@
 package com.ruoyi.zdsz.service;
 
+import com.ruoyi.common.core.domain.R;
 import com.ruoyi.zdsz.domain.ZTouchOperationEngineering;
+import com.ruoyi.zdsz.domain.bo.ZEngineeringIndustryBo;
 import com.ruoyi.zdsz.domain.vo.ZTouchOperationEngineeringVo;
 import com.ruoyi.zdsz.domain.bo.ZTouchOperationEngineeringBo;
 import com.ruoyi.common.core.page.TableDataInfo;
@@ -48,4 +50,6 @@ public interface IZTouchOperationEngineeringService {
      * 校验并批量删除碰口作业信息
      */
     Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+    List<?> queryPKforApp(ZTouchOperationEngineeringBo bo);
 }

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

@@ -34,6 +34,7 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.ObjectUtils;
 
 import javax.annotation.Resource;
+import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
@@ -130,7 +131,7 @@ public class ZEngineeringGYServiceImpl implements IZEngineeringGYService {
             if("室内管线".equals(item.getEnginClassification())){
                 state = "进场";
                 end = "通气";
-            } else if ("室外管线".equals(item.getEnginClassification())) {
+            } else if ("庭院".equals(item.getEnginClassification())) {
                 state = "进场";
                 end = "通气";
             } else if ("架空管线".equals(item.getEnginClassification())) {
@@ -165,8 +166,11 @@ public class ZEngineeringGYServiceImpl implements IZEngineeringGYService {
         return doList(baseMapper.selectVoList(lqw));
     }
     public List<ZEngineeringGYVo> doList(List<ZEngineeringGYVo> list) {
+        Map<String, Object> reviewList = nodeService.ReViewGYList(list);
         for (int i = 0; i < list.size(); i++) {
             ZEngineeringGYVo vo = list.get(i);
+            vo.setEnginName(vo.getEnginName() + "-" + vo.getEnginClassification());
+            vo.setNodeReViewStateList(reviewList.get(vo.getId()));
             vo.setRowNumber(i+1); // 序号 rowNumber
             SimpleDateFormat simpleDateFormat = new SimpleDateFormat("YYYY-MM-dd");
             vo.setCreateTimeStr(simpleDateFormat.format(vo.getCreateTime())); // 派发时间 createtime
@@ -175,7 +179,7 @@ public class ZEngineeringGYServiceImpl implements IZEngineeringGYService {
             if("室内管线".equals(vo.getEnginClassification())){
                 state = "进场";
                 end = "通气";
-            } else if ("室外管线".equals(vo.getEnginClassification())) {
+            } else if ("庭院".equals(vo.getEnginClassification())) {
                 state = "进场";
                 end = "通气";
             } else if ("架空管线".equals(vo.getEnginClassification())) {
@@ -189,16 +193,23 @@ public class ZEngineeringGYServiceImpl implements IZEngineeringGYService {
             zEngineeringNodeBo.setCreateTime(vo.getCreateTime());
             zEngineeringNodeBo.setCivliId(vo.getId());
             zEngineeringNodeBo.setType(state);
-            System.out.println(i+" vo.getCreateTime()="+vo.getCreateTime());
             List<ZEngineeringNodeBo> zEngineeringNodeBos = nodeService.queryListDetails(zEngineeringNodeBo);
             vo.setStartTime(zEngineeringNodeBos!=null && zEngineeringNodeBos.size()>0 ? zEngineeringNodeBos.get(0).getUpdateTime():null);
-            System.out.println(i+" vo.getStartTime()="+vo.getStartTime());
             vo.setStartTimeStr(vo.getStartTime() == null ? null : simpleDateFormat.format(vo.getStartTime())); // 进场时间 startTime
-//            vo.getZEngineeringNodeBoList().get()
-            // 竣工时间 beCompletedTime
-            // 通气时间 airTime
-            // 完工百分比 donePercent
-
+            ZEngineeringNodeBo zEngineeringNodeBoEnd = new ZEngineeringNodeBo();
+            zEngineeringNodeBoEnd.setCreateTime(vo.getCreateTime());
+            zEngineeringNodeBoEnd.setCivliId(vo.getId());
+            zEngineeringNodeBoEnd.setType(end);
+            List<ZEngineeringNodeBo> zEngineeringNodeBosEnd = nodeService.queryListDetails(zEngineeringNodeBoEnd);
+            vo.setBeCompletedTime(zEngineeringNodeBosEnd!=null && zEngineeringNodeBosEnd.size()>0 ? zEngineeringNodeBosEnd.get(0).getUpdateTime():null);
+            vo.setBeCompletedTimeStr(vo.getBeCompletedTime() == null ? null : simpleDateFormat.format(vo.getBeCompletedTime())); // 竣工时间 beCompletedTime
+            vo.setAirTimeStr(vo.getBeCompletedTimeStr()); // 通气时间 airTime
+            List<Map> nodeReViewStateList = (List)vo.getNodeReViewStateList();
+            int size = nodeReViewStateList.size();
+            long done = nodeReViewStateList.stream().filter(item -> item.get("state").equals("1")).count();
+            Double donePercent = done * 100.0 / size;
+            BigDecimal percentage = new BigDecimal(donePercent).setScale(2);
+            vo.setDonePercent(percentage + "%");// 完工百分比 donePercent
         }
         return list;
     }

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

@@ -249,7 +249,7 @@ public class ZEngineeringIndustryServiceImpl implements IZEngineeringIndustrySer
                 if (item.get("enginClassification").equals("室内管线")) {
                     municipalEngineeringNode.addAll(sysDictMap.get("gy_inner"));
                 }
-                if (item.get("enginClassification").equals("室外管线")) {
+                if (item.get("enginClassification").equals("庭院")) {
                     municipalEngineeringNode.addAll(sysDictMap.get("gy_out"));
                 }
                 if (item.get("enginClassification").equals("调压柜")) {
@@ -310,18 +310,18 @@ public class ZEngineeringIndustryServiceImpl implements IZEngineeringIndustrySer
 
             listPage.getRecords().forEach(item -> {
                 String modeOperation = item.get("modeOperation").toString();
-                String dists = "";
-                if ("地埋扳孔".equals(modeOperation)) {
-                    dists = "bury_the_wrench_hole";
-                } else if ("架空扳孔".equals(modeOperation)) {
-                    dists = "aerial_wrench_hole";
-                } else if ("停气作业".equals(modeOperation)) {
-                    dists = "shutdown_operation";
-                } else if ("PE 封堵".equals(modeOperation)) {
-                    dists = "pe_plugging";
-                } else if ("钢管带气封堵".equals(modeOperation)) {
-                    dists = "the_steel_pipe_sealed_with_gas";
-                }
+                String dists = modeOperation;
+//                if ("地埋扳孔".equals(modeOperation)) {
+//                    dists = "bury_the_wrench_hole";
+//                } else if ("架空扳孔".equals(modeOperation)) {
+//                    dists = "aerial_wrench_hole";
+//                } else if ("停气作业".equals(modeOperation)) {
+//                    dists = "shutdown_operation";
+//                } else if ("PE 封堵".equals(modeOperation)) {
+//                    dists = "pe_plugging";
+//                } else if ("钢管带气封堵".equals(modeOperation)) {
+//                    dists = "the_steel_pipe_sealed_with_gas";
+//                }
                 String date = new SimpleDateFormat("yyyy_MM").format(Date.from(((LocalDateTime) item.get("createTime")).atZone(ZoneId.systemDefault()).toInstant()));
                 ;
                 ;
@@ -664,7 +664,7 @@ public class ZEngineeringIndustryServiceImpl implements IZEngineeringIndustrySer
         List<Map<String, Object>> result = zEngineeringIndustryVos.stream()
             .map(vo -> {
                 Map<String, Object> map = new HashMap<>();
-//                map.put("id", vo.getId());
+                map.put("id", vo.getId());
                 map.put("name", vo.getEnginName());
                 map.put("enginType", vo.getEnginType()); // 小微商服
 //                map.put("enginClassification", vo.getEnginClassification()); // 室内管线 室外管线 调压柜 室内管线

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

@@ -87,6 +87,7 @@ public class ZEngineeringInfoServiceImpl implements IZEngineeringInfoService {
                 zEngineeringInfoBo1.setHeadPhone(sysUser.getPhonenumber());
                 zEngineeringInfoBo1.setConstructPhone(sysUser.getPhonenumber());
             }
+//            zEngineeringInfoBo1.setConstructTime(item.getConstructTime()); // 施工时间
             List<String> photoList = izEngiineeringPhotoService.queryList(zEngineeringInfoBo1);
             List<ZEngineeringMaterialBo> zEngineeringMaterialBo = izEngineeringMaterialService.query(zEngineeringInfoBo1);
             zEngineeringInfoBo1.setzEngiineeringPhotoBoList(photoList);

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

@@ -979,7 +979,7 @@ public class ZEngineeringNodeServiceImpl implements IZEngineeringNodeService {
                             }
                         });
                     });
-                }else if("下管".equals(item2.getType())&&item.getEnginClassification().equals("室外管线")){
+                }else if("下管".equals(item2.getType())&&item.getEnginClassification().equals("庭院")){
                     LambdaQueryWrapper<ZEngineeringInfo> lqw3 = Wrappers.lambdaQuery();
                     lqw3.eq(StringUtils.isNotBlank(item2.getId()), ZEngineeringInfo::getEngInfoId, item2.getId());
                     List<ZEngineeringInfo> info= zEngineeringInfoMapper.selectList(lqw3);
@@ -1002,7 +1002,7 @@ public class ZEngineeringNodeServiceImpl implements IZEngineeringNodeService {
             if (item.getEnginClassification().equals("室内管线")){
                 flag = "gy_inner";
             }
-            if (item.getEnginClassification().equals("室外管线")){
+            if (item.getEnginClassification().equals("庭院")){
                 flag = "gy_out";
             }
             if (item.getEnginClassification().equals("调压柜")){
@@ -1062,18 +1062,18 @@ public class ZEngineeringNodeServiceImpl implements IZEngineeringNodeService {
                 }
             });
             List stateList = new ArrayList();
-            String dists = "";
-            if ("地埋扳孔".equals(item.getModeOperation())){
-                dists="bury_the_wrench_hole";
-            }else if ("架空扳孔".equals(item.getModeOperation())){
-                dists="aerial_wrench_hole";
-            }else if ("停气作业".equals(item.getModeOperation())){
-                dists="shutdown_operation";
-            }else if ("PE 封堵".equals(item.getModeOperation())){
-                dists="pe_plugging";
-            }else if ("钢管带气封堵".equals(item.getModeOperation())){
-                dists="the_steel_pipe_sealed_with_gas";
-            }
+            String dists = item.getModeOperation();
+//            if ("地埋扳孔".equals(item.getModeOperation())){
+//                dists="bury_the_wrench_hole";
+//            }else if ("架空扳孔".equals(item.getModeOperation())){
+//                dists="aerial_wrench_hole";
+//            }else if ("停气作业".equals(item.getModeOperation())){
+//                dists="shutdown_operation";
+//            }else if ("PE 封堵".equals(item.getModeOperation())){
+//                dists="pe_plugging";
+//            }else if ("钢管带气封堵".equals(item.getModeOperation())){
+//                dists="the_steel_pipe_sealed_with_gas";
+//            }
             sysDictMap.get(dists).stream().forEach(item3 -> {
                 Map<String, Object> map = new HashMap<>();
                 if (nodeList.size() > 0 && nodeList.stream().anyMatch(x -> x.getType().equals(item3.getDictValue()))) {

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

@@ -328,4 +328,35 @@ public class ZEngineeringPipeJackingServiceImpl implements IZEngineeringPipeJack
         });
         return baseMapper.deleteBatchIds(ids) > 0;
     }
+
+    @Override
+    public List<Map<String, Object>> queryDGforApp(ZEngineeringPipeJackingBo bo) {
+        List<Map<String, Object>> zEngineeringPipeJackingVos = baseMapper.nameList(bo);
+//        List<Map<String, Object>> result = nameList(bo).stream()
+//            .map(vo -> {
+//                Map<String, Object> map = new HashMap<>();
+////                map.put("id", vo.getId());
+////                map.put("name", vo.getEnginName());
+//                map.put("name", vo.get("enginName"));
+////                map.put("enginType", vo.getEnginType()); // 小微商服
+//                map.put("enginType", vo.get("enginType")); // 小微商服
+////                map.put("enginClassification", vo.getEnginClassification()); // 室内管线 室外管线 调压柜 室内管线
+//                return map;
+//            })
+//            .collect(Collectors.toList());
+//        List<Map<String, Object>> list = new ArrayList<>();
+//        for (Map map : result) {
+//            boolean isExist = false;
+//            for (Map gyVo : list) {
+//                if(map.get("name").equals(gyVo.get("name")) && map.get("name").equals(gyVo.get("name"))){
+//                    isExist = true;
+//                    break;
+//                }
+//            }
+//            if(!isExist){
+//                list.add(map);
+//            }
+//        }
+        return zEngineeringPipeJackingVos;
+    }
 }

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

@@ -95,7 +95,7 @@ public class ZEngineeringWasteMaterialServiceImpl implements IZEngineeringWasteM
                 dictType = "gy_inner";
                 break;
             }
-            case "室外管线":{
+            case "庭院":{
                 dictType = "gy_out";
                 break;
             }
@@ -143,7 +143,7 @@ public class ZEngineeringWasteMaterialServiceImpl implements IZEngineeringWasteM
         for (int i = 0; i < zEngineeringNodeBos.size(); i++) {
             ZEngineeringNodeBo nodeBo = zEngineeringNodeBos.get(i);
             for (ZEngineeringInfoBo info: nodeBo.getzEngineeringInfoBoList()) {
-                if((zEngineeringGYVo.getEnginClassification().equals("室外管线") && !nodeBo.getType().equals("下管")) || (zEngineeringGYVo.getEnginClassification().equals("室内管线") && !nodeBo.getType().equals("焊接"))){ // 工业工程室外管线只算下管、工业工程室内管线只算焊接
+                if((zEngineeringGYVo.getEnginClassification().equals("庭院") && !nodeBo.getType().equals("下管")) || (zEngineeringGYVo.getEnginClassification().equals("室内管线") && !nodeBo.getType().equals("焊接"))){ // 工业工程室外管线只算下管、工业工程室内管线只算焊接
                     continue;
                 }
                 System.out.println(info.getzEngineeringMaterialBo());
@@ -221,7 +221,7 @@ public class ZEngineeringWasteMaterialServiceImpl implements IZEngineeringWasteM
                 List<SysDictData> dictData = new ArrayList<>();
                 if (one.getEnginClassification().equals("室内管线")) {
                     dictData = sysDictMap.get("gy_inner");
-                } else if (one.getEnginClassification().equals("室外管线")) {
+                } else if (one.getEnginClassification().equals("庭院")) {
                     dictData = sysDictMap.get("gy_out");
                 } else if (one.getEnginClassification().equals("调压柜")) {
                     dictData = sysDictMap.get("gy_tyg");
@@ -465,32 +465,32 @@ public class ZEngineeringWasteMaterialServiceImpl implements IZEngineeringWasteM
         List<ZEngineeringNodeBo> zEngineeringNodeBos = izEngineeringNodeService.queryListDetails(zEngineeringNodeBo);
 //        zEngineeringIndustryVo.setZEngineeringNodeBoList(zEngineeringNodeBos);
         String modeOperation = zTouchOperationEngineeringVo.getModeOperation();
-        String dictType;
-        switch (modeOperation){
-            case "地埋扳孔":{
-                dictType = "bury_the_wrench_hole";
-                break;
-            }
-            case "架空扳孔":{
-                dictType = "aerial_wrench_hole";
-                break;
-            }
-            case "停气作业":{
-                dictType = "shutdown_operation";
-                break;
-            }
-            case "PE 封堵":{
-                dictType = "pe_plugging";
-                break;
-            }
-            case "钢管带气封堵":{
-                dictType = "the_steel_pipe_sealed_with_gas";
-                break;
-            }
-            default:{
-                dictType = null;
-            }
-        }
+        String dictType = modeOperation;
+//        switch (modeOperation){
+//            case "地埋扳孔":{
+//                dictType = "bury_the_wrench_hole";
+//                break;
+//            }
+//            case "架空扳孔":{
+//                dictType = "aerial_wrench_hole";
+//                break;
+//            }
+//            case "停气作业":{
+//                dictType = "shutdown_operation";
+//                break;
+//            }
+//            case "PE 封堵":{
+//                dictType = "pe_plugging";
+//                break;
+//            }
+//            case "钢管带气封堵":{
+//                dictType = "the_steel_pipe_sealed_with_gas";
+//                break;
+//            }
+//            default:{
+//                dictType = null;
+//            }
+//        }
         Map<String, List<SysDictData>> sysDictMap = RedisUtils.getCacheMap("sys_dict");
         List<SysDictData> dictDataList = sysDictMap.get(dictType);
         ZEngineeringWasteMaterialVo zEngineeringWasteMaterialVo = new ZEngineeringWasteMaterialVo();
@@ -561,7 +561,7 @@ public class ZEngineeringWasteMaterialServiceImpl implements IZEngineeringWasteM
             AtomicReference<BigDecimal> gsj = new AtomicReference<>(new BigDecimal(0));
             for (int i = 0; i < zEngineeringNodeBos.size(); i++) {
                 ZEngineeringNodeBo nodeBo = zEngineeringNodeBos.get(i);
-                if((zEngineeringGYVo.getEnginClassification().equals("室外管线") && !nodeBo.getType().equals("下管")) || (zEngineeringGYVo.getEnginClassification().equals("室内管线") && !nodeBo.getType().equals("焊接"))){ // 工业工程室外管线只算下管、工业工程室内管线只算焊接
+                if((zEngineeringGYVo.getEnginClassification().equals("庭院") && !nodeBo.getType().equals("下管")) || (zEngineeringGYVo.getEnginClassification().equals("室内管线") && !nodeBo.getType().equals("焊接"))){ // 工业工程室外管线只算下管、工业工程室内管线只算焊接
                     continue;
                 }
                 for (ZEngineeringInfoBo info: nodeBo.getzEngineeringInfoBoList()) {

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

@@ -1,12 +1,14 @@
 package com.ruoyi.zdsz.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
+import com.ruoyi.common.core.domain.R;
 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.ZEngineeringIndustryBo;
 import com.ruoyi.zdsz.domain.bo.ZEngineeringNodeBo;
 import com.ruoyi.zdsz.domain.vo.ZEngineeringCivilVo;
 import com.ruoyi.zdsz.domain.vo.ZEngineeringIndustryVo;
@@ -21,9 +23,11 @@ import com.ruoyi.zdsz.mapper.ZTouchOperationEngineeringMapper;
 import com.ruoyi.zdsz.service.IZTouchOperationEngineeringService;
 import org.springframework.util.ObjectUtils;
 
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Collection;
+import java.util.stream.Collectors;
 
 /**
  * 碰口作业Service业务层处理
@@ -162,4 +166,24 @@ public class ZTouchOperationEngineeringServiceImpl implements IZTouchOperationEn
         }
         return baseMapper.deleteBatchIds(ids) > 0;
     }
+
+    /**
+     * 碰口工程列表
+     */
+    @Override
+    public List<?> queryPKforApp(ZTouchOperationEngineeringBo bo){
+        LambdaQueryWrapper<ZTouchOperationEngineering> lqw = buildQueryWrapper(bo);
+        List<ZTouchOperationEngineeringVo> zTouchOperationEngineeringVoList = baseMapper.selectVoList(lqw);
+        List<Map<String, Object>> result = zTouchOperationEngineeringVoList.stream()
+            .map(vo -> {
+                Map<String, Object> map = new HashMap<>();
+                map.put("id", vo.getId());
+                map.put("name", vo.getEnginName());
+                map.put("locations", vo.getLocations()); // 地点
+                map.put("modeOperation", vo.getModeOperation()); // 作业方式
+                return map;
+            })
+            .collect(Collectors.toList());
+        return result;
+    }
 }