修改bug

luoyuanqiao

2022-02-24 aa6db9d64d68746ae52a70fea14f2aeb71d7b236

修改bug

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/PartyOrganizationVO.java

@@ -46,6 +46,8 @@
    @ApiModelProperty(value = "楼栋id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long buildId;
    @ApiModelProperty(value = "楼栋名称")
    private String buildName;
    @ApiModelProperty(value = "所属小区名字")
    private Long areaName;
    @ApiModelProperty(value = "组织地址")

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/api/PartyBuildIngApi.java

@@ -716,6 +716,11 @@
        return comPbMemberService.pageDataStatisticsMember(statisticsMemberDto);
    }

    /**
     * 根据组织id查询组织下统计数据
     * @param statisticsOrgDto  请求参数
     * @return  组织下统计数据
     */
    @PostMapping("/getOrgDataStatistics")
    public R getOrgDataStatistics(@RequestBody ComDataStatisticsOrgDto statisticsOrgDto) {
        return comPbMemberService.getOrgDataStatistics(statisticsOrgDto);

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/ComPbMemberService.java

@@ -202,5 +202,10 @@
     */
    R pageDataStatisticsMember(PageComDataStatisticsMemberDto statisticsMemberDto);

    /**
     * 根据组织id查询组织下统计数据
     * @param statisticsOrgDto  请求参数
     * @return  组织下统计数据
     */
    R getOrgDataStatistics(ComDataStatisticsOrgDto statisticsOrgDto);
}

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbMemberServiceImpl.java

@@ -675,7 +675,6 @@
            //查询党员统计数据
            ComDataStatisticsMemberVo statisticsMemberVo = comPbMemberDAO.getMemberStatistics(member.getUserId(),member.getCommunityId());
            if(statisticsMemberVo != null){
                BeanUtils.copyProperties(statisticsMemberVo,member);
                member.setPartyActivityCount(statisticsMemberVo.getPartyActivityCount());
                member.setPartyActivityDuration(statisticsMemberVo.getPartyActivityDuration());
                member.setVolunteerActivityCount(statisticsMemberVo.getVolunteerActivityCount());
@@ -690,6 +689,11 @@
        return R.ok(memberPage);
    }

    /**
     * 根据组织id查询组织下统计数据
     * @param statisticsOrgDto  请求参数
     * @return  组织下统计数据
     */
    @Override
    public R getOrgDataStatistics(ComDataStatisticsOrgDto statisticsOrgDto) {
        List<Long> orgIds = new ArrayList<>();
@@ -729,7 +733,9 @@
        //查询左下数据
        statisticsVo = comPbMemberDAO.getOrgDataStatisticsLeftDown(communityId,orgIds,startTime,endTime);
        if(statisticsVo != null){
            BeanUtils.copyProperties(statisticsVo,statisticsOrgVo);
            statisticsOrgVo.setParticipateVolunteerActivityDuration(statisticsVo.getParticipateVolunteerActivityDuration());
            statisticsOrgVo.setParticipateVolunteerActivityNum(statisticsVo.getParticipateVolunteerActivityNum());
            statisticsOrgVo.setParticipatePartyActivityNum(statisticsVo.getParticipatePartyActivityNum());
        }

        //查询党员数据

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/resources/mapper/ComPbOrgMapper.xml

@@ -36,14 +36,14 @@
            cpo.longitude,
            cpo.latitude,
            cpo.type,
            cmr.`name` AS areaName,
            cmv.`name` AS areaName,
            cmb.`name` AS buildName,
            cpmr.`name` AS userName,
            cpmr.phone AS phone,
            (select count(id) from com_pb_member where org_id = cpo.id and audit_result = 1) as countPerson
        FROM
            com_pb_org AS cpo
            LEFT JOIN com_mng_residential AS cmr ON cmr.id = cpo.area_id
            LEFT JOIN com_mng_village AS cmv ON cmv.id = cpo.area_id
            LEFT JOIN com_pb_member_role AS cpmr ON cpmr.org_id = cpo.id
            left join com_mng_building as cmb on cmb.id = cpo.build_id
        <where>
@@ -82,14 +82,14 @@
            cpo.longitude,
            cpo.latitude,
            cpo.type,
            cmr.`name` AS areaName,
            cmv.`name` AS areaName,
            cmb.`name` AS buildName,
            cpmr.`name` AS userName,
            cpmr.phone AS phone,
            (select count(id) from com_pb_member where org_id = cpo.id and audit_result = 1) as countPerson
        FROM
            com_pb_org AS cpo
            LEFT JOIN com_mng_residential AS cmr ON cmr.id = cpo.area_id
            LEFT JOIN com_mng_village AS cmv ON cmv.id = cpo.area_id
            LEFT JOIN com_pb_member_role AS cpmr ON cpmr.org_id = cpo.id
            left join com_mng_building as cmb on cmb.id = cpo.build_id
        <where>
@@ -125,13 +125,13 @@
        cpo.longitude,
        cpo.latitude,
        cpo.type,
        cmr.`name` AS areaName,
        cmv.`name` AS areaName,
        cmb.`name` AS buildName,
        cpmr.`name` AS userName,
        cpmr.phone AS phone
        FROM
        com_pb_org AS cpo
        LEFT JOIN com_mng_residential AS cmr ON cmr.id = cpo.area_id
        LEFT JOIN com_mng_village AS cmv ON cmv.id = cpo.area_id
        LEFT JOIN com_pb_member_role AS cpmr ON cpmr.org_id = cpo.id
        left join com_mng_building as cmb on cmb.id = cpo.build_id
        <where>