From faa40222f2e15b68a89d2180b57d444de5b67709 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期一, 31 五月 2021 13:18:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test_future_wangge' into test_future_wangge
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 52 insertions(+), 6 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 3f33df6..583c45e 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);
/**
* 分页查询微心愿
@@ -1182,7 +1189,7 @@
R deleteOpsHouse(@RequestParam("id") Long id);
/**
- * 一起议-分页查询
+ * 房屋租售-分页查询
*
* @param pageComOpsHouseDTO 查询参数
* @return ComOpsHouseVO
@@ -1352,7 +1359,7 @@
* @param list 便民服务集合
*/
@PostMapping("/convenient/serve/import")
- R listSaveConvenientServeExcelVO(@RequestBody List<ComCvtServeExcelVO> list, @RequestParam("communityId") Long communityId);
+ R listSaveConvenientServeExcelVO(@RequestBody List<ComCvtServeExcelVO> list, @RequestParam(value = "communityId",required = false) Long communityId);
/**
* 导出房屋信息
@@ -2602,4 +2609,43 @@
*/
@PostMapping("/vaccines/admin/enroll/list")
R getVaccinesEnrollListByAdmin(@RequestBody VaccinesEnrollByAdminDTO vaccinesByAdminDTO);
+
+ /**
+ * 删除疫苗分类信息
+ * @param id 疫苗分类id
+ * @return 删除结果
+ */
+ @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