修复bug

tangxiaobao

2022-02-28 96e69508039e5e289554db44815d2469f65839db

修复bug

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActivityVO.java

@@ -245,4 +245,7 @@
    private String activityType;

    private String areaCode;

    @ApiModelProperty("单次活动时长（小时）")
    private Integer duration;
}

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

@@ -82,7 +82,7 @@
    private Integer partyActivityCount;

    @ApiModelProperty(value = "党员活动时长（小时）")
    private Integer partyActivityDuration;
    private Integer partyActivityDuration = 0;

    @ApiModelProperty(value = "党员活动积分数量")
    private Integer partyActivityIntegral;

 springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityPartyBuildingApi.java

@@ -797,6 +797,7 @@
    @ApiOperation(value = "党员数据统计-根据党组织统计数据",response = ComDataStatisticsOrgVo.class)
    @PostMapping("/dataStatistics/org")
    public R getOrgDataStatistics(@RequestBody ComDataStatisticsOrgDto statisticsOrgDto) {
        statisticsOrgDto.setCommunityId(this.getCommunityId());
        return partyBuildingService.getOrgDataStatistics(statisticsOrgDto);
    }


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

@@ -128,7 +128,8 @@
        cmv.`name` AS areaName,
        cmb.`name` AS buildName,
        cpmr.`name` AS userName,
        cpmr.phone AS phone
        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_village AS cmv ON cmv.village_id = cpo.area_id