From b41017ea75b8597c0610d4045829ce170d5343f2 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期五, 17 九月 2021 14:41:02 +0800
Subject: [PATCH] 身份认证缺失接口开发以及bug修复
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComPensionAuthRecordServiceImpl.java | 52 +++++++++++++++++++++++++++++++++++-----------------
1 files changed, 35 insertions(+), 17 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComPensionAuthRecordServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComPensionAuthRecordServiceImpl.java
index 031c959..7dbc785 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComPensionAuthRecordServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComPensionAuthRecordServiceImpl.java
@@ -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;
}
--
Gitblit v1.7.1