From 6424521a768125e66b64a23d2094e05eb95b105f Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期五, 08 十月 2021 11:30:14 +0800
Subject: [PATCH] bug修复
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/EldersAuthServiceImpl.java | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 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 2877469..fe1a95c 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
@@ -501,7 +501,7 @@
public R setCommunityAuthType(Long communityId, Integer type) {
List<SysConfDO> authConf =
sysConfDao.selectList(new LambdaQueryWrapper<SysConfDO>().eq(SysConfDO::getCommunityId, communityId)
- .eq(SysConfDO::getCode, "ELDER_AUTH_TYPE").orderByDesc(SysConfDO::getCreateAt));
+ .eq(SysConfDO::getCode, "ELDER_AUTH_TYPE_" + communityId).orderByDesc(SysConfDO::getCreateAt));
if (authConf != null && authConf.size() > 0) {
SysConfDO first = authConf.get(0);
first.setValue(type + "");
@@ -584,7 +584,6 @@
//养老认证本期期数
String pensionAuthPeriod = DateUtils.getCurrentDateString_YYYY();
- //养老认证本期期数
//查询所有老人信息并加入到老人认证历史记录表中，如果不存在则新增，存在则不做操作
List<ComElderAuthElderliesDO> authElderliesList = comElderAuthElderliesDAO.selectList(new QueryWrapper<>());
authElderliesList.forEach(authElderlies -> {
@@ -601,25 +600,30 @@
authHistoryRecordDO.setCreateAt(nowDate);
comEldersAuthHistoryRecordMapper.insert(authHistoryRecordDO);
}
+ });
+ //查询所有养老人员信息并加入到老人认证历史记录表中，如果不存在则新增，存在则不做操作
+ List<ComPensionAuthPensionerDO> pensionAuthPensionerList = comPensionAuthPensionerDAO.selectList(new QueryWrapper<>());
+ 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()));
- //遍历认证记录列表
+ //遍历高龄认证记录列表
authRecordsList.forEach(authRecords -> {
if(authRecords.getApprovalStatus().equals(ComElderAuthRecordsDO.approvalStatus.tg)){
ComEldersAuthHistoryRecordDO authHistoryRecordDO = comEldersAuthHistoryRecordMapper.selectOne(new QueryWrapper<ComEldersAuthHistoryRecordDO>().lambda()
--
Gitblit v1.7.1