lidongdong
2023-11-15 da9d3cd6be3dbd04d638788210437e2af46ca90e
社区组织共建详情修改
7个文件已修改
23 ■■■■ 已修改文件
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/NewStriveAppApi.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/partybuilding/NewStriveForFeign.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/NewStriveApi.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/api/NewFightCommunityConstructionApi.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/NewFightCommunityConstructionDAO.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/NewFightCommunityConstructionService.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/NewFightCommunityConstructionServiceImpl.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/NewStriveAppApi.java
@@ -235,11 +235,11 @@
                getCommunityId()+"",null);
    }
    @ApiOperation(value = "社区共建项目删除", response = NewFightCommunityConstructionDTO.class)
    @ApiOperation(value = "社区共建项目详情", response = NewFightCommunityConstructionDTO.class)
    @GetMapping("/getNewFightCommunityDetails")
    public R getNewFightCommunityDetails(@RequestParam("id") String id)
    {
        return newStriveForFeign.getNewFightCommunityDetails(id);
        return newStriveForFeign.getNewFightCommunityDetails(id,getUserId()+"");
    }
    @ApiOperation(value = "社区共建项目添加")
@@ -521,7 +521,6 @@
        }
        return r;
    }
    /************************************************************************************************************
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/partybuilding/NewStriveForFeign.java
@@ -145,7 +145,8 @@
                                      @RequestParam(value = "userId", required = false)  String userId);
    @GetMapping("/NewFightCommunity/getNeedClaimDetails")
    public R getNewFightCommunityDetails(@RequestParam("id") String id);
    public R getNewFightCommunityDetails(@RequestParam("id") String id,
                                         @RequestParam(value = "userId", required = false)  String userId);
    @PostMapping("/NewFightCommunity/addNeedClaimData")
    public R addNewFightCommunityData(@RequestBody NewFightCommunityConstructionDTO item);
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/NewStriveApi.java
@@ -45,7 +45,7 @@
    @GetMapping("/getNewFightCommunityDetails")
    public R getNewFightCommunityDetails(@RequestParam("id") String id)
    {
        return newStriveForFeign.getNewFightCommunityDetails(id);
        return newStriveForFeign.getNewFightCommunityDetails(id,null);
    }
    @ApiOperation(value = "社区共建项目添加")
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/api/NewFightCommunityConstructionApi.java
@@ -33,9 +33,10 @@
    }
    @GetMapping("/getNeedClaimDetails")
    public R getNewFightCommunityDetails(@RequestParam("id") String id)
    public R getNewFightCommunityDetails(@RequestParam("id") String id,
                                         @RequestParam(value = "userId", required = false)  String userId)
    {
        return R.ok(claimService.getDetails(id));
        return R.ok(claimService.getDetails(id,userId));
    }
    @PostMapping("/addNeedClaimData")
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/NewFightCommunityConstructionDAO.java
@@ -22,7 +22,7 @@
                                                    @Param("communityId") String communityId,
                                                    @Param("userId") String userId);
    NewFightCommunityConstructionDTO getDetails(@Param("id")String id);
    NewFightCommunityConstructionDTO getDetails(@Param("id")String id,@Param("userId") String userId);
    int addData(@Param("item") NewFightCommunityConstructionDTO item);
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/NewFightCommunityConstructionService.java
@@ -17,7 +17,7 @@
    IPage<NewFightCommunityConstructionDTO> getList(int pageNum, int pageSize,
                                                    String communityId,String userId);
    NewFightCommunityConstructionDTO getDetails(String id);
    NewFightCommunityConstructionDTO getDetails(String id,String userId);
    R addData(NewFightCommunityConstructionDTO item);
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/NewFightCommunityConstructionServiceImpl.java
@@ -41,9 +41,9 @@
    }
    @Override
    public NewFightCommunityConstructionDTO getDetails(String id)
    public NewFightCommunityConstructionDTO getDetails(String id,String userId)
    {
        return baseMapper.getDetails(id);
        return baseMapper.getDetails(id,userId);
    }
    @Override