springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComElderAuthRecordImportExcelListen.java
@@ -87,21 +87,13 @@ * 不是固定的列只能手动处理 */ private void saveData() { R<List<BcDictionaryVO>> dictionaryR = communityService.listDictionaryByKey(BcDictionaryConstants.FAMILY); log.info("开始导入线下认证居民数据"); log.info("表格总数据：" + list.size()); if (list.size() == 0) { throw new ServiceException("100", "导入数据为空！"); } ValueOperations<String, String> valueOperations = stringRedisTemplate.opsForValue(); String key = Constants.ELDER_RECORD_ERROR_LIST; Map<String, String> dictMap = dictionaryR.getData().stream() .collect(Collectors.toMap(BcDictionaryVO::getDictName, BcDictionaryVO::getDictValue)); // Map<String,Integer> dictMap = new HashMap<>(); // for(BcDictionaryVO vo : dictionaryR.getData()){ // dictMap.put(vo.getDictName(),Integer.valueOf(vo.getDictValue())); // } String key = Constants.ELDER_RECORD_ERROR_LIST + communityId; int index = 2; try { @@ -198,12 +190,6 @@ log.info("业务层处理成功"); List<ComElderAuthRecordImportMistakeExcelVO> list = JSONArray.parseArray(JSONArray.toJSONString(r.getData()), ComElderAuthRecordImportMistakeExcelVO.class); // String errMsg = r.getMsg(); // List<ComMngPopulationImportErrorVO> errorList = // JSON.parseArray(errMsg,ComMngPopulationImportErrorVO.class); // if(!errorList.isEmpty()){ // populationImportErrorVOList.addAll(errorList); // } mistakes.addAll(list); log.info("将错误数据存入redis中"); valueOperations.set(key, JSONArray.toJSONString(mistakes), 1, TimeUnit.HOURS); springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComPensionAuthRecordImportExcelListen.java
@@ -93,7 +93,7 @@ throw new ServiceException("100", "导入数据为空！"); } ValueOperations<String, String> valueOperations = stringRedisTemplate.opsForValue(); String key = Constants.PENSION_RECORD_ERROR_LIST; String key = Constants.PENSION_RECORD_ERROR_LIST + + communityId; Map<String, String> dictMap = dictionaryR.getData().stream() .collect(Collectors.toMap(BcDictionaryVO::getDictName, BcDictionaryVO::getDictValue)); springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageElderAuthRecordsDTO.java
@@ -49,4 +49,7 @@ @ApiModelProperty(value = "社区ID", hidden = true) private Long communityId; @ApiModelProperty(value = "认证方式（1.视频认证 2.人脸认证 3.线下认证）") private String authMethod; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComElderAuthRecordImportExcelVO.java
@@ -23,7 +23,7 @@ @ExcelProperty(value = "认证身份证号码", index = 1) @EncryptDecryptField private String IdCard; private String idCard; @ExcelProperty(value = "联系电话", index = 2) private String phone; springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComElderAuthRecordImportMistakeExcelVO.java
@@ -21,7 +21,7 @@ @ExcelProperty(value = "认证身份证号码", index = 1) @EncryptDecryptField private String IdCard; private String idCard; @ExcelProperty(value = "联系电话", index = 2) private String phone; springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComPensionAuthRecordImportExcelVO.java
@@ -24,7 +24,7 @@ @ExcelProperty(value = "认证身份证号码", index = 1) @EncryptDecryptField private String IdCard; private String idCard; @ExcelProperty(value = "联系电话", index = 2) private String phone; springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComPensionAuthRecordImportMistakeExcelVO.java
@@ -23,7 +23,7 @@ @ExcelProperty(value = "认证身份证号码", index = 1) @EncryptDecryptField private String IdCard; private String idCard; @ExcelProperty(value = "联系电话", index = 2) private String phone; springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/EldersAuthApi.java
@@ -244,7 +244,7 @@ * @author txb * @date 2021/9/02 11:03 */ @ApiOperation(value = "高龄认证-分页查询高龄老人认证记录", response = ComElderAuthRecordVO.class) @ApiOperation(value = "高龄认证-分页查询高龄老人认证记录---", response = ComElderAuthRecordVO.class) @PostMapping("/authRecords/page") public R pageElderAuthRecords(@RequestBody PageElderAuthRecordsDTO pageElderAuthRecordsDTO) { Long communityId = this.getLoginUserInfo().getCommunityId(); @@ -259,7 +259,7 @@ * @author txb * @date 2021/9/02 11:03 */ @ApiOperation(value = "高龄认证-根据高龄认证记录id查询详情", response = ComElderAuthRecordVO.class) @ApiOperation(value = "高龄认证-根据高龄认证记录id查询详情---", response = ComElderAuthRecordVO.class) @GetMapping("/authRecords/detail") public R detailElderAuthRecords(@RequestParam(value = "authRecordId") Long authRecordId) { return communityService.detailElderAuthRecords(authRecordId); @@ -272,7 +272,7 @@ * @author txb * @date 2021/9/02 11:03 */ @ApiOperation(value = "高龄认证-高龄认证审核") @ApiOperation(value = "高龄认证-高龄认证审核---") @PostMapping("/authRecords/examine") public R examineElderAuthRecords(@RequestBody ComElderAuthRecordVO comElderAuthRecordVO) { return communityService.examineElderAuthRecords(comElderAuthRecordVO); @@ -285,7 +285,7 @@ * @author txb * @date 2021/9/02 11:03 */ @ApiOperation(value = "高龄认证-高龄认证标记") @ApiOperation(value = "高龄认证-高龄认证标记---") @PostMapping("/authRecords/sign") public R signElderAuthRecords(@RequestBody ComElderAuthRecordVO comElderAuthRecordVO) { return communityService.signElderAuthRecords(comElderAuthRecordVO); @@ -298,7 +298,7 @@ * @author txb * @date 2021/9/02 11:03 */ @ApiOperation(value = "高龄认证-高龄认证导出") @ApiOperation(value = "高龄认证-高龄认证导出---") @PostMapping("/authRecords/export") public R exportElderAuthRecords(@RequestBody List<Long> ids) { // List<ComMngPopulationMistakeExcelVO> list = JSON.parseArray(mistakes,ComMngPopulationMistakeExcelVO.class); @@ -354,7 +354,7 @@ } } @ApiOperation(value = "高龄认证统计-下载模板-线下认证居民导入") @ApiOperation(value = "高龄认证统计-下载模板-线下认证居民导入---") @GetMapping("/authRecords/uderLine/export") public R exportUnderLineElderAuthRecords() { // 生成动态模板excel通过ftp工具上传到主节点，然后返回模板下载地址 @@ -397,7 +397,65 @@ } } @ApiOperation(value = "高龄认证统计-excel导入线下认证居民") @ApiOperation(value = "下载导入失败高龄认证数据---") @PostMapping("/download/error/authRecords") public R downloadErrorAuthRecord(@RequestParam(value = "key") String key) { List<ComElderAuthRecordImportMistakeExcelVO> list = new ArrayList<>(); Boolean isExits = stringRedisTemplate.hasKey(key); ValueOperations<String, String> valueOperations = stringRedisTemplate.opsForValue(); if (isExits) { String json = valueOperations.get(key); list = JSONArray.parseArray(json, ComElderAuthRecordImportMistakeExcelVO.class); } // List<ComMngPopulationMistakeExcelVO> list = JSON.parseArray(mistakes,ComMngPopulationMistakeExcelVO.class); // 生成动态模板excel通过ftp工具上传到主节点，然后返回模板下载地址 String ftpUrl = "/mnt/data/web/excel/"; String nowDate = DateUtils.getCurrentDateString(); String name = "高龄认证记录导入错误数据" + nowDate + ".xlsx"; try { SFTPUtil sftp = new SFTPUtil(userName, password, host, port); sftp.login(); boolean existDir = sftp.isExistDir(ftpUrl + name); if (!existDir) { String property = System.getProperty("user.dir"); String fileName = property + File.separator + name; // 这里 需要指定写用哪个class去写 ExcelWriter excelWriter = null; InputStream inputStream = null; try { excelWriter = EasyExcel.write(fileName, ComElderAuthRecordImportMistakeExcelVO.class) .registerWriteHandler(new LongestMatchColumnWidthStyleStrategy()) .registerWriteHandler(new CustomSheetWriteHandler()).build(); WriteSheet writeSheet = EasyExcel.writerSheet("高龄认证记录导入错误数据").build(); excelWriter.write(list, writeSheet); excelWriter.finish(); File file = new File(fileName); inputStream = new FileInputStream(file); sftp.uploadMore(ftpUrl, name, inputStream); sftp.logout(); inputStream.close(); String absolutePath = file.getAbsolutePath(); boolean delete = file.delete(); log.info("删除excel【{}】结果【{}】", absolutePath, delete); } finally { // 千万别忘记finish 会帮忙关闭流 if (inputStream != null) { inputStream.close(); } if (excelWriter != null) { excelWriter.finish(); } } } return R.ok(excelUrl + name); } catch (Exception e) { e.printStackTrace(); log.error("文件传输失败【{}】", e.getMessage()); return R.fail(); } } @ApiOperation(value = "高龄认证统计-excel导入线下认证居民---") @PostMapping(value = "/authRecords/uderLine/import", consumes = "multipart/*", headers = "content-type=multipart/form-date") public R importUnderLineElderAuthRecords(@RequestParam MultipartFile file, HttpServletRequest request) { // 获取文件名 @@ -416,7 +474,7 @@ return R.ok(); } @ApiOperation(value = "高龄认证统计-导出高龄认证统计") @ApiOperation(value = "高龄认证统计-导出高龄认证统计---") @PostMapping(value = "/authRecords/statistic/export") public R exportElderAuthRecordsStatistic(@RequestBody PageElderAuthRecordsDTO pageElderAuthRecordsDTO) { Long communityId = this.getLoginUserInfo().getCommunityId(); @@ -472,6 +530,12 @@ } } @ApiOperation(value = "高龄认证统计-表头统计---") @PostMapping(value = "/header/statistic/") public R getElderHeaderStatistic(@RequestBody PageElderAuthRecordsDTO pageElderAuthRecordsDTO) { return R.ok(); } /** * 分页查询养老金人员认证记录 pagePensionAuthRecords 分页查询养老金人员认证记录 * @param pageElderAuthRecordsDTO 查询参数 @@ -479,7 +543,7 @@ * @author txb * @date 2021/9/07 14:03 */ @ApiOperation(value = "养老认证-分页查询养老金人员认证记录", response = ComPensionAuthRecordVO.class) @ApiOperation(value = "养老认证-分页查询养老金人员认证记录---", response = ComPensionAuthRecordVO.class) @PostMapping("/pensionAuthRecords/page") public R pagePensionAuthRecords(@RequestBody PageElderAuthRecordsDTO pageElderAuthRecordsDTO) { Long communityId = this.getLoginUserInfo().getCommunityId(); @@ -494,7 +558,7 @@ * @author txb * @date 2021/9/07 11:03 */ @ApiOperation(value = "养老认证-根据养老认证记录id查询详情", response = ComPensionAuthRecordVO.class) @ApiOperation(value = "养老认证-根据养老认证记录id查询详情---", response = ComPensionAuthRecordVO.class) @GetMapping("/pensionAuthRecords/detail") public R detailPensionAuthRecords(@RequestParam(value = "authRecordId") Long authRecordId) { return communityService.detailPensionAuthRecords(authRecordId); @@ -507,7 +571,7 @@ * @author txb * @date 2021/9/07 11:03 */ @ApiOperation(value = "养老认证-养老认证审核") @ApiOperation(value = "养老认证-养老认证审核---") @PostMapping("/pensionAuthRecords/examine") public R examinePensionAuthRecords(@RequestBody ComPensionAuthRecordVO comPensionAuthRecordVO) { return communityService.examinePensionAuthRecords(comPensionAuthRecordVO); @@ -520,7 +584,7 @@ * @author txb * @date 2021/9/02 11:03 */ @ApiOperation(value = "养老认证-养老认证标记") @ApiOperation(value = "养老认证-养老认证标记---") @PostMapping("/pensionAuthRecords/sign") public R signPensionAuthRecords(@RequestBody ComPensionAuthRecordVO comPensionAuthRecordVO) { return communityService.signPensionAuthRecords(comPensionAuthRecordVO); @@ -533,7 +597,7 @@ * @author txb * @date 2021/9/02 11:03 */ @ApiOperation(value = "养老认证-养老认证导出") @ApiOperation(value = "养老认证-养老认证导出---") @PostMapping("/pensionAuthRecords/export") public R exportPensionAuthRecords(@RequestBody List<Long> ids) { // List<ComMngPopulationMistakeExcelVO> list = JSON.parseArray(mistakes,ComMngPopulationMistakeExcelVO.class); @@ -589,7 +653,7 @@ } } @ApiOperation(value = "养老认证统计-下载模板-线下认证居民导入") @ApiOperation(value = "养老认证统计-下载模板-线下认证居民导入---") @GetMapping("/pensionAuthRecords/uderLine/export") public R exportUnderLinePensionAuthRecords() { // 生成动态模板excel通过ftp工具上传到主节点，然后返回模板下载地址 @@ -632,7 +696,7 @@ } } @ApiOperation(value = "养老认证统计-excel导入线下认证居民") @ApiOperation(value = "养老认证统计-excel导入线下认证居民---") @PostMapping(value = "/pensionAuthRecords/uderLine/import", consumes = "multipart/*", headers = "content-type=multipart/form-date") public R importUnderLinePensionAuthRecords(@RequestParam MultipartFile file, HttpServletRequest request) { // 获取文件名 @@ -651,7 +715,65 @@ return R.ok(); } @ApiOperation(value = "养老认证统计-导出养老认证统计") @ApiOperation(value = "下载导入失败养老认证数据---") @PostMapping("/download/error/pensionAuthRecords") public R downloadErrorPensionPopulation(@RequestParam(value = "key") String key) { List<ComPensionAuthRecordImportMistakeExcelVO> list = new ArrayList<>(); Boolean isExits = stringRedisTemplate.hasKey(key); ValueOperations<String, String> valueOperations = stringRedisTemplate.opsForValue(); if (isExits) { String json = valueOperations.get(key); list = JSONArray.parseArray(json, ComPensionAuthRecordImportMistakeExcelVO.class); } // List<ComMngPopulationMistakeExcelVO> list = JSON.parseArray(mistakes,ComMngPopulationMistakeExcelVO.class); // 生成动态模板excel通过ftp工具上传到主节点，然后返回模板下载地址 String ftpUrl = "/mnt/data/web/excel/"; String nowDate = DateUtils.getCurrentDateString(); String name = "养老认证记录导入错误数据" + nowDate + ".xlsx"; try { SFTPUtil sftp = new SFTPUtil(userName, password, host, port); sftp.login(); boolean existDir = sftp.isExistDir(ftpUrl + name); if (!existDir) { String property = System.getProperty("user.dir"); String fileName = property + File.separator + name; // 这里 需要指定写用哪个class去写 ExcelWriter excelWriter = null; InputStream inputStream = null; try { excelWriter = EasyExcel.write(fileName, ComPensionAuthRecordImportMistakeExcelVO.class) .registerWriteHandler(new LongestMatchColumnWidthStyleStrategy()) .registerWriteHandler(new CustomSheetWriteHandler()).build(); WriteSheet writeSheet = EasyExcel.writerSheet("养老认证记录导入错误数据").build(); excelWriter.write(list, writeSheet); excelWriter.finish(); File file = new File(fileName); inputStream = new FileInputStream(file); sftp.uploadMore(ftpUrl, name, inputStream); sftp.logout(); inputStream.close(); String absolutePath = file.getAbsolutePath(); boolean delete = file.delete(); log.info("删除excel【{}】结果【{}】", absolutePath, delete); } finally { // 千万别忘记finish 会帮忙关闭流 if (inputStream != null) { inputStream.close(); } if (excelWriter != null) { excelWriter.finish(); } } } return R.ok(excelUrl + name); } catch (Exception e) { e.printStackTrace(); log.error("文件传输失败【{}】", e.getMessage()); return R.fail(); } } @ApiOperation(value = "养老认证统计-导出养老认证统计---") @PostMapping(value = "/pensionAuthRecords/statistic/export") public R exportPensionAuthRecordsStatistic(@RequestBody PageElderAuthRecordsDTO pageElderAuthRecordsDTO) { Long communityId = this.getLoginUserInfo().getCommunityId(); @@ -713,7 +835,7 @@ * @author txb * @date 2021/9/10 16:03 */ @ApiOperation(value = "查询社区养老认证方式", response = R.class) @ApiOperation(value = "查询社区养老认证方式---", response = R.class) @GetMapping("/pensionAuthRecords/authtype") public R communityPensionAuthType() { Long communityId = this.getCommunityId(); @@ -723,7 +845,7 @@ } @PutMapping("/pensionAuthRecords/authType/{type}") @ApiOperation(value = "设置当前社区养老认证方式:核验类型（1.视频认证 2.人脸核验）", response = R.class) @ApiOperation(value = "设置当前社区养老认证方式:核验类型（1.视频认证 2.人脸核验）---", response = R.class) R setPensionAuthType(@PathVariable("type") Integer type) { if (type != 1 && type != 2) { return R.fail("参数错误"); @@ -731,22 +853,22 @@ return communityService.setPensionAuthType(this.getCommunityId(), type); } @ApiOperation(value = "查询社区高龄认证方式", response = R.class) @GetMapping("/authtype") @ApiOperation(value = "查询社区高龄认证方式---", response = R.class) @GetMapping("/authType") public R communityAuthType() { Long communityId = this.getCommunityId(); EldersAuthTypeQueryDTO eldersAuthTypeQueryDTO = new EldersAuthTypeQueryDTO(); eldersAuthTypeQueryDTO.setCommunityId(communityId); return communityService.communityPensionAuthType(eldersAuthTypeQueryDTO); return communityService.communityElderAuthType(eldersAuthTypeQueryDTO); } @PutMapping("/authType/{type}") @ApiOperation(value = "设置当前社区高龄认证方式:核验类型（1.视频认证 2.人脸核验）", response = R.class) @ApiOperation(value = "设置当前社区高龄认证方式:核验类型（1.视频认证 2.人脸核验）---", response = R.class) public R setAuthType(@PathVariable("type") Integer type) { if (type != 1 && type != 2) { return R.fail("参数错误"); } return communityService.setPensionAuthType(this.getCommunityId(), type); return communityService.setEldersAuthType(this.getCommunityId(), type); } private List<List<String>> headDataFilling() { @@ -760,7 +882,7 @@ List<String> head3 = new ArrayList<String>(); head3.add("现居住地址"); List<String> head4 = new ArrayList<String>(); head4.add("认证时间"); head4.add("认证时间(年-月-日)"); List<String> head5 = new ArrayList<String>(); head5.add("健在（是/否）");
@@ -44,7 +44,7 @@ private Long submitUserId; /** * 认证方式（1.视频认证 2.人脸认证） * 认证方式（1.视频认证 2.人脸认证 3.线下认证） */ private Integer authMethod; @@ -99,4 +99,40 @@ */ @TableField(fill = FieldFill.UPDATE) private Date updateAt; /** * 社区id */ private Long communityId; /** * 现居地址 */ private String address; /** * 审核状态（1.待审核 2.驳回 3.通过） */ public interface approvalStatus{ int dsh = 1; int bh = 2; int tg = 3; } /** * 认证状态（1.已认证 0.未认证） */ public interface authStatus{ int yrz = 1; int wrz = 0; } /** * 认证方式（1.视频认证 2.人脸认证 3.线下认证） */ public interface authMethod{ int sprz = 1; int rlrz = 2; int xxrz = 3; } } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComPensionAuthRecordDO.java
@@ -35,7 +35,7 @@ private Long submitUserId; /** * 认证方式（1.视频认证 2.人脸认证） * 认证方式（1.视频认证 2.人脸认证 3.线下认证） */ private Integer authMethod; @@ -89,4 +89,35 @@ */ @TableField(fill = FieldFill.UPDATE) private Date updateAt; /** * 现居地址 */ private String address; /** *审核状态（1.待审核 2.驳回 3.通过） */ public interface approvalStatus{ int dsh = 1; int bh = 2; int tg = 3; } /** *认证状态（1.已认证 0.未认证） */ public interface authStatus{ int rez = 1; int wrz = 0; } /** * 认证方式（1.视频认证 2.人脸认证 3.线下认证） */ public interface authMethod{ int sprz = 1; int rlrz = 2; int xxrz = 3; } } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComElderAuthRecordsServiceImpl.java
@@ -1,5 +1,6 @@ package com.panzhihua.service_community.service.impl; import cn.hutool.core.util.IdcardUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -164,20 +165,23 @@ ComElderAuthRecordImportMistakeExcelVO mistake = new ComElderAuthRecordImportMistakeExcelVO(); BeanUtils.copyProperties(vo, mistake); setMistake(mistake, vo); mistake.setMistake("该实有人口已存在，但本社区不存在高龄信息，请先导入高龄人口"); mistake.setMistake("该实有人口已存在，但本社区不存在高龄老人信息，请先导入高龄老人"); mistake.setAuthDate(DateUtils.format(vo.getAuthDate(),DateUtils.yyyyMMdd_format)); mistakes.add(mistake); }else { //存在高龄信息，判断是否满足认证条件 if (StringUtils.isNotEmpty(vo.getBirthday())) { int age = AgeUtils.getAgeFromBirthTimes(vo.getBirthday()); int age = IdcardUtil.getAgeByIdCard(vo.getIdCard()); if (age < 80 || !comElderAuthElderliesDO.getIsRegister().equals(1) || !comElderAuthElderliesDO.getIsAlive().equals(1)) { ComElderAuthRecordImportMistakeExcelVO mistake = new ComElderAuthRecordImportMistakeExcelVO(); BeanUtils.copyProperties(vo, mistake); setMistake(mistake, vo); mistake.setMistake("该人口未满80岁，或者不健在，或者未做高龄老人登记"); mistake.setAuthDate(DateUtils.format(vo.getAuthDate(),DateUtils.yyyyMMdd_format)); mistakes.add(mistake); }else { //满足认证条件，判断是否存在当期认证记录 List<ComElderAuthRecordsDO> elderAuthRecordList = null; ComElderAuthRecordsDO comElderAuthRecordsDO = null; Date nowDate = new Date(); // 获取当前年 @@ -190,30 +194,36 @@ }else { authPeriod = String.valueOf(year) + String.valueOf(month); } comElderAuthRecordsDO = comElderAuthRecordsDAO.selectOne(new QueryWrapper<ComElderAuthRecordsDO>().lambda(). eq(ComElderAuthRecordsDO::getElderliesId, comElderAuthElderliesDO.getId()).eq(ComElderAuthRecordsDO::getAuthPeriod, authPeriod)); if (null != comElderAuthRecordsDO) { elderAuthRecordList = comElderAuthRecordsDAO.selectList(new QueryWrapper<ComElderAuthRecordsDO>().lambda() .eq(ComElderAuthRecordsDO::getElderliesId, comElderAuthElderliesDO.getId()) .eq(ComElderAuthRecordsDO::getAuthPeriod, authPeriod).orderByDesc(ComElderAuthRecordsDO::getCreateAt)); if (null != elderAuthRecordList && elderAuthRecordList.size() > 0) { comElderAuthRecordsDO = elderAuthRecordList.get(0); //存在记录且状态为已认证，不能修改 if (comElderAuthRecordsDO.getAuthStatus().equals(1)) { if (comElderAuthRecordsDO.getApprovalStatus().equals(ComElderAuthRecordsDO.approvalStatus.tg)) { ComElderAuthRecordImportMistakeExcelVO mistake = new ComElderAuthRecordImportMistakeExcelVO(); BeanUtils.copyProperties(vo, mistake); setMistake(mistake, vo); mistake.setMistake("该人口本期已认证，不能修改"); mistake.setMistake("该人口本期已认证通过，不能重复认证"); mistake.setAuthDate(DateUtils.format(vo.getAuthDate(),DateUtils.yyyyMMdd_format)); mistakes.add(mistake); }else if (comElderAuthRecordsDO.getApprovalStatus().equals(ComElderAuthRecordsDO.approvalStatus.dsh)) { comElderAuthRecordsDO.setSubmitUserId(userId); comElderAuthRecordsDO.setApproverId(userId); comElderAuthRecordsDO.setCommunityId(communityId); comElderAuthRecordsDO.setApprovalStatus(ComElderAuthRecordsDO.approvalStatus.tg); comElderAuthRecordsDO.setApprovalDate(new Date()); comElderAuthRecordsDO.setAuthStatus(ComElderAuthRecordsDO.authStatus.yrz); comElderAuthRecordsDO.setAuthMethod(ComElderAuthRecordsDO.authMethod.xxrz); updateList.add(comElderAuthRecordsDO); }else { //存在记录，执行修改 ComElderAuthRecordsDO comElderAuthRecordsDO1 = updateElderAuthRecordsDO(vo, comElderAuthRecordsDO, userId); updateList.add(comElderAuthRecordsDO1); ComElderAuthRecordImportMistakeExcelVO mistake = new ComElderAuthRecordImportMistakeExcelVO(); BeanUtils.copyProperties(vo, mistake); setMistake(mistake, vo); mistake.setMistake("该认证已存在，执行更新"); mistakes.add(mistake); // 驳回状态,则新增 comElderAuthRecordsDO = saveElderAuthRecordsDO(vo, comElderAuthElderliesDO, authPeriod, userId,communityId); saveList.add(comElderAuthRecordsDO); } }else { // 不存在记录,则新增 comElderAuthRecordsDO = saveElderAuthRecordsDO(vo, comElderAuthElderliesDO, authPeriod, userId); comElderAuthRecordsDO = saveElderAuthRecordsDO(vo, comElderAuthElderliesDO, authPeriod, userId,communityId); saveList.add(comElderAuthRecordsDO); } } @@ -225,6 +235,7 @@ BeanUtils.copyProperties(vo, mistake); setMistake(mistake, vo); mistake.setMistake("不存在该实有人口，请先导入实有人口信息"); mistake.setAuthDate(DateUtils.format(vo.getAuthDate(),DateUtils.yyyyMMdd_format)); mistakes.add(mistake); } log.info("开始查询实有人口是否已存在完成"); @@ -307,17 +318,21 @@ return R.ok(); } private ComElderAuthRecordsDO updateElderAuthRecordsDO(ComElderAuthRecordImportExcelVO vo, ComElderAuthRecordsDO comElderAuthRecordsDO, Long userId) { private ComElderAuthRecordsDO updateElderAuthRecordsDO(ComElderAuthRecordImportExcelVO vo , ComElderAuthRecordsDO comElderAuthRecordsDO, Long userId, Long communityId) { BeanUtils.copyProperties(vo, comElderAuthRecordsDO); comElderAuthRecordsDO.setSubmitUserId(userId); comElderAuthRecordsDO.setApproverId(userId); comElderAuthRecordsDO.setApprovalStatus(3); comElderAuthRecordsDO.setApprovalStatus(ComElderAuthRecordsDO.approvalStatus.tg); comElderAuthRecordsDO.setApprovalDate(new Date()); comElderAuthRecordsDO.setAuthStatus(1); comElderAuthRecordsDO.setAuthStatus(ComElderAuthRecordsDO.authStatus.yrz); comElderAuthRecordsDO.setCommunityId(communityId); comElderAuthRecordsDO.setAuthMethod(ComElderAuthRecordsDO.authMethod.xxrz); return comElderAuthRecordsDO; } private ComElderAuthRecordsDO saveElderAuthRecordsDO(ComElderAuthRecordImportExcelVO vo, ComElderAuthElderliesDO comElderAuthElderliesDO, String authPeriod, Long userId) { private ComElderAuthRecordsDO saveElderAuthRecordsDO(ComElderAuthRecordImportExcelVO vo , ComElderAuthElderliesDO comElderAuthElderliesDO, String authPeriod, Long userId, Long communityId) { ComElderAuthRecordsDO comElderAuthRecordsDO = new ComElderAuthRecordsDO(); BeanUtils.copyProperties(vo, comElderAuthRecordsDO); comElderAuthRecordsDO.setId(Snowflake.getId()); @@ -325,9 +340,11 @@ comElderAuthRecordsDO.setAuthPeriod(authPeriod); comElderAuthRecordsDO.setSubmitUserId(userId); comElderAuthRecordsDO.setApproverId(userId); comElderAuthRecordsDO.setApprovalStatus(3); comElderAuthRecordsDO.setApprovalStatus(ComElderAuthRecordsDO.approvalStatus.tg); comElderAuthRecordsDO.setApprovalDate(new Date()); comElderAuthRecordsDO.setAuthStatus(1); comElderAuthRecordsDO.setAuthStatus(ComElderAuthRecordsDO.authStatus.yrz); comElderAuthRecordsDO.setCommunityId(communityId); comElderAuthRecordsDO.setAuthMethod(ComElderAuthRecordsDO.authMethod.xxrz); return comElderAuthRecordsDO; }
@@ -163,6 +163,7 @@ BeanUtils.copyProperties(vo, mistake); setMistake(mistake, vo); mistake.setMistake("该实有人口已存在，但本社区不存在养老信息，请先导入养老人口"); mistake.setAuthDate(DateUtils.format(vo.getAuthDate(),DateUtils.yyyyMMdd_format)); mistakes.add(mistake); }else { //存在养老信息，判断是否满足认证条件 @@ -171,9 +172,11 @@ BeanUtils.copyProperties(vo, mistake); setMistake(mistake, vo); mistake.setMistake("该人口不健在，或者未做养老登记"); mistake.setAuthDate(DateUtils.format(vo.getAuthDate(),DateUtils.yyyyMMdd_format)); mistakes.add(mistake); }else { //满足认证条件，判断是否存在当期认证记录 List<ComPensionAuthRecordDO> pensionAuthList = null; ComPensionAuthRecordDO comPensionAuthRecordDO = null; Date nowDate = new Date(); // 获取当前年 @@ -185,30 +188,38 @@ authPeriod = String.valueOf(year); } comPensionAuthRecordDO = comPensionAuthRecordDAO.selectOne(new QueryWrapper<ComPensionAuthRecordDO>().lambda(). eq(ComPensionAuthRecordDO::getPensionerId, comPensionAuthPensionerDO.getId()).eq(ComPensionAuthRecordDO::getAuthPeriod, authPeriod)); if (null != comPensionAuthRecordDO) { pensionAuthList = comPensionAuthRecordDAO.selectList(new QueryWrapper<ComPensionAuthRecordDO>().lambda(). eq(ComPensionAuthRecordDO::getPensionerId, comPensionAuthPensionerDO.getId()) .eq(ComPensionAuthRecordDO::getAuthPeriod, authPeriod).orderByDesc(ComPensionAuthRecordDO::getCreateAt)); if (null != pensionAuthList && pensionAuthList.size() > 0) { comPensionAuthRecordDO = pensionAuthList.get(0); //存在记录且状态为已认证，不能修改 if (comPensionAuthRecordDO.getAuthStatus().equals(1)) { if (comPensionAuthRecordDO.getApprovalStatus().equals(ComPensionAuthRecordDO.approvalStatus.tg)) { ComPensionAuthRecordImportMistakeExcelVO mistake = new ComPensionAuthRecordImportMistakeExcelVO(); BeanUtils.copyProperties(vo, mistake); setMistake(mistake, vo); mistake.setMistake("该人口本期已认证，不能修改"); mistake.setMistake("该人口本期已认证，不可重复认证"); mistake.setAuthDate(DateUtils.format(vo.getAuthDate(),DateUtils.yyyyMMdd_format)); mistakes.add(mistake); }else if (comPensionAuthRecordDO.getApprovalStatus().equals(ComPensionAuthRecordDO.approvalStatus.dsh)) { //存在待审核记录，进行更新认证信息 comPensionAuthRecordDO.setSubmitUserId(userId); comPensionAuthRecordDO.setApproverId(userId); comPensionAuthRecordDO.setApprovalStatus(ComPensionAuthRecordDO.approvalStatus.tg); comPensionAuthRecordDO.setAuthMethod(ComPensionAuthRecordDO.authMethod.xxrz); comPensionAuthRecordDO.setApprovalDate(new Date()); comPensionAuthRecordDO.setAuthStatus(ComPensionAuthRecordDO.authStatus.rez); comPensionAuthRecordDO.setCommunityId(communityId); updateList.add(comPensionAuthRecordDO); }else { //存在记录，执行修改 ComPensionAuthRecordDO comPensionAuthRecordDO1 = updatePensionAuthRecordsDO(vo, comPensionAuthRecordDO, userId); updateList.add(comPensionAuthRecordDO1); ComPensionAuthRecordImportMistakeExcelVO mistake = new ComPensionAuthRecordImportMistakeExcelVO(); BeanUtils.copyProperties(vo, mistake); setMistake(mistake, vo); mistake.setMistake("该认证已存在，执行更新"); mistakes.add(mistake); // 不存在记录,则新增 comPensionAuthRecordDO = savePensionAuthRecordsDO(vo, comPensionAuthPensionerDO, authPeriod, userId,communityId); saveList.add(comPensionAuthRecordDO); } }else { // 不存在记录,则新增 comPensionAuthRecordDO = savePensionAuthRecordsDO(vo, comPensionAuthPensionerDO, authPeriod, userId); comPensionAuthRecordDO = savePensionAuthRecordsDO(vo, comPensionAuthPensionerDO, authPeriod, userId,communityId); saveList.add(comPensionAuthRecordDO); } } @@ -219,6 +230,7 @@ BeanUtils.copyProperties(vo, mistake); setMistake(mistake, vo); mistake.setMistake("不存在该实有人口，请先导入实有人口信息"); mistake.setAuthDate(DateUtils.format(vo.getAuthDate(),DateUtils.yyyyMMdd_format)); mistakes.add(mistake); } log.info("开始查询实有人口是否已存在完成"); @@ -334,17 +346,21 @@ return R.ok(); } private ComPensionAuthRecordDO updatePensionAuthRecordsDO(ComPensionAuthRecordImportExcelVO vo, ComPensionAuthRecordDO comPensionAuthRecordsDO, Long userId) { private ComPensionAuthRecordDO updatePensionAuthRecordsDO(ComPensionAuthRecordImportExcelVO vo , ComPensionAuthRecordDO comPensionAuthRecordsDO, Long userId , Long communityId) { BeanUtils.copyProperties(vo, comPensionAuthRecordsDO); comPensionAuthRecordsDO.setSubmitUserId(userId); comPensionAuthRecordsDO.setApproverId(userId); comPensionAuthRecordsDO.setApprovalStatus(3); comPensionAuthRecordsDO.setApprovalDate(new Date()); comPensionAuthRecordsDO.setAuthStatus(1); comPensionAuthRecordsDO.setCommunityId(communityId); comPensionAuthRecordsDO.setAuthMethod(ComPensionAuthRecordDO.authMethod.xxrz); return comPensionAuthRecordsDO; } private ComPensionAuthRecordDO savePensionAuthRecordsDO(ComPensionAuthRecordImportExcelVO vo, ComPensionAuthPensionerDO comPensionAuthPensionerDO, String authPeriod, Long userId) { private ComPensionAuthRecordDO savePensionAuthRecordsDO(ComPensionAuthRecordImportExcelVO vo , ComPensionAuthPensionerDO comPensionAuthPensionerDO, String authPeriod, Long userId, Long communityId) { ComPensionAuthRecordDO comPensionAuthRecordDO = new ComPensionAuthRecordDO(); BeanUtils.copyProperties(vo, comPensionAuthRecordDO); comPensionAuthRecordDO.setId(Snowflake.getId()); @@ -355,6 +371,8 @@ comPensionAuthRecordDO.setApprovalStatus(3); comPensionAuthRecordDO.setApprovalDate(new Date()); comPensionAuthRecordDO.setAuthStatus(1); comPensionAuthRecordDO.setAuthMethod(ComPensionAuthRecordDO.authMethod.xxrz); comPensionAuthRecordDO.setCommunityId(communityId); return comPensionAuthRecordDO; }
@@ -27,6 +27,7 @@ <select id="pageElderAuthRecords" resultType="com.panzhihua.common.model.vos.community.ComElderAuthRecordVO"> SELECT cear.id, su.`name` submitUserName, ceae.phone, ceae.`name`, springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComPensionAuthRecordMapper.xml
@@ -184,16 +184,16 @@ <if test="item.authMethod != null and item.authMethod != 0"> `auth_method` = #{item.authMethod}, </if> <if test="item.authPeriod != null and item.authPeriod != ''"> <if test="item.authPeriod != null and item.authPeriod != '""'"> `auth_period` = #{item.authPeriod}, </if> <if test="item.submitUserId != null"> `submit_user_id` = #{item.submitUserId}, </if> <if test="item.authVideo != null and item.authVideo != ''"> <if test="item.authVideo != null and item.authVideo != '""'"> `auth_video` = #{item.authVideo}, </if> <if test="item.address != null and item.address != ''"> <if test="item.address != null and item.address != '""'"> `address` = #{item.address}, </if> <if test="item.approverId != null"> @@ -205,10 +205,10 @@ <if test="item.approvalDate != null"> `approval_date` = #{item.approvalDate}, </if> <if test="item.mark != null and item.mark != ''"> <if test="item.mark != null and item.mark != '""'"> `mark` = #{item.mark}, </if> <if test="item.rejectReason != null and item.rejectReason != ''"> <if test="item.rejectReason != null and item.rejectReason != '""'"> `reject_reason` = #{item.rejectReason}, </if> <if test="item.authStatus != null">
