From 4b50ee7687be0c63bb5639156e4a3f6a15aaf37a Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期二, 07 九月 2021 14:52:06 +0800
Subject: [PATCH] Merge branch 'test' into 'test_bak'
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java | 28 ++++++++++++++++++++++++++--
1 files changed, 26 insertions(+), 2 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 560c94e..0109df8 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
@@ -4531,7 +4531,7 @@
* @return 邻里圈话题列表
*/
@GetMapping("/neighbor/getNeighborTopicByApp")
- R getNeighborTopicByApp(@RequestParam("communityId") Long communityId,@RequestParam("isZero") Integer isZero);
+ R getNeighborTopicByApp(@RequestParam("communityId") Long communityId,@RequestParam("isZero") Integer isZero,@RequestParam("name") String name);
/**
* 综治后台-查询社区列表
@@ -5350,7 +5350,7 @@
* @param circleTopicAppDTO 请求参数
* @return 删除结果
*/
- @PostMapping("/neighbor/circleTopicAppDTO")
+ @PostMapping("/neighbor/deleteNeighborByApp")
R deleteNeighborByApp(@RequestBody DeleteNeighborCircleAppDTO circleTopicAppDTO);
/**
@@ -5395,4 +5395,28 @@
*/
@PostMapping("/elders/auth/record/task")
R timedTaskEldersAuthRecordJobHandler();
+
+ /**
+ * 办事指南列表-按分类查询
+ * @param pageActWorkGuideDTO 请求参数
+ * @return 办事指南分类列表
+ */
+ @PostMapping("/listworkguide")
+ R listWorkGuide(@RequestBody PageActWorkGuideDTO pageActWorkGuideDTO);
+
+ /**
+ * 根据办事指南分类id查询办事指南列表
+ * @param classifyId 办事指南分类id
+ * @return 办事指南列表数据
+ */
+ @GetMapping("/listworkguide/classify")
+ R listWorkGuideByClassifyId(@RequestParam("classifyId") Long classifyId);
+
+ /**
+ * 小程序查询所有进行中的预约登记
+ * @param communityId 社区id
+ * @return 社区所有进行中的预约登记列表
+ */
+ @GetMapping("/reserve/list")
+ R reserveListApplets(@RequestParam("communityId") Long communityId);
}
--
Gitblit v1.7.1