增加小区id查询楼栋列表

luoyuanqiao

2022-02-23 d61fe0d64ffc6767972263b34273c72e84974962

增加小区id查询楼栋列表

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/partybuilding/PageComDataStatisticsMemberDto.java

@@ -23,4 +23,7 @@

    @ApiModelProperty(value = "年份")
    private Integer month;

    @ApiModelProperty(value = "社区id", hidden = true)
    private Long communityId;
}

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

@@ -29,4 +29,80 @@

    @ApiModelProperty(value = "性别（1.是 2.否）")
    private Integer sex;

    @ApiModelProperty(value = "年龄")
    private Integer age;

    @ApiModelProperty(value = "党龄")
    private Integer partyAge;

    @ApiModelProperty(value = "职能")
    private String function;

    @ApiModelProperty(value = "特长类别（1.体育类 2.舞蹈类 3.音乐类 4.美术类 5.其他）")
    private Integer specialtyCategory;

    @ApiModelProperty(value = "特长描述")
    private String specialtyName;

    @ApiModelProperty(value = "职位")
    private String position;

    @ApiModelProperty(value = "职位2")
    private String positionTwo;

    @ApiModelProperty(value = "身份证号")
    private String idCard;

    @ApiModelProperty(value = "手机号")
    private String phone;

    @ApiModelProperty(value = "报道单位id")
    private Long checkUnitId;

    @ApiModelProperty(value = "报道单位名称")
    private String checkUnitName;

    @ApiModelProperty(value = "所属党组织id")
    private Long orgId;

    @ApiModelProperty(value = "所属党组织名称")
    private String orgName;

    @ApiModelProperty(value = "社区id")
    private Long communityId;

    @ApiModelProperty(value = "总活动次数")
    private Integer activityCount;

    @ApiModelProperty(value = "总活动时长（小时）")
    private Integer activityDuration;

    @ApiModelProperty(value = "党员活动次数")
    private Integer partyActivityCount;

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

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

    @ApiModelProperty(value = "志愿者活动次数")
    private Integer volunteerActivityCount;

    @ApiModelProperty(value = "志愿者活动时长（小时）")
    private Integer volunteerActivityDuration;

    @ApiModelProperty(value = "志愿者活动积分数量")
    private Integer volunteerActivityIntegral;

    @ApiModelProperty(value = "完成微心愿数量")
    private Integer wishCount;

    @ApiModelProperty(value = "完成随手拍数量")
    private Integer easyCount;

    @ApiModelProperty(value = "用户id")
    private Long userId;

}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java

@@ -8292,4 +8292,12 @@
    @PostMapping("/common/data/history/filled")
    R filledPopulationPersonType(@RequestBody List<ComMngPopulationServeExcelVO> newVoList,
                                 @RequestParam("communityId") Long communityId, @RequestParam("userId") Long userId);

    /**
     * 根据小区id查询楼栋列表
     * @param villageId 小区id
     * @return  查询楼栋列表
     */
    @GetMapping("/building/getBuildListByVillageId")
    R getBuildListByVillageId(@RequestParam(value = "villageId") Long villageId);
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/partybuilding/PartyBuildingService.java

@@ -539,4 +539,12 @@
     */
    @PostMapping("/partybuildIng/getTaskPbActivityPeopleList")
    R getTaskPbActivityPeopleList(@RequestParam("activityId") Long activityId);

    /**
     * 分页查询党员数据统计
     * @param statisticsMemberDto   请求参数
     * @return  党员数据统计
     */
    @PostMapping("/partybuildIng/pageDataStatisticsMember")
    R pageDataStatisticsMember(@RequestBody PageComDataStatisticsMemberDto statisticsMemberDto);
}

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

