From d14de6ff419d97acb57d27f808a7b11eead13f67 Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期四, 10 六月 2021 19:08:30 +0800
Subject: [PATCH] Merge branch 'test_elder_cedoo' into 'test'
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java
index 3e704fe..2ddd1b3 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java
@@ -1585,16 +1585,18 @@
return R.fail("未查询到老人信息");
}
+ String idCard = authUserDO.getIdCard();
+
Long loginUserId = eldersAuthAddByFamilyDTO.getUserId();
EldersAuthDO eldersAuthDO = new EldersAuthDO();
eldersAuthDO.setSumitUserId(loginUserId);
eldersAuthDO.setCreateBy(loginUserId);
eldersAuthDO.setCreateAt(new Date());
- eldersAuthDO.setIdCard(authUserDO.getIdCard());
+ eldersAuthDO.setIdCard(idCard);
eldersAuthDO.setAuthUserName(authUserDO.getName());
eldersAuthDO.setVideoUrl(eldersAuthAddByFamilyDTO.getVideoUrl());
eldersAuthDO.setFamilyUserId(authUserDO.getId());
- eldersAuthDO.setAge(IdcardUtil.getAgeByIdCard(authUserDO.getIdCard()));
+ eldersAuthDO.setAge(IdcardUtil.getAgeByIdCard(idCard));
//根据身份证查询出籍贯 出生日期
//String domicile = IdCard.domicile(eldersAuthDO.getIdCard());
String domicile = eldersAuthService.queryDomicile(eldersAuthDO.getIdCard());
@@ -1602,22 +1604,22 @@
domicile = "暂无";
}
- Date birthDay = IdCard.birthDay(eldersAuthDO.getIdCard());
+ Date birthDay = IdCard.birthDay(idCard);
eldersAuthDO.setDomicile(domicile);
eldersAuthDO.setBirthDay(birthDay);
int add = eldersAuthService.getBaseMapper().insert(eldersAuthDO);
if(add==1){
//认证成功 添加认证记录
List<ComEldersAuthHistoryRecordDO> authHistoryRecordDOList = comEldersAuthHistoryRecordMapper.selectList(new QueryWrapper<ComEldersAuthHistoryRecordDO>()
- .lambda().eq(ComEldersAuthHistoryRecordDO::getIdCard,eldersAuthDO.getIdCard()).ge(ComEldersAuthHistoryRecordDO::getCreateAt, DateUtils.getFirstDayOfMonth()));
+ .lambda().eq(ComEldersAuthHistoryRecordDO::getIdCard,idCard).ge(ComEldersAuthHistoryRecordDO::getCreateAt, DateUtils.getFirstDayOfMonth()));
if(authHistoryRecordDOList.isEmpty()){
ComEldersAuthHistoryRecordDO authHistoryRecordDO = new ComEldersAuthHistoryRecordDO();
authHistoryRecordDO.setUserId(eldersAuthAddByFamilyDTO.getFamilyUserId());
authHistoryRecordDO.setAuthId(eldersAuthDO.getId());
BeanUtils.copyProperties(eldersAuthDO,authHistoryRecordDO);
authHistoryRecordDO.setId(null);
- authHistoryRecordDO.setBrithday(AgeUtils.getAgeFormatBirthday(IdcardUtil.getBirthByIdCard(eldersAuthDO.getIdCard())));
- authHistoryRecordDO.setAge(IdcardUtil.getAgeByIdCard(eldersAuthDO.getIdCard()));
+ authHistoryRecordDO.setBrithday(AgeUtils.getAgeFormatBirthday(IdcardUtil.getBirthByIdCard(idCard)));
+ authHistoryRecordDO.setAge(IdcardUtil.getAgeByIdCard(idCard));
authHistoryRecordDO.setIsAuth(1);
authHistoryRecordDO.setDomicile(domicile);
comEldersAuthHistoryRecordMapper.insert(authHistoryRecordDO);
--
Gitblit v1.7.1