From 1abdcdf53061661efc51e24cfcf6877591dc1055 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期四, 18 十一月 2021 17:18:15 +0800
Subject: [PATCH] Merge branch 'master' into zhaozhengjie1104
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java | 66 ++++-----------------------------
1 files changed, 8 insertions(+), 58 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 92bc752..5f9bedd 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
@@ -4940,14 +4940,6 @@
R getWestCommunityLists();
/**
- * 综治app-小区列表
- * @param villageListAppDTO 请求参数
- * @return 小区列表
- */
- @PostMapping("/village/grid/list/app")
- R getGridVillageListApp(@RequestBody ComMngVillageListAppDTO villageListAppDTO);
-
- /**
* 分页查询退役军人列表
*
* @param comExServicemanDTO
@@ -7012,22 +7004,6 @@
R applyDonates(@RequestBody ComActWarehouseApplyDTO comActWarehouseApplyDTO);
/**
- * 生成二维码
- * @param qrCodeVO
- * @return
- */
- @PostMapping("/comActActivityCode/getQRCode")
- public R getQRCode(@RequestBody QRActivityCodeVO qrCodeVO);
-
- /**
- * 重置二维码
- * @param qrCodeVO
- * @return
- */
- @PostMapping("/comActActivityCode/resetQRCode")
- public R resetQRCode(@RequestBody QRActivityCodeVO qrCodeVO);
-
- /**
* 实有房屋数据修复定时任务
* @return 实有房屋数据修复定时任务
*/
@@ -7150,46 +7126,20 @@
*/
@PostMapping("/elders/pensionAuthRecord/add")
R addPensionAuthRecordVO(@RequestBody ComElderAuthRecordVO comElderAuthRecordVO);
- /**
- * 活动报名签到情况
- * @param id 活动主键id
- * @return
- */
- @GetMapping("/activity/sign-in/list")
- R listSignInRecord(@RequestParam("id") Long id);
/**
- * 活动签到记录
- * @param id 活动主键
- * @param userId 用户id
+ * 分页查询居家隔离统计
+ * @param detailedAdminDTO
* @return
*/
- @GetMapping("/activity/regist/list")
- R listRegistRecord(@RequestParam("id") Long id, @RequestParam("userId") Long userId);
+ @PostMapping("/reserve/admin/register/homeQuarantine/page")
+ R pageRegisterHomeQuarantine(PageReserveRegisterDetailedAdminDTO detailedAdminDTO);
/**
- * 获取活动类型（目前只有志愿者活动需要获取）
- * @param communityId
- * @param type
+ * 居家隔离导出
+ * @param pageReserveRegisterDetailedAdminDTO
* @return
*/
- @GetMapping("/activity/type/list")
- R listActivityType(@RequestParam("communityId") Long communityId, @RequestParam("type") Integer type);
-
- /**
- * 添加活动类型
- * @param comActActivityTypeVO
- * @return
- */
- @PostMapping("/activity/type/add")
- R addActivityType(@RequestBody ComActActivityTypeVO comActActivityTypeVO);
-
- /**
- * 我的评价
- * @param userId
- * @param activityId
- * @return
- */
- @GetMapping("/activity/my-evaluate")
- R listMyActivityEvaluate(@RequestParam("userId") Long userId, @RequestParam("activityId") Long activityId);
+ @PostMapping("/reserve/admin/homeQuarantine/export")
+ R exportHomeQuarantine(@RequestBody PageReserveRegisterDetailedAdminDTO pageReserveRegisterDetailedAdminDTO);
}
--
Gitblit v1.7.1