@@ -96,6 +96,12 @@
        return communityService.pageBuildingAdmin(pageBuildingListDto);
    }

    @ApiOperation(value = "根据小区id查询楼栋列表")
    @GetMapping("/getBuildList")
    public R getBuildListByVillageId(@RequestParam(value = "villageId") Long villageId) {
        return communityService.getBuildListByVillageId(villageId);
    }

    @ApiOperation(value = "楼栋列表表头统计", response = BuildingListHeaderStatisticsAdminVo.class)
    @GetMapping("/header/statistics")
    public R headerStatistics() {

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

@@ -786,9 +786,10 @@
    }


    @ApiOperation(value = "党员数据统计-分页查询党员数据")
    @ApiOperation(value = "党员数据统计-分页查询党员数据",response = ComDataStatisticsMemberVo.class)
    @PostMapping("/dataStatistics/member/page")
    public R pageDataStatisticsMember(@RequestBody PageComDataStatisticsMemberDto statisticsMemberDto) {
        return null;
        statisticsMemberDto.setCommunityId(this.getCommunityId());
        return partyBuildingService.pageDataStatisticsMember(statisticsMemberDto);
    }
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/BuildingApi.java

@@ -115,4 +115,14 @@
    public R deleteBuildingHousePopulationAdmin(@RequestBody DeleteBuildingHousePopulationDto housePopulationDto) {
        return comActBuildingService.deleteBuildingHousePopulationAdmin(housePopulationDto);
    }

    /**
     * 根据小区id查询楼栋列表
     * @param villageId 小区id
     * @return  查询楼栋列表
     */
    @GetMapping("/getBuildListByVillageId")
    public R getBuildListByVillageId(@RequestParam("villageId") Long villageId) {
        return comActBuildingService.getBuildListByVillageId(villageId);
    }
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngBuildingDAO.java

@@ -92,4 +92,11 @@
                                                                @Param("relation") Integer relation, @Param("relationId") Integer relationId);

    List<ComMngVillageVO> buildingVillageListAdmin(@Param("communityId") Long communityId);

    /**
     * 根据小区id查询楼栋列表
     * @param villageId 小区id
     * @return  查询楼栋列表
     */
    List<PageBuildingListAdminVo> getBuildListByVillageId(Long villageId);
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActBuildingService.java

@@ -7,6 +7,7 @@
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComMngBuildingExcelVO;
import com.panzhihua.service_community.model.dos.ComMngBuildingDO;
import org.springframework.web.bind.annotation.RequestParam;

/**
 * @author xyh
@@ -65,4 +66,11 @@
    R editBuildingHouseAdmin(EditBuildingHouseDto editBuildingHouseDto);

    R deleteBuildingHousePopulationAdmin(DeleteBuildingHousePopulationDto housePopulationDto);

    /**
     * 根据小区id查询楼栋列表
     * @param villageId 小区id
     * @return  查询楼栋列表
     */
    R getBuildListByVillageId(Long villageId);
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActBuildingServiceImpl.java

@@ -636,4 +636,14 @@
        }
        return R.ok();
    }

    /**
     * 根据小区id查询楼栋列表
     * @param villageId 小区id
     * @return  查询楼栋列表
     */
    @Override
    public R getBuildListByVillageId(Long villageId) {
        return R.ok(this.baseMapper.getBuildListByVillageId(villageId));
    }
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComMngBuildingMapper.xml

@@ -205,4 +205,14 @@
            community_id = ${communityId}
    </select>

    <select id="getBuildListByVillageId" resultType="com.panzhihua.common.model.vos.community.building.admin.PageBuildingListAdminVo">
        SELECT
            cmb.id,
            cmb.`name`,
        FROM
            com_mng_building AS cmb
        WHERE
            cmb.village_id = #{villageId}
    </select>

</mapper>

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

