From 8518a82f4918629d5f27bff9ac0e404c32b80cf7 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期一, 24 十月 2022 13:41:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/VaccinesApi.java | 111 +++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 86 insertions(+), 25 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..c46cf31 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,17 +1,16 @@
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 javax.annotation.Resource;
+
+import org.springframework.web.bind.annotation.*;
+
+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;
import com.panzhihua.service_community.service.ComMngVaccinesService;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.bind.annotation.*;
-import javax.annotation.Resource;
+import lombok.extern.slf4j.Slf4j;
@Slf4j
@RestController
@@ -27,7 +26,8 @@
/**
* 小程序-查询疫苗分类列表
- * @return 疫苗分类列表
+ *
+ * @return 疫苗分类列表
*/
@PostMapping("/app/list")
public R getVaccinesListByApp() {
@@ -36,7 +36,8 @@
/**
* 小程序-疫苗类型对应家庭成员接种列表
- * @return 疫苗类型对应家庭成员接种列表
+ *
+ * @return 疫苗类型对应家庭成员接种列表
*/
@PostMapping("/app/user/list")
public R getVaccinesUserListByApp(@RequestBody VaccinesEnrollUserByAppDTO enrollUserByAppDTO) {
@@ -45,18 +46,22 @@
/**
* 用户疫苗报名
- * @param enrollByAppDTO 请求参数
- * @return 报名结果
+ *
+ * @param enrollByAppDTO
+ * 请求参数
+ * @return 报名结果
*/
@PostMapping("/app/enroll")
- public R VaccinesEnrollByApp(@RequestBody VaccinesEnrollByAppDTO enrollByAppDTO){
+ public R VaccinesEnrollByApp(@RequestBody VaccinesEnrollByAppDTO enrollByAppDTO) {
return comMngVaccinesEnrollRecordService.VaccinesEnrollByApp(enrollByAppDTO);
}
/**
* 小程序-查询用户家庭成员接种记录
- * @param userId 用户id
- * @return 用户家庭成员接种记录
+ *
+ * @param userId
+ * 用户id
+ * @return 用户家庭成员接种记录
*/
@PostMapping("/app/user/inoculation/list")
public R getVaccinesUserInoculationListByApp(@RequestParam("userId") Long userId) {
@@ -65,8 +70,10 @@
/**
* 后台管理-查询疫苗分类列表
- * @param vaccinesByAdminDTO 请求参数
- * @return 疫苗分类列表
+ *
+ * @param vaccinesByAdminDTO
+ * 请求参数
+ * @return 疫苗分类列表
*/
@PostMapping("/admin/list")
public R getVaccinesListByAdmin(@RequestBody VaccinesByAdminDTO vaccinesByAdminDTO) {
@@ -75,8 +82,10 @@
/**
* 修改疫苗分类信息
- * @param vaccinesByAdminDTO 请求参数
- * @return 修改结果
+ *
+ * @param vaccinesByAdminDTO
+ * 请求参数
+ * @return 修改结果
*/
@PostMapping("/admin/edit")
public R editVaccinesByAdmin(@RequestBody VaccinesByAdminDTO vaccinesByAdminDTO) {
@@ -85,8 +94,10 @@
/**
* 新增疫苗分类信息
- * @param vaccinesByAdminDTO 请求参数
- * @return 新增结果
+ *
+ * @param vaccinesByAdminDTO
+ * 请求参数
+ * @return 新增结果
*/
@PostMapping("/admin/add")
public R addVaccinesByAdmin(@RequestBody VaccinesByAdminDTO vaccinesByAdminDTO) {
@@ -95,21 +106,71 @@
/**
* 查询疫苗登记列表
- * @param vaccinesByAdminDTO 请求参数
- * @return 登记列表
+ *
+ * @param vaccinesByAdminDTO
+ * 请求参数
+ * @return 登记列表
*/
- @PostMapping("admin/enroll/list")
+ @PostMapping("/admin/enroll/list")
public R getVaccinesEnrollListByAdmin(@RequestBody VaccinesEnrollByAdminDTO vaccinesByAdminDTO) {
return comMngVaccinesEnrollRecordService.getVaccinesEnrollListByAdmin(vaccinesByAdminDTO);
}
/**
* 删除疫苗分类信息
- * @param id 疫苗分类id
- * @return 删除结果
+ *
+ * @param id
+ * 疫苗分类id
+ * @return 删除结果
*/
@PostMapping("/admin/enroll/delete")
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);
+ }
+
+ /**
+ * 疫苗分类列表
+ *
+ * @return 疫苗分类列表
+ */
+ @PostMapping("/admin/enroll/type/list")
+ public R getEnrollTypeListByAdmin() {
+ return comMngVaccinesService.getEnrollTypeListByAdmin();
+ }
}
--
Gitblit v1.7.1