From 6e8259a8080a851c4809972175cbd73acd3f28c7 Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期五, 08 十月 2021 17:59:04 +0800
Subject: [PATCH] Merge branch 'test' into 'test_bak'
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/EldersAuthServiceImpl.java | 33 +++++++++++++++++++++++----------
1 files changed, 23 insertions(+), 10 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 41b8998..2cd1e9d0 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
@@ -584,9 +584,8 @@
//养老认证本期期数
String pensionAuthPeriod = DateUtils.getCurrentDateString_YYYY();
- //养老认证本期期数
//查询所有老人信息并加入到老人认证历史记录表中，如果不存在则新增，存在则不做操作
- List<ComElderAuthElderliesDO> authElderliesList = comElderAuthElderliesDAO.selectList(new QueryWrapper<>());
+ List<ComElderAuthElderliesDO> authElderliesList = comElderAuthElderliesDAO.selectList(null);
authElderliesList.forEach(authElderlies -> {
//查询高龄认证记录
ComEldersAuthHistoryRecordDO authHistoryRecordDO = comEldersAuthHistoryRecordMapper.selectOne(new QueryWrapper<ComEldersAuthHistoryRecordDO>().lambda()
@@ -601,25 +600,29 @@
authHistoryRecordDO.setCreateAt(nowDate);
comEldersAuthHistoryRecordMapper.insert(authHistoryRecordDO);
}
+ });
+ //查询所有养老人员信息并加入到老人认证历史记录表中，如果不存在则新增，存在则不做操作
+ List<ComPensionAuthPensionerDO> pensionAuthPensionerList = comPensionAuthPensionerDAO.selectList(null);
+ pensionAuthPensionerList.forEach(authPension -> {
//查询养老认证记录
ComPensionAuthHistoryRecordDO pensionAuthDO = comPensionAuthHistoryRecordMapper.selectOne(new QueryWrapper<ComPensionAuthHistoryRecordDO>().lambda()
- .eq(ComPensionAuthHistoryRecordDO::getElderliesId,authElderlies.getId())
+ .eq(ComPensionAuthHistoryRecordDO::getElderliesId,authPension.getId())
.eq(ComPensionAuthHistoryRecordDO::getAuthPeriod,pensionAuthPeriod));
if(pensionAuthDO == null){
pensionAuthDO = new ComPensionAuthHistoryRecordDO();
- BeanUtils.copyProperties(authElderlies,pensionAuthDO);
+ BeanUtils.copyProperties(authPension,pensionAuthDO);
pensionAuthDO.setIsAuth(ComPensionAuthHistoryRecordDO.isAuth.no);
- pensionAuthDO.setElderliesId(authElderlies.getId());
+ 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()));
- //遍历认证记录列表
+ //查询高龄认证记录列表
+ List<ComElderAuthRecordsDO> authRecordsList = comElderAuthRecordsDAO.selectList(null);
+ //遍历高龄认证记录列表
authRecordsList.forEach(authRecords -> {
if(authRecords.getApprovalStatus().equals(ComElderAuthRecordsDO.approvalStatus.tg)){
ComEldersAuthHistoryRecordDO authHistoryRecordDO = comEldersAuthHistoryRecordMapper.selectOne(new QueryWrapper<ComEldersAuthHistoryRecordDO>().lambda()
@@ -635,6 +638,12 @@
authHistoryRecordDO.setAuthMethod(authRecords.getAuthMethod());
authHistoryRecordDO.setVerificationResult(authRecords.getVerificationResult());
authHistoryRecordDO.setAuthId(authRecords.getId());
+
+ //查询老人信息
+ ComElderAuthElderliesDO authElderliesDO = comElderAuthElderliesDAO.selectById(authRecords.getElderliesId());
+ if(authElderliesDO != null){
+ BeanUtils.copyProperties(authElderliesDO,authHistoryRecordDO);
+ }
comEldersAuthHistoryRecordMapper.updateById(authHistoryRecordDO);
}
}else{
@@ -653,8 +662,7 @@
});
//查询养老认证记录列表
- List<ComPensionAuthRecordDO> pensionAuthList = comPensionAuthRecordDAO.selectList(new QueryWrapper<ComPensionAuthRecordDO>().lambda()
- .ge(ComPensionAuthRecordDO::getCreateAt,DateUtils.getFirstDayOfMonth()));
+ List<ComPensionAuthRecordDO> pensionAuthList = comPensionAuthRecordDAO.selectList(null);
//遍历养老认证记录列表
pensionAuthList.forEach(authRecords -> {
ComPensionAuthHistoryRecordDO pensionAuthDO = comPensionAuthHistoryRecordMapper.selectOne(new QueryWrapper<ComPensionAuthHistoryRecordDO>().lambda()
@@ -670,6 +678,11 @@
pensionAuthDO.setAuthMethod(authRecords.getAuthMethod());
pensionAuthDO.setVerificationResult(authRecords.getVerificationResult());
pensionAuthDO.setAuthId(authRecords.getId());
+ //查询老人信息
+ ComPensionAuthPensionerDO authPensionerDO = comPensionAuthPensionerDAO.selectById(authRecords.getPensionerId());
+ if(authPensionerDO != null){
+ BeanUtils.copyProperties(authPensionerDO,pensionAuthDO);
+ }
comPensionAuthHistoryRecordMapper.updateById(pensionAuthDO);
}
}else{
--
Gitblit v1.7.1