@@ -705,4 +705,14 @@
    public R getTaskPbActivityPeopleList(@RequestParam("activityId") Long activityId) {
        return comBpActivityService.getTaskPbActivityPeopleList(activityId);
    }

    /**
     * 分页查询党员数据统计
     * @param statisticsMemberDto   请求参数
     * @return  党员数据统计
     */
    @PostMapping("/pageDataStatisticsMember")
    public R pageDataStatisticsMember(@RequestBody PageComDataStatisticsMemberDto statisticsMemberDto) {
        return comPbMemberService.pageDataStatisticsMember(statisticsMemberDto);
    }
}

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComPbMemberDAO.java

@@ -2,6 +2,8 @@

import java.util.List;

import com.panzhihua.common.model.dtos.partybuilding.PageComDataStatisticsMemberDto;
import com.panzhihua.common.model.vos.partybuilding.*;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
@@ -10,10 +12,6 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.model.vos.partybuilding.ComPbMemberExcelVO;
import com.panzhihua.common.model.vos.partybuilding.PagePartyBuildingMemberVO;
import com.panzhihua.common.model.vos.partybuilding.PagePartyOrganizationVO;
import com.panzhihua.common.model.vos.partybuilding.PartyBuildingMemberVO;
import com.panzhihua.service_dangjian.model.dos.ComPbMemberDO;

/**
@@ -103,4 +101,19 @@
     * @return  党员信息
     */
    PartyBuildingMemberVO queryById(@Param("id") Long id);

    /**
     * 分页查询党员数据统计
     * @param statisticsMemberDto   请求参数
     * @return  党员数据统计
     */
    IPage<ComDataStatisticsMemberVo> pageDataStatisticsMember(Page page, @Param("dto") PageComDataStatisticsMemberDto statisticsMemberDto);

    /**
     * 查询人口活动统计数据
     * @param userId    用户id
     * @param communityId   社区id
     * @return  人口活动统计数据
     */
    ComDataStatisticsMemberVo getMemberStatistics(@Param("userId") Long userId,@Param("communityId") Long communityId);
}

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

@@ -3,9 +3,11 @@
import java.util.List;

import com.baomidou.mybatisplus.extension.service.IService;
import com.panzhihua.common.model.dtos.partybuilding.PageComDataStatisticsMemberDto;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.partybuilding.*;
import com.panzhihua.service_dangjian.model.dos.ComPbMemberDO;
import org.springframework.web.bind.annotation.RequestBody;

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
@@ -191,4 +193,11 @@
     * @return 党员信息列表
     */
    R exportPbMember(PagePartyOrganizationVO organizationVO);

    /**
     * 分页查询党员数据统计
     * @param statisticsMemberDto   请求参数
     * @return  党员数据统计
     */
    R pageDataStatisticsMember(PageComDataStatisticsMemberDto statisticsMemberDto);
}

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

@@ -7,6 +7,7 @@

import javax.annotation.Resource;

import com.panzhihua.common.model.dtos.partybuilding.PageComDataStatisticsMemberDto;
import org.springframework.beans.BeanUtils;
import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.stereotype.Service;
@@ -658,4 +659,32 @@
        return R.ok(comPbMemberDAO.exportPbMember(organizationVO));
    }

    /**
     * 分页查询党员数据统计
     * @param statisticsMemberDto   请求参数
     * @return  党员数据统计
     */
    @Override
    public R pageDataStatisticsMember(PageComDataStatisticsMemberDto statisticsMemberDto) {
        IPage<ComDataStatisticsMemberVo> memberPage = comPbMemberDAO.pageDataStatisticsMember(new Page(statisticsMemberDto.getPageNum()
                ,statisticsMemberDto.getPageSize()),statisticsMemberDto);
        memberPage.getRecords().forEach(member -> {
            //查询党员统计数据
            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());
                member.setVolunteerActivityDuration(statisticsMemberVo.getVolunteerActivityDuration());
                member.setVolunteerActivityIntegral(statisticsMemberVo.getVolunteerActivityIntegral());
                member.setWishCount(statisticsMemberVo.getWishCount());
                member.setEasyCount(statisticsMemberVo.getEasyCount());
                member.setActivityCount(member.getPartyActivityCount() + member.getVolunteerActivityCount());
                member.setActivityDuration(member.getPartyActivityDuration() + member.getVolunteerActivityDuration());
            }
        });
        return R.ok(memberPage);
    }

}

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

