工业工程、市政工程App工程列表、工程详情

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

@@ -75,6 +75,19 @@ public class ZEngineeringGYController extends BaseController {
     }
 
     /**
+     * 获取工业工程详细信息
+     *
+     */
+//    @SaCheckPermission("zdsz:engineeringIndustry:query")
+    @GetMapping("/getInfoforApp/{name}/{enginType}/{enginClassification}")
+    public R<ZEngineeringGYVo> getInfoforApp(
+        @NotNull(message = "工程名称不能为空")@PathVariable String name,
+        @NotNull(message = "工程类型不能为空")@PathVariable String enginType,
+        @NotNull(message = "工程分类不能为空")@PathVariable String enginClassification) {
+        return R.ok(iZEngineeringIndustryService.getInfoforApp(name, enginType, enginClassification));
+    }
+
+    /**
      * 新增工业工程
      */
 //    @SaCheckPermission("zdsz:engineeringIndustry:add")
@@ -132,6 +145,15 @@ public class ZEngineeringGYController extends BaseController {
     }
 
     /**
+     * 查询工业工程 ID、名称、类型、ect
+     */
+    @GetMapping("/queryGYforApp")
+//    @SaCheckPermission("zdsz:engineeringIndustry:type")
+    public R<List<?>> queryGYforApp(ZEngineeringIndustryGYBo bo) {
+        return R.ok(iZEngineeringIndustryService.queryByTypeforApp(bo));
+    }
+
+    /**
      * 工业工程修改工程
      */
     @PutMapping("/updateNodeByBo")

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

@@ -15,6 +15,7 @@ import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.file.FolderToZipUtil;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.zdsz.domain.bo.ZEngineeringIndustryBo;
+import com.ruoyi.zdsz.domain.vo.ZEngineeringGYVo;
 import com.ruoyi.zdsz.domain.vo.ZEngineeringIndustryTypeVo;
 import com.ruoyi.zdsz.domain.vo.ZEngineeringIndustryVo;
 import com.ruoyi.zdsz.mapper.ZEngineeringCivilMapper;
@@ -147,6 +148,15 @@ public class ZEngineeringIndustryController extends BaseController {
     }
 
     /**
+     * 工程分类查询市政工程
+     */
+    @GetMapping("/querySZforApp")
+//    @SaCheckPermission("zdsz:engineeringIndustry:type")
+    public R<List<?>> querySZforApp(ZEngineeringIndustryBo bo) {
+        return R.ok(iZEngineeringIndustryService.querySZforApp(bo));
+    }
+
+    /**
      * 市政工程修改工程
      */
     @PutMapping("/updateNodeByBo")
@@ -156,4 +166,16 @@ public class ZEngineeringIndustryController extends BaseController {
         return toAjax(iZEngineeringIndustryService.updateNodeByBo(bo));
     }
 
+    /**
+     * 获取市政工程详细信息
+     *
+     */
+//    @SaCheckPermission("zdsz:engineeringIndustry:query")
+    @GetMapping("/getInfoforApp/{name}/{enginType}")
+    public R<ZEngineeringIndustryVo> getInfoforApp(
+        @NotNull(message = "工程名称不能为空")@PathVariable String name,
+        @NotNull(message = "工程类型不能为空")@PathVariable String enginType) {
+        return R.ok(iZEngineeringIndustryService.getInfoforApp(name, enginType));
+    }
+
 }

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

@@ -59,4 +59,11 @@ public interface IZEngineeringGYService {
     ZEngineeringGYVo query(String id);
     List<?> queryByType(ZEngineeringIndustryGYBo bo);
 
+    List<?> queryGYforApp(ZEngineeringIndustryGYBo bo);
+    List<?> queryByTypeforApp(ZEngineeringIndustryGYBo bo);
+    /**
+     * 查询工业工程 详情 根据三个条件 定位ID 获取详情
+     */
+    ZEngineeringGYVo getInfoforApp(String name, String enginType, String enginClassification);
+
 }

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

@@ -4,6 +4,7 @@ import com.ruoyi.common.core.domain.PageQuery;
 import com.ruoyi.common.core.domain.entity.SysDictData;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.zdsz.domain.bo.ZEngineeringIndustryBo;
+import com.ruoyi.zdsz.domain.vo.ZEngineeringGYVo;
 import com.ruoyi.zdsz.domain.vo.ZEngineeringIndustryTypeVo;
 import com.ruoyi.zdsz.domain.vo.ZEngineeringIndustryVo;
 
