From 7a282d69e08d875a016975ea4b980bec98a9bab8 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期五, 24 九月 2021 18:06:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/four_member' into four_member

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/EldersAuthApi.java |   69 +++++++++++++++++++++++++++++++++-
 1 files changed, 67 insertions(+), 2 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 187fa24..982387b 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,7 +172,7 @@
      * @param eldersAuthTypeQueryDTO
      * @return
      */
-    @PostMapping("/authtype")
+    @PostMapping("/authType")
     public R elderAuthType(@RequestBody EldersAuthTypeQueryDTO eldersAuthTypeQueryDTO) {
         return eldersAuthService.communityAuthType(eldersAuthTypeQueryDTO);
     }
@@ -291,7 +297,7 @@
      * @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);
     }
 
@@ -451,5 +457,64 @@
         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