From 02b087d8d55a7931d87c6e39423d9362463d67c9 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期日, 09 十月 2022 14:13:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/EldersAuthServiceImpl.java | 89 +++++++-------------------------------------
1 files changed, 15 insertions(+), 74 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/EldersAuthServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/EldersAuthServiceImpl.java
index fe1a95c..2fb3c82 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/EldersAuthServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/EldersAuthServiceImpl.java
@@ -11,6 +11,7 @@
import com.panzhihua.common.model.dtos.community.elder.PageElderAuthStatisticDTO;
import com.panzhihua.common.model.dtos.community.elder.SignElderAuthStatisticDTO;
import com.panzhihua.common.model.vos.elders.ComEldersAuthHistoryVO;
+import com.panzhihua.common.model.vos.elders.ComEldersAuthStatisticVO;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
@@ -571,7 +572,7 @@
}
/**
- * 检测本月所有认证记录，认证成功记录更新到历史记录中
+ * 身份认证定时任务
* @return 执行结果
*/
@Override
@@ -585,7 +586,7 @@
String pensionAuthPeriod = DateUtils.getCurrentDateString_YYYY();
//查询所有老人信息并加入到老人认证历史记录表中，如果不存在则新增，存在则不做操作
- List<ComElderAuthElderliesDO> authElderliesList = comElderAuthElderliesDAO.selectList(new QueryWrapper<>());
+ List<ComElderAuthElderliesDO> authElderliesList = comElderAuthElderliesDAO.getAuthElderLiesList();
authElderliesList.forEach(authElderlies -> {
//查询高龄认证记录
ComEldersAuthHistoryRecordDO authHistoryRecordDO = comEldersAuthHistoryRecordMapper.selectOne(new QueryWrapper<ComEldersAuthHistoryRecordDO>().lambda()
@@ -598,12 +599,14 @@
authHistoryRecordDO.setElderliesId(authElderlies.getId());
authHistoryRecordDO.setAuthPeriod(elderAuthPeriod);
authHistoryRecordDO.setCreateAt(nowDate);
+ authHistoryRecordDO.setBrithday(IdcardUtil.getBirthByIdCard(authElderlies.getIdCard()));
+ authHistoryRecordDO.setAge(IdcardUtil.getAgeByIdCard(authElderlies.getIdCard()));
comEldersAuthHistoryRecordMapper.insert(authHistoryRecordDO);
}
});
//查询所有养老人员信息并加入到老人认证历史记录表中，如果不存在则新增，存在则不做操作
- List<ComPensionAuthPensionerDO> pensionAuthPensionerList = comPensionAuthPensionerDAO.selectList(new QueryWrapper<>());
+ List<ComPensionAuthPensionerDO> pensionAuthPensionerList = comPensionAuthPensionerDAO.getAuthPensionList();
pensionAuthPensionerList.forEach(authPension -> {
//查询养老认证记录
ComPensionAuthHistoryRecordDO pensionAuthDO = comPensionAuthHistoryRecordMapper.selectOne(new QueryWrapper<ComPensionAuthHistoryRecordDO>().lambda()
@@ -616,76 +619,8 @@
pensionAuthDO.setElderliesId(authPension.getId());
pensionAuthDO.setAuthPeriod(pensionAuthPeriod);
pensionAuthDO.setCreateAt(nowDate);
- comPensionAuthHistoryRecordMapper.insert(pensionAuthDO);
- }
- });
-
- //查询高龄认证记录列表
- List<ComElderAuthRecordsDO> authRecordsList = comElderAuthRecordsDAO.selectList(new QueryWrapper<ComElderAuthRecordsDO>().lambda()
- .ge(ComElderAuthRecordsDO::getCreateAt,DateUtils.getFirstDayOfMonth()));
- //遍历高龄认证记录列表
- authRecordsList.forEach(authRecords -> {
- if(authRecords.getApprovalStatus().equals(ComElderAuthRecordsDO.approvalStatus.tg)){
- ComEldersAuthHistoryRecordDO authHistoryRecordDO = comEldersAuthHistoryRecordMapper.selectOne(new QueryWrapper<ComEldersAuthHistoryRecordDO>().lambda()
- .eq(ComEldersAuthHistoryRecordDO::getElderliesId,authRecords.getElderliesId())
- .eq(ComEldersAuthHistoryRecordDO::getAuthPeriod,authRecords.getAuthPeriod()));
- if(authHistoryRecordDO != null){//存在记录
- if(authHistoryRecordDO.getIsAuth().equals(ComEldersAuthHistoryRecordDO.isAuth.no)){
- authHistoryRecordDO.setIsAuth(ComEldersAuthHistoryRecordDO.isAuth.yes);
- authHistoryRecordDO.setAuthDate(authRecords.getApprovalDate());
- authHistoryRecordDO.setApprovalDate(authRecords.getApprovalDate());
- authHistoryRecordDO.setApproverId(authRecords.getApproverId());
- authHistoryRecordDO.setSubmitUserId(authRecords.getSubmitUserId());
- authHistoryRecordDO.setAuthMethod(authRecords.getAuthMethod());
- authHistoryRecordDO.setVerificationResult(authRecords.getVerificationResult());
- authHistoryRecordDO.setAuthId(authRecords.getId());
- comEldersAuthHistoryRecordMapper.updateById(authHistoryRecordDO);
- }
- }else{
- authHistoryRecordDO = new ComEldersAuthHistoryRecordDO();
- BeanUtils.copyProperties(authRecords,authHistoryRecordDO);
- //查询老人信息
- ComElderAuthElderliesDO authElderliesDO = comElderAuthElderliesDAO.selectById(authRecords.getElderliesId());
- if(authElderliesDO != null){
- BeanUtils.copyProperties(authElderliesDO,authHistoryRecordDO);
- }
- authHistoryRecordDO.setIsAuth(ComEldersAuthHistoryRecordDO.isAuth.yes);
- authHistoryRecordDO.setAuthId(authRecords.getId());
- comEldersAuthHistoryRecordMapper.insert(authHistoryRecordDO);
- }
- }
- });
-
- //查询养老认证记录列表
- List<ComPensionAuthRecordDO> pensionAuthList = comPensionAuthRecordDAO.selectList(new QueryWrapper<ComPensionAuthRecordDO>().lambda()
- .ge(ComPensionAuthRecordDO::getCreateAt,DateUtils.getFirstDayOfMonth()));
- //遍历养老认证记录列表
- pensionAuthList.forEach(authRecords -> {
- ComPensionAuthHistoryRecordDO pensionAuthDO = comPensionAuthHistoryRecordMapper.selectOne(new QueryWrapper<ComPensionAuthHistoryRecordDO>().lambda()
- .eq(ComPensionAuthHistoryRecordDO::getElderliesId,authRecords.getPensionerId())
- .eq(ComPensionAuthHistoryRecordDO::getAuthPeriod,authRecords.getAuthPeriod()));
- if(pensionAuthDO != null){//存在记录
- if(pensionAuthDO.getIsAuth().equals(ComPensionAuthHistoryRecordDO.isAuth.no)){
- pensionAuthDO.setIsAuth(ComPensionAuthHistoryRecordDO.isAuth.yes);
- pensionAuthDO.setAuthDate(authRecords.getApprovalDate());
- pensionAuthDO.setApprovalDate(authRecords.getApprovalDate());
- pensionAuthDO.setApproverId(authRecords.getApproverId());
- pensionAuthDO.setSubmitUserId(authRecords.getSubmitUserId());
- pensionAuthDO.setAuthMethod(authRecords.getAuthMethod());
- pensionAuthDO.setVerificationResult(authRecords.getVerificationResult());
- pensionAuthDO.setAuthId(authRecords.getId());
- comPensionAuthHistoryRecordMapper.updateById(pensionAuthDO);
- }
- }else{
- pensionAuthDO = new ComPensionAuthHistoryRecordDO();
- BeanUtils.copyProperties(authRecords,pensionAuthDO);
- //查询老人信息
- ComPensionAuthPensionerDO authPensionerDO = comPensionAuthPensionerDAO.selectById(authRecords.getPensionerId());
- if(authPensionerDO != null){
- BeanUtils.copyProperties(authPensionerDO,pensionAuthDO);
- }
- pensionAuthDO.setIsAuth(ComPensionAuthHistoryRecordDO.isAuth.yes);
- pensionAuthDO.setAuthId(authRecords.getId());
+ pensionAuthDO.setBrithday(IdcardUtil.getBirthByIdCard(authPension.getIdCard()));
+ pensionAuthDO.setAge(IdcardUtil.getAgeByIdCard(authPension.getIdCard()));
comPensionAuthHistoryRecordMapper.insert(pensionAuthDO);
}
});
@@ -745,7 +680,13 @@
*/
@Override
public R pageAuthStatisticAdmin(PageElderAuthStatisticDTO pageElderAuthStatisticDTO){
- return R.ok(comEldersAuthHistoryRecordMapper.pageAuthStatisticAdmin(new Page(pageElderAuthStatisticDTO.getPageNum(),pageElderAuthStatisticDTO.getPageSize()),pageElderAuthStatisticDTO));
+ IPage<ComEldersAuthStatisticVO> authStatisticPage = comEldersAuthHistoryRecordMapper.pageAuthStatisticAdmin(
+ new Page(pageElderAuthStatisticDTO.getPageNum(),pageElderAuthStatisticDTO.getPageSize()),pageElderAuthStatisticDTO);
+ authStatisticPage.getRecords().forEach(authStatistic -> {
+ authStatistic.setAge(IdcardUtil.getAgeByIdCard(authStatistic.getIdCard()));
+ authStatistic.setBirthday(IdcardUtil.getBirth(authStatistic.getIdCard()));
+ });
+ return R.ok(authStatisticPage);
}
/**
--
Gitblit v1.7.1