From da8edafa9803834b08061fd30ac79f8c249900b8 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期五, 22 七月 2022 16:39:37 +0800
Subject: [PATCH] Merge branch 'huacheng_test' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/NeighborApi.java | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/NeighborApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/NeighborApi.java
index 93c0de7..c785ac3 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/NeighborApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/NeighborApi.java
@@ -353,8 +353,8 @@
* @return 邻里圈话题列表
*/
@GetMapping("getNeighborTopicByApp")
- public R getNeighborTopicByApp(@RequestParam("name") String name) {
- return comActNeighborCircleTopicService.getNeighborTopicByApp(name);
+ public R getNeighborTopicByApp(@RequestParam("name") String name, @RequestParam("belongType") Integer belongType) {
+ return comActNeighborCircleTopicService.getNeighborTopicByApp(name, belongType);
}
/**
@@ -393,8 +393,12 @@
* */
@GetMapping("/activityAnalysis")
public R institutionalUnitServiceAnalysis(@RequestParam(value = "year",required = false) Integer year,@RequestParam(value = "type",required = false) Integer type,
- @RequestParam(value = "range",required = false)Integer range,@RequestParam(value = "communityId",required = false) Long communityId){
- return this.comActNeighborCircleService.institutionalUnitServiceAnalysis(year,type,range,communityId);
+ @RequestParam(value = "range",required = false)Integer range,@RequestParam(value = "communityId",required = false) Long communityId,
+ @RequestParam(value = "page",required = false) Integer page,
+ @RequestParam(value = "belongTo",required = false) String belongTo,
+ @RequestParam(value = "size",required = false) Integer size,
+ @RequestParam(value = "unitId",required = false) Long unitId ){
+ return this.comActNeighborCircleService.institutionalUnitServiceAnalysis(year,type,range,communityId,page,size,belongTo,unitId);
}
/**
--
Gitblit v1.7.1