From f074a2bbe4afcca82624ede60d2b2ba9008b0c6a Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期六, 09 十月 2021 13:16:16 +0800
Subject: [PATCH] bug修复
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/EldersAuthServiceImpl.java | 25 ++++++++++++-------------
1 files changed, 12 insertions(+), 13 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 9196cb3..bae9d38 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
@@ -631,6 +631,11 @@
.eq(ComEldersAuthHistoryRecordDO::getAuthPeriod,authRecords.getAuthPeriod()));
if(authHistoryRecordDO != null){//存在记录
if(authHistoryRecordDO.getIsAuth().equals(ComEldersAuthHistoryRecordDO.isAuth.no)){
+ //查询老人信息
+ ComElderAuthElderliesDO authElderliesDO = comElderAuthElderliesDAO.selectById(authRecords.getElderliesId());
+ if(authElderliesDO != null){
+ BeanUtils.copyProperties(authElderliesDO,authHistoryRecordDO);
+ }
authHistoryRecordDO.setIsAuth(ComEldersAuthHistoryRecordDO.isAuth.yes);
authHistoryRecordDO.setAuthDate(authRecords.getApprovalDate());
authHistoryRecordDO.setApprovalDate(authRecords.getApprovalDate());
@@ -639,22 +644,16 @@
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{
authHistoryRecordDO = new ComEldersAuthHistoryRecordDO();
- BeanUtils.copyProperties(authRecords,authHistoryRecordDO);
//查询老人信息
ComElderAuthElderliesDO authElderliesDO = comElderAuthElderliesDAO.selectById(authRecords.getElderliesId());
if(authElderliesDO != null){
BeanUtils.copyProperties(authElderliesDO,authHistoryRecordDO);
}
+ BeanUtils.copyProperties(authRecords,authHistoryRecordDO);
authHistoryRecordDO.setIsAuth(ComEldersAuthHistoryRecordDO.isAuth.yes);
authHistoryRecordDO.setAuthId(authRecords.getId());
comEldersAuthHistoryRecordMapper.insert(authHistoryRecordDO);
@@ -672,6 +671,11 @@
.eq(ComPensionAuthHistoryRecordDO::getAuthPeriod,authRecords.getAuthPeriod()));
if(pensionAuthDO != null){//存在记录
if(pensionAuthDO.getIsAuth().equals(ComPensionAuthHistoryRecordDO.isAuth.no)){
+ //查询老人信息
+ ComPensionAuthPensionerDO authPensionerDO = comPensionAuthPensionerDAO.selectById(authRecords.getPensionerId());
+ if(authPensionerDO != null){
+ BeanUtils.copyProperties(authPensionerDO,pensionAuthDO);
+ }
pensionAuthDO.setIsAuth(ComPensionAuthHistoryRecordDO.isAuth.yes);
pensionAuthDO.setAuthDate(authRecords.getApprovalDate());
pensionAuthDO.setApprovalDate(authRecords.getApprovalDate());
@@ -680,21 +684,16 @@
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{
pensionAuthDO = new ComPensionAuthHistoryRecordDO();
- BeanUtils.copyProperties(authRecords,pensionAuthDO);
//查询老人信息
ComPensionAuthPensionerDO authPensionerDO = comPensionAuthPensionerDAO.selectById(authRecords.getPensionerId());
if(authPensionerDO != null){
BeanUtils.copyProperties(authPensionerDO,pensionAuthDO);
}
+ BeanUtils.copyProperties(authRecords,pensionAuthDO);
pensionAuthDO.setIsAuth(ComPensionAuthHistoryRecordDO.isAuth.yes);
pensionAuthDO.setAuthId(authRecords.getId());
comPensionAuthHistoryRecordMapper.insert(pensionAuthDO);
--
Gitblit v1.7.1