From d20cf2979502fd58c999d2dc7df12e554a31d3df Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期三, 24 七月 2024 11:07:54 +0800
Subject: [PATCH] 花城 排行范围选择本单位，呈现出了该账号单位以外的其它单位信息 党员活动的时长计算有问题。
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/NeighborApi.java | 11 +++++++----
1 files changed, 7 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 502b592..2245348 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
@@ -420,14 +420,17 @@
* @return
* */
@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,
+ 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,
@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,
- @RequestParam(value = "loginAccount",required = false) String loginAccount){
- return this.comActNeighborCircleService.institutionalUnitServiceAnalysis(year,type,range,communityId,page,size,belongTo,unitId);
+ @RequestParam(value = "loginAccount",required = false) String loginAccount,
+ @RequestParam(value = "searchContent",required = false) String searchContent){
+ return this.comActNeighborCircleService.institutionalUnitServiceAnalysis(year,type,range,communityId,page,size,belongTo,unitId,searchContent);
}
/**
--
Gitblit v1.7.1