@@ -140,5 +140,79 @@
        </if>
    </select>

    <select id="pageDataStatisticsMember" resultType="com.panzhihua.common.model.vos.partybuilding.ComDataStatisticsMemberVo">
        SELECT
            cpm.id,
            cpm.`name`,
            cpm.photo_path,
            cpm.type,
            cpm.`function`,
            cpm.specialty_category,
            cpm.specialty_name,
            cpm.position,
            cpm.position_two,
            cpm.id_card,
            cpm.phone,
            cpm.check_unit_id,
            cpm.user_id,
            cpcu.`name` AS checkUnitName,
            cpm.org_id,
            cpm.community_id,
            cpo.`name` AS orgName,
            YEAR (
                from_days(
                datediff( now( ), cpm.join_time ))) AS partyAge,
            (select count(id) from com_pb_member_role where id_card = cpm.id_card) as isRole
        FROM
            com_pb_member AS cpm
            LEFT JOIN com_pb_check_unit AS cpcu ON cpcu.id = cpm.check_unit_id
            LEFT JOIN com_pb_org AS cpo ON cpo.id = cpm.org_id
            <where>
                and cpm.audit_result = 1
                <if test="dto.communityId != null">
                    and cpm.community_id = #{dto.communityId}
                </if>

                <if test="dto.keyWord != null and dto.keyWord !=''">
                    and (
                    cpm.`name` like concat (#{dto.keyWord},'%') or
                    cpm.`id_card` = #{dto.keyWord} or
                    cpm.`phone` like concat (#{dto.keyWord},'%') or
                    cpcu.`name` like concat (#{dto.keyWord},'%') or
                    cpo.`name` like concat (#{dto.keyWord},'%')
                    )
                </if>
            </where>
            order by cpm.create_at desc
    </select>

    <select id="getMemberStatistics" resultType="com.panzhihua.common.model.vos.partybuilding.ComDataStatisticsMemberVo">
        SELECT
            count( cpam.id ) AS partyActivityCount,
            IFNULL(( SELECT integral_available_party FROM com_act_integral_user WHERE user_id = #{userId} AND community_id = #{communityId} ), 0 ) AS partyActivityIntegral,
            IFNULL(( SELECT integral_available_volunteer FROM com_act_integral_user WHERE user_id = #{userId} AND community_id = #{communityId} ), 0 ) AS volunteerActivityIntegral,
            ( SELECT count( caas.id ) FROM com_act_act_sign AS caas
            LEFT JOIN com_act_activity AS caa ON caa.id = caas.activity_id
            WHERE caas.user_id = #{userId} and caas.status = 1 and caa.community_id = #{communityId}
            ) AS volunteerActivityCount,
            IFNULL((
                SELECT
                    sum( caa.duration )
                FROM
                    com_act_act_sign AS caas
                    LEFT JOIN com_act_activity AS caa ON caa.id = caas.activity_id
                WHERE
                    caas.user_id = #{userId} and caas.status = 1 and caa.community_id = #{communityId}
                    ),
                0
            ) AS volunteerActivityDuration,
            ( SELECT count( id ) FROM com_act_micro_wish WHERE sponsor_id = #{userId} AND `status` = 6 AND community_id = #{communityId} ) AS wishCount,
            ( SELECT count( id ) FROM com_act_easy_photo WHERE sponsor_id = #{userId} AND `status` = 4 AND community_id = #{communityId} ) AS easyCount
        FROM
            com_pb_activity_member AS cpam
            LEFT JOIN com_pb_member AS cpm ON cpm.id = cpam.member_id
        WHERE
            cpm.user_id = #{userId}
    </select>
</mapper>