From a152df67e51bc21ab671e24092445b4f7213aca8 Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期四, 20 五月 2021 16:44:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/VaccinesApi.java | 37 ++++++++++++++++++++++++++++++++-----
1 files changed, 32 insertions(+), 5 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/VaccinesApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/VaccinesApi.java
index 166fe29..5217b53 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/VaccinesApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/VaccinesApi.java
@@ -1,9 +1,6 @@
package com.panzhihua.service_community.api;
-import com.panzhihua.common.model.dtos.vaccines.VaccinesByAdminDTO;
-import com.panzhihua.common.model.dtos.vaccines.VaccinesEnrollByAdminDTO;
-import com.panzhihua.common.model.dtos.vaccines.VaccinesEnrollByAppDTO;
-import com.panzhihua.common.model.dtos.vaccines.VaccinesEnrollUserByAppDTO;
+import com.panzhihua.common.model.dtos.vaccines.*;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.service_community.service.ComMngVaccinesEnrollRecordService;
import com.panzhihua.service_community.service.ComMngVaccinesInoculationRecordService;
@@ -98,7 +95,7 @@
* @param vaccinesByAdminDTO 请求参数
* @return 登记列表
*/
- @PostMapping("admin/enroll/list")
+ @PostMapping("/admin/enroll/list")
public R getVaccinesEnrollListByAdmin(@RequestBody VaccinesEnrollByAdminDTO vaccinesByAdminDTO) {
return comMngVaccinesEnrollRecordService.getVaccinesEnrollListByAdmin(vaccinesByAdminDTO);
}
@@ -112,4 +109,34 @@
public R deleteVaccinesByAdmin(@RequestParam("id") Long id) {
return comMngVaccinesService.deleteVaccinesByAdmin(id);
}
+
+ /**
+ * 根据条件导出疫苗登记记录
+ * @param vaccinesByAdminDTO 请求参数
+ * @return 导出登记列表
+ */
+ @PostMapping("/admin/enroll/export")
+ public R exportVaccinesEnrollListByAdmin(@RequestBody VaccinesEnrollByAdminDTO vaccinesByAdminDTO) {
+ return comMngVaccinesEnrollRecordService.exportVaccinesEnrollListByAdmin(vaccinesByAdminDTO);
+ }
+
+ /**
+ * 查询接种记录列表
+ * @param inoculationByAdminDTO 请求参数
+ * @return 接种记录列表
+ */
+ @PostMapping("/admin/inoculation/list")
+ public R getVaccinesInoculationListByAdmin(@RequestBody VaccinesInoculationByAdminDTO inoculationByAdminDTO) {
+ return comMngVaccinesInoculationRecordService.getVaccinesInoculationListByAdmin(inoculationByAdminDTO);
+ }
+
+ /**
+ * 接种记录信息导出
+ * @param inoculationByAdminDTO 请求参数
+ * @return 导出结果
+ */
+ @PostMapping("/admin/inoculation/export")
+ public R exportVaccinesInoculationListByAdmin(@RequestBody VaccinesInoculationByAdminDTO inoculationByAdminDTO) {
+ return comMngVaccinesInoculationRecordService.exportVaccinesInoculationListByAdmin(inoculationByAdminDTO);
+ }
}
--
Gitblit v1.7.1