花城E+防疫修改

101captain

2022-05-13 f7d12223dd44972451bef5536823a28e94a8f97b

花城E+防疫修改

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

@@ -31,8 +31,8 @@
    /**
     * 小区类型（1.城镇 2.农村 3.未知）
     */
    @ExcelProperty(value = "小区（组）", index = 3)
    private Integer type;
    @ExcelProperty(value = "小区类型", index = 3)
    private String type;
    /** 如果是城镇小区填写楼栋数量 */
    @ExcelProperty(value = "小区（组）", index = 4)
    private Integer buildSum;

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

@@ -92,7 +92,7 @@
    @ApiOperation(value = "下载模板-小区")
    @GetMapping(value = "/serve/download/template")
    public R downloadTemplate(HttpServletResponse response) {
        return R.ok(excelConvenientUrl + "实有房屋导入模板.xlsx");
        return R.ok(excelConvenientUrl + "小区导入模板.xlsx");
    }

    @ApiOperation(value = "excel导入小区")

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

@@ -214,6 +214,14 @@
        list.forEach(vo -> {
            ComMngVillageDO comMngVillageDO = new ComMngVillageDO();
            BeanUtils.copyProperties(vo, comMngVillageDO);
            if(StringUtils.isNotEmpty(vo.getType())){
                if("城镇".equals(vo.getType())){
                    comMngVillageDO.setType(1);
                }
                else {
                    comMngVillageDO.setType(2);
                }
            }
            comMngVillageDO.setCommunityId(comActDO.getCommunityId());
            comMngVillageDO.setStreetId(comActDO.getStreetId());
            StringBuilder path = new StringBuilder();
@@ -223,7 +231,7 @@
            comMngVillageDOS.add(comMngVillageDO);
        });
        this.saveBatch(comMngVillageDOS);
        return R.ok("共计导入实有房屋数量：" + comMngVillageDOS.size());
        return R.ok("共计导入实有小区数量：" + comMngVillageDOS.size());
    }

    @Override