@@ -59,4 +60,10 @@ public interface IZEngineeringIndustryService {
     List<ZEngineeringIndustryTypeVo> queryNameByType(ZEngineeringIndustryBo bo);
 
     List<Map<String,String>> getByUserListAndDicts(String dictType);
+
+    List<?>  querySZforApp(ZEngineeringIndustryBo bo);
+    /**
+     * 查询市政工程 详情 根据三个条件 定位ID 获取详情
+     */
+    ZEngineeringIndustryVo getInfoforApp(String name, String enginType);
 }

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

@@ -83,6 +83,36 @@ public class ZEngineeringGYServiceImpl implements IZEngineeringGYService {
         zEngineeringIndustryVo.setNodeReViewStateList(nodeService.ReViewGYList(list)!=null?nodeService.ReViewGYList(list).get(zEngineeringIndustryVo.getId()):Collections.EMPTY_LIST);
         return zEngineeringIndustryVo;
     }
+    /**
+     * 查询工业工程 根据三个条件 定位ID 获取详情
+     */
+    @Override
+    public ZEngineeringGYVo getInfoforApp(String name, String enginType, String enginClassification) {
+        ZEngineeringIndustryGYBo bo = new ZEngineeringIndustryGYBo();
+        bo.setEnginName(name);
+        bo.setEnginType(enginType);
+        bo.setEnginClassification(enginClassification);
+        LambdaQueryWrapper<ZEngineeringGY> lqw = buildQueryWrapper(bo);
+        lqw.eq(StringUtils.isNotBlank(bo.getEnginName()), ZEngineeringGY::getEnginName, bo.getEnginName());
+        lqw.eq(StringUtils.isNotBlank(bo.getEnginType()), ZEngineeringGY::getEnginType, bo.getEnginType());
+        lqw.eq(StringUtils.isNotBlank(bo.getEnginClassification()), ZEngineeringGY::getEnginClassification, bo.getEnginClassification());
+        List<ZEngineeringGYVo> onlyOneList = baseMapper.selectVoList(lqw);
+        String id = onlyOneList.get(0).getId(); // 此处可能会有异常 或者 查询多条结果集 若有则增加查询条件 保证唯一
+        ZEngineeringGYVo zEngineeringIndustryVo = baseMapper.selectVoById(id);
+        ZEngiineeringPhotoBo zEngiineeringPhotoBo = new ZEngiineeringPhotoBo();
+        zEngiineeringPhotoBo.setParentId(zEngineeringIndustryVo.getId());
+        zEngiineeringPhotoBo.setCreateTime(zEngineeringIndustryVo.getCreateTime());
+        zEngineeringIndustryVo.setPics(photoService.queryList(zEngiineeringPhotoBo));
+        ZEngineeringNodeBo zEngineeringNodeBo = new ZEngineeringNodeBo();
+        zEngineeringNodeBo.setCivliId(id);
+        zEngineeringNodeBo.setCreateTime(zEngineeringIndustryVo.getCreateTime());
+        List<ZEngineeringNodeBo> zEngineeringNodeBos = izEngineeringNodeService.queryListDetails(zEngineeringNodeBo);
+        zEngineeringIndustryVo.setZEngineeringNodeBoList(zEngineeringNodeBos);
+        ArrayList<ZEngineeringGYVo> list = new ArrayList<>();
+        list.add(zEngineeringIndustryVo);
+        zEngineeringIndustryVo.setNodeReViewStateList(nodeService.ReViewGYList(list)!=null?nodeService.ReViewGYList(list).get(zEngineeringIndustryVo.getId()):Collections.EMPTY_LIST);
+        return queryById(id);
+    }
 
     /**
      * 查询工业工程列表
@@ -418,6 +448,56 @@ public class ZEngineeringGYServiceImpl implements IZEngineeringGYService {
         return result;
     }
 
+    @Override
+    public List<?> queryByTypeforApp(ZEngineeringIndustryGYBo bo) {
+        LambdaQueryWrapper<ZEngineeringGY> zEngineeringIndustryBoLambdaQueryWrapper = buildListByType(bo);
+        List<ZEngineeringGY> zEngineeringIndustryVos = baseMapper.selectList(zEngineeringIndustryBoLambdaQueryWrapper);
+        List<Map<String, Object>> result = zEngineeringIndustryVos.stream()
+            .map(vo -> {
+                Map<String, Object> map = new HashMap<>();
+//                map.put("id", vo.getId());
+                map.put("name", vo.getEnginName());
+                map.put("enginType", vo.getEnginType()); // 小微商服
+//                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 list;
+    }
+
+    /**
+     * APP 三期新接口 先选工程名称，再选工程步骤
+     * @param bo
+     * @return ID、名称、类型
+     */
+    @Override
+    public List<?> queryGYforApp(ZEngineeringIndustryGYBo bo) {
+        LambdaQueryWrapper<ZEngineeringGY> zEngineeringIndustryBoLambdaQueryWrapper = buildListByType(bo);
+        List<ZEngineeringGY> zEngineeringIndustryVos = baseMapper.selectList(zEngineeringIndustryBoLambdaQueryWrapper);
+        List<Map<String, Object>> result = zEngineeringIndustryVos.stream()
+            .map(vo -> {
+                Map<String, Object> map = new HashMap<>();
+                map.put("id", vo.getId());
+                map.put("name", vo.getEnginName());
+                return map;
+            })
+            .collect(Collectors.toList());
+        return result;
+    }
+
     private LambdaQueryWrapper<ZEngineeringGY> buildListByType(ZEngineeringIndustryGYBo bo) {
         LambdaQueryWrapper<ZEngineeringGY> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.orderByDesc(ZEngineeringGY::getCreateTime);

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

@@ -15,6 +15,7 @@ import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.redis.RedisUtils;
 import com.ruoyi.framework.handler.MonthTableNameHandler;
 import com.ruoyi.zdsz.domain.ZEngiineeringPhoto;
+import com.ruoyi.zdsz.domain.ZEngineeringGY;
 import com.ruoyi.zdsz.domain.ZEngineeringIndustry;
 import com.ruoyi.zdsz.domain.bo.*;
 import com.ruoyi.zdsz.domain.vo.ZEngiineeringPhotoVo;
@@ -650,5 +651,54 @@ public class ZEngineeringIndustryServiceImpl implements IZEngineeringIndustrySer
         return queryWrapper;
     }
 
