From e16b3c00a6b92873ffecb386393dc264ce475cec Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期四, 10 六月 2021 14:57:03 +0800
Subject: [PATCH] Merge branch 'test_elder_cedoo' into 'test'
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/EldersAuthServiceImpl.java | 31 ++++++++++++++++++++++++++++---
1 files changed, 28 insertions(+), 3 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 e0233a8..3712efe 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
@@ -207,7 +207,7 @@
sysConfDO.setCode("ELDER_AUTH_TYPE");
sysConfDO.setName("高龄认证类型");
sysConfDO.setValue(2+"");//核验类型（1.视频认证 2.人脸核验）
- sysConfDO.setDescribe("高龄认证默认添加的核验类型");
+ sysConfDO.setDescription("高龄认证默认添加的核验类型");
sysConfDO.setCommunityId(communityId);
sysConfDO.setCreateBy(eldersAuthTypeQueryDTO.getUserId());
int inserted = sysConfDao.insert(sysConfDO);
@@ -248,7 +248,7 @@
domicile = "暂无";
}
eldersAuthDO.setDomicile(domicile);
- eldersAuthDO.setBirthDay(IdCard.birthDay(authUserDO.getIdCard()));
+ eldersAuthDO.setBirthDay(IdcardUtil.getBirthDate(authUserDO.getIdCard()));
eldersAuthDO.setFamilyUserId(authUserDO.getId());
eldersAuthDO.setAge(IdcardUtil.getAgeByIdCard(eldersAuthDO.getIdCard()));
eldersAuthDO.setType(2);
@@ -313,7 +313,7 @@
}
}
}
- authUser.setAge(AgeUtils.getAgeFromBirthTimes(IdCard.birthDay(authUser.getIdCard()).getTime()));
+ authUser.setAge(IdcardUtil.getAgeByIdCard(authUser.getIdCard()));
});
}
return R.ok(authUserAppVOIPage);
@@ -373,4 +373,29 @@
}
return R.fail();
}
+ @Override
+ public R pageQueryEldersAuthRecord(PageEldersAuthRecordDTO pageEldersAuthElderlyDTO) {
+ Page page = new Page();
+ page.setCurrent(pageEldersAuthElderlyDTO.getPageNum());
+ page.setSize(pageEldersAuthElderlyDTO.getPageSize());
+ return R.ok(eldersAuthDAO.selectCommunityEldersRecordByPage(page, pageEldersAuthElderlyDTO));
+ }
+
+ @Override
+ 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));
+ if(authConf!=null && authConf.size()>0){
+ SysConfDO first = authConf.get(0);
+ first.setValue(type+"");
+ int updated = sysConfDao.updateById(first);
+ if(updated == 1){
+ return R.ok();
+ }
+ }
+ return R.fail();
+ }
}
--
Gitblit v1.7.1