bug修复

huanghongfa

2021-10-15 f5208c733d7b1b89041d00a92622eeeb7bb7fcc6

bug修复

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

@@ -2530,12 +2530,12 @@
    /**
     * 批量删除实有人口
     *
     * @param Ids
     * @param ids
     *            实有人口id集合
     * @return 删除结果
     */
    @PostMapping("/common/data/population/delete")
    R deletePopulations(@RequestBody List<Long> Ids);
    R deletePopulations(@RequestBody List<Long> ids, Long communityId);

    /**
     * 根据社区id查询所有实有人口

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

@@ -1207,8 +1207,8 @@

    @ApiOperation(value = "批量删除实有人口")
    @PostMapping("/delete")
    public R deletePopulations(@RequestBody List<Long> Ids) {
        return communityService.deletePopulations(Ids);
    public R deletePopulations(@RequestBody List<Long> ids) {
        return communityService.deletePopulations(ids,this.getCommunityId());
    }

    private List<List<String>> headDataFilling() {

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

@@ -607,13 +607,13 @@
    /**
     * 批量删除实有人口
     *
     * @param Ids
     * @param ids
     *            删除id集合
     * @return 删除结果
     */
    @PostMapping("/population/delete")
    public R deletePopulations(@RequestBody List<Long> Ids) {
        return comMngPopulationService.deletePopulations(Ids);
    public R deletePopulations(@RequestBody List<Long> ids, Long communityId) {
        return comMngPopulationService.deletePopulations(ids,communityId);
    }

    /**

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

@@ -18,4 +18,11 @@

    void updateAll(@Param("comMngPopulationCommunityTagsDOS") List<ComMngPopulationCommunityTagsDO> comMngPopulationCommunityTagsDOS);

    /**
     * 删除实有人口与社区绑定关系
     * @param ids   实有人口id集合
     * @param communityId   社区id
     */
    void deletePopulationRelation(@Param("ids") List<Long> ids,@Param("communityId") Long communityId);

}

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

@@ -249,11 +249,11 @@
    /**
     * 批量删除实有人口
     *
     * @param Ids
     * @param ids
     *            实有人口id集合
     * @return 删除结果
     */
    R deletePopulations(List<Long> Ids);
    R deletePopulations(List<Long> ids, Long communityId);

    /**
     * 根据社区id查询所有实有人口

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

@@ -6310,23 +6310,14 @@
    /**
     * 批量删除实有人口
     *
     * @param Ids
     * @return
     * @param ids 实有人口id集合
     * @return  删除结果
     */
    @Override
    @Transactional(rollbackFor = Exception.class)
    public R deletePopulations(List<Long> Ids) {
        if (!Ids.isEmpty()) {
            Ids.forEach(id -> {
                // 清除用户房屋居住信息
                comMngPopulationHouseUserDAO.deletePopulationHouseByUserId(id);
            });
        }
        int delete = populationDAO.deleteBatchIds(Ids);
        if (delete > 0) {
    public R deletePopulations(List<Long> ids, Long communityId) {
        comMngPopulationCommunityTagsDAO.deletePopulationRelation(ids,communityId);
            return R.ok();
        }
        return R.fail();
    }

    /**

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

@@ -233,6 +233,7 @@
            return R.fail("id有误！");
        }
        BeanUtils.copyProperties(comMngVillageVO, comMngVillageDO);
        comMngVillageDO.setName(comMngVillageVO.getGroupAt());
        ComActDO comActDO = comActDAO.selectById(comMngVillageDO.getCommunityId());
        if (comActDO == null || comActDO.getStreetId() == null) {
            return R.fail("社区没有绑定街道，请绑定后操作！");

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

@@ -80,7 +80,7 @@
                    and cmv.alley like concat(#{pageBuildingListDto.keyWord},'%')
                </if>
            </where>
        order by cmb.create_at desc
        order by alley asc
    </select>

    <select id="buildingListHeaderStatisticsAdmin" resultType="com.panzhihua.common.model.vos.community.building.admin.BuildingListHeaderStatisticsAdminVo">

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

@@ -36,4 +36,11 @@
        ;
    </update>

    <delete id="deletePopulationRelation">
        delete from com_mng_population_community_tags where community_id = #{communityId} and population_id in
        <foreach item="item" collection="ids" separator="," open="(" close=")" index="">
            #{item}
        </foreach>
    </delete>

</mapper>