huanghongfa
2021-08-30 8a4135504590e152e17481fd54e5e8183bd38d99
社区调查问卷参数名修改
5个文件已修改
21 ■■■■ 已修改文件
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/WorkGuideApi.java 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/WorkGuideApi.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/WorkGuideApi.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActWorkGuideServiceImpl.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/WorkGuideApi.java
@@ -36,12 +36,11 @@
    @ApiOperation(value = "办事指南_详情", response = ComActWorkGuideVO.class)
    @GetMapping("detailworkguide")
    public R detailWorkGuide(@RequestParam("workGuideId") Long workGuideId,
        @RequestParam(value = "conmunityId", required = false) Long communityId) {
        Long conmunityId = communityId;
        @RequestParam(value = "communityId", required = false) Long communityId) {
        LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
        if (loginUserInfo != null) {
            conmunityId = loginUserInfo.getCommunityId();
            communityId = loginUserInfo.getCommunityId();
        }
        return communityService.detailWorkGuide(workGuideId, conmunityId);
        return communityService.detailWorkGuide(workGuideId, communityId);
    }
}
springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/WorkGuideApi.java
@@ -44,8 +44,8 @@
    @ApiOperation(value = "办事指南_详情", response = ComActWorkGuideVO.class)
    @GetMapping("detailworkguide")
    public R detailWorkGuide(@RequestParam("workGuideId") Long workGuideId) {
        Long conmunityId = this.getLoginUserInfo().getCommunityId();
        return communityService.detailWorkGuide(workGuideId, conmunityId);
        Long communityId = this.getLoginUserInfo().getCommunityId();
        return communityService.detailWorkGuide(workGuideId, communityId);
    }
    @ApiOperation(value = "办事指南_分页", response = ComActWorkGuideVO.class)
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
@@ -2788,7 +2788,7 @@
     * @return 详情
     */
    @GetMapping("/detailworkguide")
    R detailWorkGuide(@RequestParam("workGuideId") Long workGuideId, @RequestParam("conmunityId") Long conmunityId);
    R detailWorkGuide(@RequestParam("workGuideId") Long workGuideId, @RequestParam("communityId") Long communityId);
    /**
     * 办事指南_分页
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/WorkGuideApi.java
@@ -57,8 +57,8 @@
     */
    @GetMapping("detailworkguide")
    public R detailWorkGuide(@RequestParam("workGuideId") Long workGuideId,
        @RequestParam("conmunityId") Long conmunityId) {
        return workGuideService.detailWorkGuide(workGuideId, conmunityId);
        @RequestParam("communityId") Long communityId) {
        return workGuideService.detailWorkGuide(workGuideId, communityId);
    }
    /**
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActWorkGuideServiceImpl.java
@@ -104,14 +104,14 @@
    }
    @Override
    public R detailWorkGuide(Long workGuideId, Long conmunityId) {
    public R detailWorkGuide(Long workGuideId, Long 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(conmunityId);
        ComActDO comActDO = comActDAO.selectById(communityId);
        if (comActDO != null) {
            vo.setAddress(comActDO.getAddress());
            vo.setPhone(comActDO.getContactsPhone());