From af73409f431fb97eade82d34eff8c7b05e7fac92 Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期四, 10 六月 2021 14:47:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test_elder_cedoo' into test_elder_cedoo
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java | 27 ++++++++++++---------------
1 files changed, 12 insertions(+), 15 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 af8099f..81a7f69 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
@@ -1,5 +1,6 @@
package com.panzhihua.service_community.api;
+import cn.hutool.core.util.IdcardUtil;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -82,6 +83,8 @@
private EldersAuthService eldersAuthService;
@Resource
public ComMngPopulationDAO comMngPopulationDAO;
+ @Resource
+ public ComEldersAuthUserService comEldersAuthUserService;
/**
* 新增社区活动
@@ -1576,29 +1579,23 @@
@PostMapping("/eldersauth/addByFamilyUser")
R addByFamilyUser(@RequestBody EldersAuthAddByFamilyDTO eldersAuthAddByFamilyDTO){
- List<ComMngFamilyInfoVO> list = comMngPopulationDAO.listFamilyByUserId(eldersAuthAddByFamilyDTO.getUserId());
- ComMngFamilyInfoVO theFamily = null;
- Long familyUserId = eldersAuthAddByFamilyDTO.getFamilyUserId();
- for (ComMngFamilyInfoVO family : list) {
- if (familyUserId == family.getId()) {
- theFamily = family;
- }
+ ComEldersAuthUserDO authUserDO = comEldersAuthUserService.getById(eldersAuthAddByFamilyDTO.getFamilyUserId());
+ if(authUserDO == null){
+ return R.fail("未查询到老人信息");
}
- if(theFamily==null){
- return R.fail("家庭成员信息错误");
- }
- Integer age = IdCard.IdNOToAge(theFamily.getIdCard());
+ Integer age = IdcardUtil.getAgeByIdCard(authUserDO.getIdCard());
if(age>=80){
Long loginUserId = eldersAuthAddByFamilyDTO.getUserId();
EldersAuthDO eldersAuthDO = new EldersAuthDO();
- eldersAuthDO.setSumitUserId(eldersAuthAddByFamilyDTO.getSumitUserId());
+ eldersAuthDO.setSumitUserId(loginUserId);
eldersAuthDO.setCreateBy(loginUserId);
eldersAuthDO.setCreateAt(new Date());
- eldersAuthDO.setIdCard(theFamily.getIdCard());
- eldersAuthDO.setAuthUserName(theFamily.getName());
+ eldersAuthDO.setIdCard(authUserDO.getIdCard());
+ eldersAuthDO.setAuthUserName(authUserDO.getName());
eldersAuthDO.setVideoUrl(eldersAuthAddByFamilyDTO.getVideoUrl());
- eldersAuthDO.setFamilyUserId(eldersAuthAddByFamilyDTO.getFamilyUserId());
+ eldersAuthDO.setFamilyUserId(authUserDO.getId());
+ eldersAuthDO.setAge(IdcardUtil.getAgeByIdCard(authUserDO.getIdCard()));
//根据身份证查询出籍贯 出生日期
//String domicile = IdCard.domicile(eldersAuthDO.getIdCard());
String domicile = eldersAuthService.queryDomicile(eldersAuthDO.getIdCard());
--
Gitblit v1.7.1