From c6f97d0f2b84b46bf62d5e1f4257a74bb373d079 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期三, 10 十一月 2021 11:24:25 +0800
Subject: [PATCH] 1110修改提交
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/EldersAuthApi.java | 109 +++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 102 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 76bb4b1..3da5556 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
@@ -6,6 +6,10 @@
import cn.hutool.core.util.IdcardUtil;
import com.panzhihua.common.model.dtos.community.*;
+import com.panzhihua.common.model.dtos.community.elder.ElderAuthStatisticHeaderDTO;
+import com.panzhihua.common.model.dtos.community.elder.PageElderAuthStatisticDTO;
+import com.panzhihua.common.model.dtos.community.elder.PagePensionAuthStatisticDTO;
+import com.panzhihua.common.model.dtos.community.elder.SignElderAuthStatisticDTO;
import com.panzhihua.common.model.vos.community.*;
import com.panzhihua.service_community.model.dos.ComEldersAuthElderlyDO;
import com.panzhihua.service_community.service.*;
@@ -49,6 +53,8 @@
private ComElderAuthRecordsService comElderAuthRecordsService;
@Resource
private ComPensionAuthRecordService comPensionAuthRecordService;
+ @Resource
+ private ComPensionAuthHistoryRecordService comPensionAuthHistoryRecordService;
@PostMapping("/getAuth")
public R getAuth(@RequestParam("authUserId") Long authUserId) {
@@ -166,8 +172,8 @@
* @param eldersAuthTypeQueryDTO
* @return
*/
- @PostMapping("/authtype")
- R communityElderAuthType(@RequestBody EldersAuthTypeQueryDTO eldersAuthTypeQueryDTO) {
+ @PostMapping("/authType")
+ public R elderAuthType(@RequestBody EldersAuthTypeQueryDTO eldersAuthTypeQueryDTO) {
return eldersAuthService.communityAuthType(eldersAuthTypeQueryDTO);
}
@@ -198,7 +204,7 @@
}
/**
- * 检测上月所有视频认证记录，取最后一条记录为认证成功记录
+ * 身份认证定时任务
* @return 执行结果
*/
@PostMapping("/auth/record/task")
@@ -291,8 +297,19 @@
* @date 2021/9/02 11:03
*/
@PostMapping("/authRecords/statistic/export")
- public R exportElderAuthRecordsStatistic(@RequestBody PageElderAuthRecordsDTO pageElderAuthRecordsDTO){
+ public R exportElderAuthRecordsStatistic(@RequestBody PageElderAuthStatisticDTO pageElderAuthRecordsDTO){
return comElderAuthRecordsService.exportElderAuthRecordsStatistic(pageElderAuthRecordsDTO);
+ }
+
+ /**
+ * 导出高龄认证记录 exportElderAuthRecords 导出高龄认证记录
+ * @param pageElderAuthRecordsDTO 查询参数
+ * @return R 查询结果
+ * @date 2021/9/02 11:03
+ */
+ @PostMapping("/authRecords/export")
+ public R exportElderAuthRecords(@RequestBody PageElderAuthRecordsDTO pageElderAuthRecordsDTO){
+ return comElderAuthRecordsService.export(pageElderAuthRecordsDTO);
}
/**
@@ -372,6 +389,25 @@
}
/**
+ * 高龄认证添加
+ * @param comElderAuthRecordVO
+ * @return
+ */
+ @PostMapping("/authRecord/add")
+ R addAuthRecord(@RequestBody ComElderAuthRecordVO comElderAuthRecordVO){
+ return comElderAuthRecordsService.add(comElderAuthRecordVO);
+ }
+ /**
+ * 养老认证添加
+ * @param comElderAuthRecordVO
+ * @return
+ */
+ @PostMapping("/pensionAuthRecord/add")
+ R addPensionAuthRecordVO(@RequestBody ComElderAuthRecordVO comElderAuthRecordVO){
+ return comPensionAuthRecordService.add(comElderAuthRecordVO);
+ }
+
+ /**
* 导出养老认证记录 exportPensionAuthRecordsStatistic 导出养老认证记录
* @param pageElderAuthRecordsDTO 查询参数
* @return R 查询结果
@@ -409,7 +445,7 @@
}
/**
- * 定时任务每月1号0点统计高龄老人本期应该认证总人数
+ * 身份认证定时任务
* @return 执行结果
*/
@PostMapping("/authRecords/statistics")
@@ -434,7 +470,7 @@
* @author txb
* @date 2021/9/10 16:03
*/
- @PutMapping("/authType/{type}")
+ @PutMapping("/new/authType/{type}")
public R setAuthType(@RequestParam("communityId") Long communityId, @RequestParam("type") Integer type) {
return eldersAuthService.setAuthType(communityId, type);
}
@@ -446,10 +482,69 @@
* @author txb
* @date 2021/9/10 16:03
*/
- @PostMapping("/authtype")
+ @PostMapping("/new/authtype")
public R communityAuthType(@RequestBody EldersAuthTypeQueryDTO eldersAuthTypeQueryDTO) {
return eldersAuthService.getAuthType(eldersAuthTypeQueryDTO);
}
+ /**
+ * 高龄认证统计-分页查询
+ * @param pageElderAuthStatisticDTO 请求参数
+ * @return 高龄认证统计列表
+ */
+ @PostMapping("/auth/statistic/page")
+ public R pageAuthStatisticAdmin(@RequestBody PageElderAuthStatisticDTO pageElderAuthStatisticDTO) {
+ return eldersAuthService.pageAuthStatisticAdmin(pageElderAuthStatisticDTO);
+ }
+
+ /**
+ * 高龄认证统计-标记
+ * @param signElderAuthStatisticDTO 请求参数
+ * @return 标记结果
+ */
+ @PostMapping("/auth/statistic/sign")
+ public R signAuthStatisticAdmin(@RequestBody SignElderAuthStatisticDTO signElderAuthStatisticDTO) {
+ return eldersAuthService.signAuthStatisticAdmin(signElderAuthStatisticDTO);
+ }
+
+ /**
+ * 高龄认证统计-统计表头数据
+ * @param statisticHeaderDTO 请求参数
+ * @return 统计表头数据
+ */
+ @PostMapping("/auth/header/statistic")
+ public R getAuthHeaderStatisticAdmin(@RequestBody ElderAuthStatisticHeaderDTO statisticHeaderDTO) {
+ return eldersAuthService.getAuthHeaderStatisticAdmin(statisticHeaderDTO);
+ }
+
+ /**
+ * 养老认证统计-分页查询
+ * @param pensionAuthStatisticDTO 请求参数
+ * @return 养老认证统列表
+ */
+ @PostMapping("/pension/auth/statistic/page")
+ public R pagePensionAuthStatisticAdmin(@RequestBody PagePensionAuthStatisticDTO pensionAuthStatisticDTO) {
+ return comPensionAuthHistoryRecordService.pagePensionAuthStatisticAdmin(pensionAuthStatisticDTO);
+ }
+
+ /**
+ * 养老认证记标记
+ * @param signElderAuthStatisticDTO 请求参数
+ * @return 标记结果
+ */
+ @PostMapping("/pension/auth/statistic/sign")
+ public R signPensionAuthStatisticAdmin(@RequestBody SignElderAuthStatisticDTO signElderAuthStatisticDTO) {
+ return comPensionAuthHistoryRecordService.signPensionAuthStatisticAdmin(signElderAuthStatisticDTO);
+ }
+
+ /**
+ * 养老认证表头统计
+ * @param statisticHeaderDTO 请求参数
+ * @return 统计结果
+ */
+ @PostMapping("/pension/auth/header/statistic")
+ public R getPensionAuthHeaderStatisticAdmin(@RequestBody ElderAuthStatisticHeaderDTO statisticHeaderDTO) {
+ return comPensionAuthHistoryRecordService.getPensionAuthHeaderStatisticAdmin(statisticHeaderDTO);
+ }
}
--
Gitblit v1.7.1