From 2e64c232ab6b51b2cecf1ee96e1e9b709234f326 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期六, 21 八月 2021 16:35:14 +0800
Subject: [PATCH] 随手拍改版接口开发
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/EldersAuthApi.java | 34 +++++++++++++++++++++++++++-------
1 files changed, 27 insertions(+), 7 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 68c28df..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,15 +1,15 @@
package com.panzhihua.service_community.api;
-import com.panzhihua.common.model.dtos.community.PageComOpsHouseDTO;
-import com.panzhihua.common.model.dtos.community.PageEldersAuthRecordDTO;
+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;
import com.panzhihua.common.model.dtos.elders.ComEldersAuthPageDTO;
import com.panzhihua.common.model.dtos.elders.ComEldersAuthUserAddAppDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.elders.ComElderAuthUserDetailVO;
-import com.panzhihua.common.model.dtos.community.EldersAuthTypeQueryDTO;
import com.panzhihua.common.model.vos.community.SysConfVO;
-import com.panzhihua.common.model.dtos.community.PageComEldersRecordsDTO;
+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;
@@ -20,6 +20,7 @@
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
+import java.util.List;
/**
* @ClasssName EldersAuthApi
@@ -41,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);
@@ -59,7 +65,11 @@
*/
@PostMapping("/add/auth")
public R addAuth(@RequestBody ComEldersAuthGetResultDTO authGetResultDTO){
- return eldersAuthService.addAuthByEldersApp(authGetResultDTO);
+ try {
+ return eldersAuthService.addAuthByEldersApp(authGetResultDTO);
+ } catch (Exception e) {
+ throw new ServiceException(e.getMessage());
+ }
}
/**
@@ -68,7 +78,7 @@
* @return 查询结果
*/
@PostMapping("/page/auth")
- public R pageEldersByApp(@RequestBody ComEldersAuthPageDTO authPageDTO){
+ public R pageEldersByApp(@RequestBody ComEldersAuthPageDTO authPageDTO) throws Exception{
return eldersAuthService.pageEldersByApp(authPageDTO);
}
@@ -135,5 +145,15 @@
return eldersAuthService.pageQueryEldersAuthRecord(pageEldersAuthElderlyDTO);
}
+ @PostMapping("/getAuthHistoryList")
+ public R getAuthHistoryList(@RequestBody PageEldersAuthHistoryDTO pageEldersAuthElderlyDTO){
+ return eldersAuthService.getAuthHistoryList(pageEldersAuthElderlyDTO);
+ }
+
+ @PostMapping("/getAuthHistoryExport")
+ public R getAuthHistoryExport(@RequestBody PageEldersAuthHistoryDTO pageEldersAuthElderlyDTO){
+ return eldersAuthService.getAuthHistoryExport(pageEldersAuthElderlyDTO);
+ }
+
}
--
Gitblit v1.7.1