manailin
2022-02-18 887390e3cce95c5d6bb5a87e909ea50304366bf2
[新增]仁和区离攀返攀导入特定样式功能
2个文件已修改
25 ■■■■■ 已修改文件
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java 14 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActReserveApi.java 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
@@ -2192,7 +2192,7 @@
     */
    @PostMapping("/common/data/population/importElder")
    R listSavePopulationElderExcelVO(@RequestBody List<ComMngPopulationElderExcelVO> list,
                                    @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId);
        @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId);
    /**
     * 批量导入养老金人员  listSavePopulationPensionExcelVO  批量导入养老金人员
@@ -2204,7 +2204,7 @@
     */
    @PostMapping("/common/data/population/importPension")
    R listSavePopulationPensionExcelVO(@RequestBody List<ComMngPopulationPensionExcelVO> list,
                                     @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId);
        @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId);
    /**
     * 批量导入高龄老人线下认证记录  listSaveElderAuthRecordExcelVO  批量导入高龄老人线下认证记录
@@ -2217,7 +2217,7 @@
     */
    @PostMapping("/elders/authRecords/underLine/import")
    R listSaveElderAuthRecordExcelVO(@RequestBody List<ComElderAuthRecordImportExcelVO> list,
                                       @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId);
        @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId);
    /**
     * 批量导入养老线下认证记录  listSavePensionAuthRecordExcelVO  批量导入养老线下认证记录
@@ -2230,7 +2230,7 @@
     */
    @PostMapping("/elders/pensionAuthRecords/underLine/import")
    R listSavePensionAuthRecordExcelVO(@RequestBody List<ComPensionAuthRecordImportExcelVO> list,
                                     @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId);
        @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId);
    /**
     * 确认导入实有人口(有则更新,无则新建)
@@ -5482,7 +5482,7 @@
    /**
     * 查询预约登记题目下属选择项列表
     *
     *
     * @param reserveSubId
     *            预约登记id
     * @return 查询预约登记题目下属选择项列表
@@ -6463,7 +6463,7 @@
     */
    @PostMapping("/cluster/member/import/admin")
    R importClusterMember(@RequestBody List<ComClusterMemberExcelVO> list,
                                     @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId);
        @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId);
    /**
     * 群团组织导出数据查询
@@ -8029,7 +8029,7 @@
    /**
     * [方法描述] 根据社区ID查询所属城市所在区区域代码,
     *
     *
     * @param communityId
     *            社区ID
     * @return String 区域code
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActReserveApi.java
@@ -10,6 +10,7 @@
import javax.annotation.Resource;
import org.apache.poi.ss.usermodel.BorderStyle;
import org.apache.poi.ss.usermodel.HorizontalAlignment;
import org.apache.poi.ss.usermodel.VerticalAlignment;
import org.springframework.beans.BeanUtils;
@@ -668,7 +669,15 @@
                    // 设置 垂直居中
                    contentWriteCellStyle.setVerticalAlignment(VerticalAlignment.CENTER);
                    contentWriteCellStyle.setWriteFont(writeFont);
                    // 设置边框
                    // 下边框
                    contentWriteCellStyle.setBorderBottom(BorderStyle.THIN);
                    // 左边框
                    contentWriteCellStyle.setBorderLeft(BorderStyle.THIN);
                    // 上边框
                    contentWriteCellStyle.setBorderTop(BorderStyle.THIN);
                    // 右边框
                    contentWriteCellStyle.setBorderRight(BorderStyle.THIN);
                    contentWriteCellStyle.setWrapped(true);
                    HorizontalCellStyleStrategy horizontalCellStyleStrategy =
                        new HorizontalCellStyleStrategy(headWriteCellStyle, contentWriteCellStyle);