花城E+bug更新

101captain

2022-05-18 39dc823583675d870cd98e979eaa3e459000627b

花城E+bug更新

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

@@ -6994,6 +6994,14 @@
    R deleteBuildingHousePopulationAdmin(@RequestBody DeleteBuildingHousePopulationDto housePopulationDto);

    /**
     * 删除楼栋
     * @param id
     * @return
     */
    @GetMapping("/building/delete")
    R buildingDelete(@RequestParam("id")Long id);

    /**
     * 分页查询所有数据
     *
     * @param commonPage 查询实体

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

@@ -329,4 +329,10 @@
        }
    }

    @ApiOperation("删除楼栋")
    @GetMapping("/delete")
    public R delete(@RequestParam("id")Long id){
        return communityService.buildingDelete(id);
    }

}

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

@@ -125,4 +125,9 @@
    public R getBuildListByVillageId(@RequestParam("villageId") Long villageId) {
        return comActBuildingService.getBuildListByVillageId(villageId);
    }

    @GetMapping("/delete")
    public R delete(@RequestParam("id")Long id){
        return comActBuildingService.delete(id);
    }
}

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

@@ -73,4 +73,11 @@
     * @return  查询楼栋列表
     */
    R getBuildListByVillageId(Long villageId);

    /**
     * 删除
     * @param id
     * @return
     */
    R delete(Long id);
}

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

@@ -646,4 +646,9 @@
    public R getBuildListByVillageId(Long villageId) {
        return R.ok(this.baseMapper.getBuildListByVillageId(villageId));
    }

    @Override
    public R delete(Long id) {
        return R.ok(this.baseMapper.deleteById(id));
    }
}

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

@@ -98,7 +98,7 @@
            cmv.alley,
            cmv.house_num AS doorNum,
            cmb.`name`,
            cmv.`name` AS village,
            cmv.`name` AS villageName,
            cmv.village_id,
            ( SELECT count( id ) FROM com_mng_population_house WHERE village_id = cmb.village_id AND floor = cmb.`name` AND `unit_no` is not null and house_no is not null) AS houseNum,
            ( SELECT count( id ) FROM com_mng_population_house WHERE village_id = cmb.village_id AND floor = cmb.`name` AND `unit_no` is not null and house_no is not null AND `status` = 1 ) AS liveTotal,