Merge remote-tracking branch 'origin/test_elder_cedoo' into test_elder_cedoo

huanghongfa

2021-06-10 4fe0b0d3feb1baadb1f1ea19b65841ed97df43a7

Merge remote-tracking branch 'origin/test_elder_cedoo' into test_elder_cedoo

 springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/EldersAuthRecordsApi.java

@@ -111,12 +111,12 @@
     * @param id 高龄认证 id
     * @return 查找结果
     */
    @GetMapping("/importTemplate")
   /* @GetMapping("/importTemplate")
    @ApiOperation(value = "生存认证记录导入模板", response = EldersAuthDetailsVO.class)
    R importTemplate(@PathVariable("id") Long id){
        //return R.ok(elderRecordUrl);
        return R.ok();
    }
    }*/

    /**
     * 设置当前社区认证方式

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java

@@ -1584,8 +1584,6 @@
            return R.fail("未查询到老人信息");
        }

        Integer age = IdcardUtil.getAgeByIdCard(authUserDO.getIdCard());
        if(age>=80){
            Long loginUserId = eldersAuthAddByFamilyDTO.getUserId();
            EldersAuthDO eldersAuthDO = new EldersAuthDO();
            eldersAuthDO.setSumitUserId(loginUserId);
@@ -1610,9 +1608,7 @@
            if(add==1){
                return R.ok(eldersAuthDO.getId());
            }
        }else{
            return R.fail("家庭成员年龄还未达到80");
        }

        return R.fail();
    }