From 0590944f5d4a4f93af2a4c9241f0e154a9f41c08 Mon Sep 17 00:00:00 2001
From: manailin <261030956@qq.com>
Date: 星期二, 23 十一月 2021 17:05:45 +0800
Subject: [PATCH] Merge branch 'test' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into test

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActReserveApi.java |   28 +++++++++++++++++++++++++++-
 1 files changed, 27 insertions(+), 1 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActReserveApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActReserveApi.java
index c87f0d2..eb92507 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActReserveApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActReserveApi.java
@@ -111,8 +111,14 @@
     }
 
     /**
-     *
+     * 外部调用提交预约/登记
+     * @param comActReserveCommitVO
+     * @return
      */
+    @PostMapping("/commitNoToken")
+    public R commitNoToken(@RequestBody ComActReserveCommitVO comActReserveCommitVO){
+        return comActReserveService.commitNoToken(comActReserveCommitVO);
+    }
 
     /**
      * 小程序提交预约/登记
@@ -322,4 +328,24 @@
     public R list(@RequestParam("communityId") Long communityId){
         return comActReserveService.reserveListApplets(communityId);
     }
+
+    /**
+     * 分页查询居家隔离统计
+     * @param detailedAdminDTO
+     * @return
+     */
+    @PostMapping("/admin/register/homeQuarantine/page")
+    public R pageRegisterHomeQuarantine(@RequestBody PageReserveRegisterDetailedAdminDTO detailedAdminDTO) {
+        return comActReserveAnswerContentService.pageRegisterHomeQuarantine(detailedAdminDTO);
+    }
+
+    /**
+     * 居家隔离导出
+     * @param detailedAdminDTO
+     * @return
+     */
+    @PostMapping("/admin/homeQuarantine/export")
+    public R exportHomeQuarantine(@RequestBody PageReserveRegisterDetailedAdminDTO detailedAdminDTO) {
+        return comActReserveAnswerContentService.exportHomeQuarantine(detailedAdminDTO);
+    }
 }

--
Gitblit v1.7.1