From 8bf43f03da3a291c90e48072e837d254d11a88b0 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期六, 09 十月 2021 15:20:45 +0800
Subject: [PATCH] bug修复
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/EldersAuthServiceImpl.java | 22 +++++++++++++++++++++-
1 files changed, 21 insertions(+), 1 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 305affb..25f29ef 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;
@@ -598,6 +599,8 @@
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);
}
});
@@ -616,6 +619,8 @@
pensionAuthDO.setElderliesId(authPension.getId());
pensionAuthDO.setAuthPeriod(pensionAuthPeriod);
pensionAuthDO.setCreateAt(nowDate);
+ pensionAuthDO.setBrithday(IdcardUtil.getBirthByIdCard(authPension.getIdCard()));
+ pensionAuthDO.setAge(IdcardUtil.getAgeByIdCard(authPension.getIdCard()));
comPensionAuthHistoryRecordMapper.insert(pensionAuthDO);
}
});
@@ -635,6 +640,8 @@
ComElderAuthElderliesDO authElderliesDO = comElderAuthElderliesDAO.selectById(authRecords.getElderliesId());
if(authElderliesDO != null){
BeanUtils.copyProperties(authElderliesDO,authHistoryRecordDO);
+ authHistoryRecordDO.setBrithday(IdcardUtil.getBirthByIdCard(authElderliesDO.getIdCard()));
+ authHistoryRecordDO.setAge(IdcardUtil.getAgeByIdCard(authElderliesDO.getIdCard()));
}
authHistoryRecordDO.setIsAuth(ComEldersAuthHistoryRecordDO.isAuth.yes);
authHistoryRecordDO.setAuthDate(authRecords.getApprovalDate());
@@ -644,6 +651,7 @@
authHistoryRecordDO.setAuthMethod(authRecords.getAuthMethod());
authHistoryRecordDO.setVerificationResult(authRecords.getVerificationResult());
authHistoryRecordDO.setAuthId(authRecords.getId());
+
comEldersAuthHistoryRecordMapper.updateById(authHistoryRecordDO);
}
}else{
@@ -652,6 +660,8 @@
ComElderAuthElderliesDO authElderliesDO = comElderAuthElderliesDAO.selectById(authRecords.getElderliesId());
if(authElderliesDO != null){
BeanUtils.copyProperties(authElderliesDO,authHistoryRecordDO);
+ authHistoryRecordDO.setBrithday(IdcardUtil.getBirthByIdCard(authElderliesDO.getIdCard()));
+ authHistoryRecordDO.setAge(IdcardUtil.getAgeByIdCard(authElderliesDO.getIdCard()));
}
BeanUtils.copyProperties(authRecords,authHistoryRecordDO);
authHistoryRecordDO.setAuthDate(authRecords.getApprovalDate());
@@ -677,6 +687,8 @@
ComPensionAuthPensionerDO authPensionerDO = comPensionAuthPensionerDAO.selectById(authRecords.getPensionerId());
if(authPensionerDO != null){
BeanUtils.copyProperties(authPensionerDO,pensionAuthDO);
+ pensionAuthDO.setBrithday(IdcardUtil.getBirthByIdCard(authPensionerDO.getIdCard()));
+ pensionAuthDO.setAge(IdcardUtil.getAgeByIdCard(authPensionerDO.getIdCard()));
}
pensionAuthDO.setIsAuth(ComPensionAuthHistoryRecordDO.isAuth.yes);
pensionAuthDO.setAuthDate(authRecords.getApprovalDate());
@@ -694,6 +706,8 @@
ComPensionAuthPensionerDO authPensionerDO = comPensionAuthPensionerDAO.selectById(authRecords.getPensionerId());
if(authPensionerDO != null){
BeanUtils.copyProperties(authPensionerDO,pensionAuthDO);
+ pensionAuthDO.setBrithday(IdcardUtil.getBirthByIdCard(authPensionerDO.getIdCard()));
+ pensionAuthDO.setAge(IdcardUtil.getAgeByIdCard(authPensionerDO.getIdCard()));
}
BeanUtils.copyProperties(authRecords,pensionAuthDO);
pensionAuthDO.setAuthDate(authRecords.getApprovalDate());
@@ -759,7 +773,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