springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/WorkGuideApi.java
@@ -45,13 +45,13 @@ @ApiOperation(value = "办事指南_详情", response = ComActWorkGuideVO.class) @GetMapping("detailworkguide") public R detailWorkGuide(@RequestParam("workGuideId") Long workGuideId) { public R detailWorkGuide(@RequestParam("workGuideId") String workGuideId) { Long communityId = this.getLoginUserInfo().getCommunityId(); if(communityId==null|| communityId<0) { return communityService.detailWorkGuide(workGuideId, null); return communityService.detailWorkGuide(workGuideId, ""); } return communityService.detailWorkGuide(workGuideId, communityId); return communityService.detailWorkGuide(workGuideId, communityId+""); } @ApiOperation(value = "办事指南_分页", response = ComActWorkGuideVO.class) springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
@@ -3429,7 +3429,7 @@ * @return 详情 */ @GetMapping("/detailworkguide") R detailWorkGuide(@RequestParam("workGuideId") Long workGuideId, @RequestParam("communityId") Long communityId); R detailWorkGuide(@RequestParam("workGuideId") String workGuideId, @RequestParam("communityId") String communityId); /** * 办事指南_分页 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/WorkGuideApi.java
@@ -64,8 +64,8 @@ * @return 详情 */ @GetMapping("detailworkguide") public R detailWorkGuide(@RequestParam("workGuideId") Long workGuideId, @RequestParam("communityId") Long communityId) { public R detailWorkGuide(@RequestParam("workGuideId") String workGuideId, @RequestParam("communityId") String communityId) { return workGuideService.detailWorkGuide(workGuideId, communityId); } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActWorkGuideService.java
@@ -34,7 +34,7 @@ * 办事指南id * @return 社区详情 */ R detailWorkGuide(Long workGuideId, Long conmunityId); R detailWorkGuide(String workGuideId, String conmunityId); /** * 办事指南_分页 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActWorkGuideServiceImpl.java
@@ -115,30 +115,34 @@ } @Override public R detailWorkGuide(Long workGuideId, Long communityId) { public R detailWorkGuide(String workGuideId, String communityId) { ComActWorkGuideDO workGuideDO = this.baseMapper.selectById(workGuideId); if (workGuideDO == null) { return R.fail("Id有误!"); } ComActWorkGuideVO vo = new ComActWorkGuideVO(); BeanUtils.copyProperties(workGuideDO, vo); ComActDO comActDO = comActDAO.selectById(communityId); if (comActDO != null) { vo.setAddress(comActDO.getAddress()); vo.setPhone(comActDO.getContactsPhone()); vo.setLon(comActDO.getLng()); vo.setLat(comActDO.getLat()); } List<ComActWorkGuideMaterialDO> workGuideMaterialDOS = workGuideMaterialDAO.selectList(new LambdaQueryWrapper<ComActWorkGuideMaterialDO>() .eq(ComActWorkGuideMaterialDO::getWorkGuideId, workGuideId)); workGuideMaterialDOS.forEach(workGuideMaterialDO -> { ComActWorkGuideMaterialVO workGuideMaterialVO = new ComActWorkGuideMaterialVO(); workGuideMaterialVO.setId(workGuideMaterialDO.getId()); workGuideMaterialVO.setMaterialName(workGuideMaterialDO.getMaterialName()); vo.getMaterials().add(workGuideMaterialVO); }); if(!StringUtils.isEmpty(communityId)) { ComActDO comActDO = comActDAO.selectById(communityId); if (comActDO != null) { vo.setAddress(comActDO.getAddress()); vo.setPhone(comActDO.getContactsPhone()); vo.setLon(comActDO.getLng()); vo.setLat(comActDO.getLat()); } List<ComActWorkGuideMaterialDO> workGuideMaterialDOS = workGuideMaterialDAO.selectList(new LambdaQueryWrapper<ComActWorkGuideMaterialDO>() .eq(ComActWorkGuideMaterialDO::getWorkGuideId, workGuideId)); workGuideMaterialDOS.forEach(workGuideMaterialDO -> { ComActWorkGuideMaterialVO workGuideMaterialVO = new ComActWorkGuideMaterialVO(); workGuideMaterialVO.setId(workGuideMaterialDO.getId()); workGuideMaterialVO.setMaterialName(workGuideMaterialDO.getMaterialName()); vo.getMaterials().add(workGuideMaterialVO); }); } return R.ok(vo); }