From accc335d5753b25e75789ce5374896fd40387434 Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期五, 18 六月 2021 13:45:13 +0800
Subject: [PATCH] Merge branch 'test_screen' into 'test'
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/EldersAuthApi.java | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/EldersAuthApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/EldersAuthApi.java
index ee20528..c075247 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/EldersAuthApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/EldersAuthApi.java
@@ -1,5 +1,6 @@
package com.panzhihua.service_community.api;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.panzhihua.common.exceptions.ServiceException;
import com.panzhihua.common.model.dtos.community.*;
import com.panzhihua.common.model.dtos.elders.ComEldersAuthGetResultDTO;
@@ -8,6 +9,7 @@
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.elders.ComElderAuthUserDetailVO;
import com.panzhihua.common.model.vos.community.SysConfVO;
+import com.panzhihua.common.utlis.DateUtils;
import com.panzhihua.service_community.model.dos.ComEldersAuthUserDO;
import com.panzhihua.service_community.model.dos.EldersAuthDO;
import com.panzhihua.common.model.vos.community.ComEldersAuthElderlyDetailsVO;
@@ -18,6 +20,7 @@
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
+import java.util.List;
/**
* @ClasssName EldersAuthApi
@@ -39,11 +42,16 @@
@PostMapping("/getAuth")
public R getAuth(@RequestParam("authUserId") Long authUserId){
ComEldersAuthUserDO authUserDO = comEldersAuthUserService.getById(authUserId);
+
if(authUserDO == null){
return R.fail("未查询到老人信息");
}
if(authUserDO.getIsAuth().equals(ComEldersAuthUserDO.isAuth.yes)){
- return R.fail("该老人已认证");
+ List<EldersAuthDO> eldersAuthDOList = eldersAuthService.list(new QueryWrapper<EldersAuthDO>()
+ .lambda().eq(EldersAuthDO::getType,2).ge(EldersAuthDO::getCreateAt, DateUtils.getFirstDayOfMonth()));
+ if(!eldersAuthDOList.isEmpty()){
+ return R.fail("该老人已认证");
+ }
}
ComElderAuthUserDetailVO authUserDetailVO = new ComElderAuthUserDetailVO();
BeanUtils.copyProperties(authUserDO,authUserDetailVO);
--
Gitblit v1.7.1