+    /**
+     *
+     * @param bo
+     * @return
+     */
+    @Override
+    public List<?>  querySZforApp(ZEngineeringIndustryBo bo) {
+        LambdaQueryWrapper<ZEngineeringIndustry> zEngineeringIndustryBoLambdaQueryWrapper = buildListByType(bo);
+        List<ZEngineeringIndustry> zEngineeringIndustryVos = baseMapper.selectList(zEngineeringIndustryBoLambdaQueryWrapper);
+//        List<ZEngineeringIndustryTypeVo> list = zEngineeringIndustryVos.stream().map(ZEngineeringIndustryTypeVo::new).collect(Collectors.toList());
+        List<Map<String, Object>> result = zEngineeringIndustryVos.stream()
+            .map(vo -> {
+                Map<String, Object> map = new HashMap<>();
+//                map.put("id", vo.getId());
+                map.put("name", vo.getEnginName());
+                map.put("enginType", vo.getEnginType()); // 小微商服
+//                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 list;
+//        return zEngineeringIndustryVos.stream().map(ZEngineeringIndustryTypeVo::new).collect(Collectors.toList());
+    }
 
+    public ZEngineeringIndustryVo getInfoforApp(String name, String enginType){
+        ZEngineeringIndustryBo bo = new ZEngineeringIndustryBo();
+        bo.setEnginName(name);
+        bo.setEnginType(enginType);
+//        bo.setEnginClassification(enginClassification);
+        LambdaQueryWrapper<ZEngineeringIndustry> lqw = buildQueryWrapper(bo);
+        lqw.eq(StringUtils.isNotBlank(bo.getEnginName()), ZEngineeringIndustry::getEnginName, bo.getEnginName());
+        lqw.eq(StringUtils.isNotBlank(bo.getEnginType()), ZEngineeringIndustry::getEnginType, bo.getEnginType());
+//        lqw.eq(StringUtils.isNotBlank(bo.getEnginClassification()), ZEngineeringIndustry::getEnginClassification, bo.getEnginClassification());
+        List<ZEngineeringIndustryVo> onlyOneList = baseMapper.selectVoList(lqw);
+        String id = onlyOneList.get(0).getId(); // 此处可能会有异常 或者 查询多条结果集 若有则增加查询条件 保证唯一
+        return queryById(id);
+    }
 }