From 5d55062d003a17e197523f37d68d0e88ba727219 Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期四, 20 五月 2021 19:13:48 +0800
Subject: [PATCH] Merge branch 'test' into 'master'
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java | 46 ++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 42 insertions(+), 4 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
index 6c2080f..311afa1 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
@@ -16,11 +16,8 @@
import com.panzhihua.common.model.dtos.shop.PageComShopGoodsDTO;
import com.panzhihua.common.model.dtos.shop.PageComShopStoreDTO;
import com.panzhihua.common.model.dtos.user.PageInputUserDTO;
+import com.panzhihua.common.model.dtos.vaccines.*;
import com.panzhihua.common.model.vos.IPageVO;
-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.vos.R;
import com.panzhihua.common.model.vos.SystemmanagementConfigVO;
import com.panzhihua.common.model.vos.community.*;
@@ -196,6 +193,16 @@
*/
@PostMapping("detaileasyphoto")
R detailEasyPhoto(@RequestParam("id") Long id, @RequestParam("userId") Long userId);
+
+ /**
+ * 随手拍删除
+ *
+ * @param id 随手拍主键
+ * @param userId 登录用户id
+ * @return 详情内容
+ */
+ @PostMapping("deleteEasyPhoto")
+ R deleteEasyPhoto(@RequestParam("id") Long id, @RequestParam("userId") Long userId);
/**
* 分页查询微心愿
@@ -2610,4 +2617,35 @@
*/
@PostMapping("/vaccines/admin/enroll/delete")
R deleteVaccinesByAdmin(@RequestParam("id") Long id);
+
+ /**
+ * 根据条件导出登记列表
+ * @param vaccinesByAdminDTO 请求参数
+ * @return 登记列表
+ */
+ @PostMapping("/vaccines/admin/enroll/export")
+ R exportVaccinesEnrollListByAdmin(@RequestBody VaccinesEnrollByAdminDTO vaccinesByAdminDTO);
+
+ /**
+ * 查询接种记录列表
+ * @param inoculationByAdminDTO 请求参数
+ * @return 接种记录列表
+ */
+ @PostMapping("/vaccines/admin/inoculation/list")
+ R getVaccinesInoculationListByAdmin(@RequestBody VaccinesInoculationByAdminDTO inoculationByAdminDTO);
+
+ /**
+ * 接种记录信息导出
+ * @param inoculationByAdminDTO 请求参数
+ * @return 导出结果
+ */
+ @PostMapping("/vaccines/admin/inoculation/export")
+ R exportVaccinesInoculationListByAdmin(@RequestBody VaccinesInoculationByAdminDTO inoculationByAdminDTO);
+
+ /**
+ * 查询疫苗分类列表
+ * @return 疫苗分类列表
+ */
+ @PostMapping("/vaccines/admin/enroll/type/list")
+ R getEnrollTypeListByAdmin();
}
--
Gitblit v1.7.1