101captain
2021-12-28 d3534fcd7f86d6dac617062bde8008b544c908ea
12/28  党员积分修改
7个文件已修改
33 ■■■■ 已修改文件
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/BigScreenApi.java 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/BigScreenApi.java 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComPbMemberDAO.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/BigScreenService.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/BigScreenServiceImpl.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComPbMemberMapper.xml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
@@ -7530,11 +7530,11 @@
    /**
     * 党员积分前3
     * @param communityId
     * @param pageBigScreenStatisticPartyOrg
     * @return
     */
    @GetMapping("/bigscreen/party/partyActivityTop")
    R partyActivityTop(@RequestParam("communityId")Long communityId);
    @PostMapping("/bigscreen/party/partyActivityTop")
    R partyActivityTop(@RequestBody PageBigScreenStatisticPartyOrg pageBigScreenStatisticPartyOrg);
    /**
     * 社区服务大屏数据分析接口
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/BigScreenApi.java
@@ -150,8 +150,9 @@
     * @return
     */
    @ApiOperation(value = "党员积分前3", response = BigScreenActivityTop.class)
    @GetMapping("/partyActivityTop")
    public R partyActivityTop(){
        return communityService.partyActivityTop(this.getCommunityId());
    @PostMapping("/partyActivityTop")
    public R partyActivityTop(@RequestBody PageBigScreenStatisticPartyOrg pageBigScreenStatisticPartyOrg){
        pageBigScreenStatisticPartyOrg.setCommunityId(this.getCommunityId());
        return communityService.partyActivityTop(pageBigScreenStatisticPartyOrg);
    }
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/BigScreenApi.java
@@ -98,11 +98,11 @@
    /**
     * 党员积分前3
     * @param communityId
     * @param pageBigScreenStatisticPartyOrg
     * @return
     */
    @GetMapping("/partyActivityTop")
    public R partyActivityTop(@RequestParam("communityId")Long communityId){
        return bigScreenService.partyActivityTop(communityId);
    @PostMapping("/partyActivityTop")
    public R partyActivityTop(@RequestBody PageBigScreenStatisticPartyOrg pageBigScreenStatisticPartyOrg){
        return bigScreenService.partyActivityTop(pageBigScreenStatisticPartyOrg);
    }
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComPbMemberDAO.java
@@ -44,7 +44,7 @@
     * @param communityId
     * @return
     */
    List<BigScreenActivityTop> selectActivityTop(@Param("communityId") Long communityId);
    IPage<BigScreenActivityTop> selectActivityTop(Page page,@Param("communityId") Long communityId);
    /**
     * 服务数据查询
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/BigScreenService.java
@@ -67,10 +67,10 @@
    /**
     *查询党员积分前3
     * @param communityId
     * @param pageBigScreenStatisticPartyOrg
     * @return
     */
    R partyActivityTop(Long communityId);
    R partyActivityTop(PageBigScreenStatisticPartyOrg pageBigScreenStatisticPartyOrg);
    /**
     * 服务数据
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/BigScreenServiceImpl.java
@@ -123,8 +123,8 @@
    }
    @Override
    public R partyActivityTop(Long communityId) {
        return R.ok(this.comPbMemberDAO.selectActivityTop(communityId));
    public R partyActivityTop(PageBigScreenStatisticPartyOrg pageBigScreenStatisticPartyOrg) {
        return R.ok(this.comPbMemberDAO.selectActivityTop(new Page(pageBigScreenStatisticPartyOrg.getPageNum(),pageBigScreenStatisticPartyOrg.getPageSize()),pageBigScreenStatisticPartyOrg.getCommunityId()));
    }
    @Override
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComPbMemberMapper.xml
@@ -12,7 +12,7 @@
    </select>
    <select id="selectActivityTop" resultType="com.panzhihua.common.model.vos.community.bigscreen.BigScreenActivityTop">
        select t.name,t.photo_path as url,t1.name as orgName,t2.integral_available_party as score from com_pb_member t LEFT JOIN com_pb_org t1 on t.org_id= t1.id LEFT JOIN com_act_integral_user t2 on t.user_id = t2.user_id where t.community_id =#{communityId} and t2.status = 1  order by integral_available_party desc limit 100
        select t.name,t.photo_path as url,t1.name as orgName,t2.integral_available_party as score from com_pb_member t LEFT JOIN com_pb_org t1 on t.org_id= t1.id LEFT JOIN com_act_integral_user t2 on t.user_id = t2.user_id where t.community_id =#{communityId} and t2.status = 1  order by integral_available_party desc
    </select>
    <select id="bigScreenServiceData" resultType="com.panzhihua.common.model.vos.community.bigscreen.BigScreenServiceData">