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/ComElderAuthRecordsServiceImpl.java | 63 ++++++++++++++++++++-----------
1 files changed, 40 insertions(+), 23 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComElderAuthRecordsServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComElderAuthRecordsServiceImpl.java
index 19ed7ef..d3e63f0 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComElderAuthRecordsServiceImpl.java
+++ b/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;
}
--
Gitblit v1.7.1