From c0116d3fa128713d8466dbdf952fb61a64adc0b9 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期三, 29 十二月 2021 13:52:43 +0800
Subject: [PATCH] Merge branch 'master' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/PageBaseDTO.java | 2 +-
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/BigScreenStatisticsApi.java | 10 ++++++++--
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityActivityApi.java | 14 +++++++++++---
3 files changed, 20 insertions(+), 6 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/PageBaseDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/PageBaseDTO.java
index c6b2f22..880595e 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/PageBaseDTO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/PageBaseDTO.java
@@ -27,6 +27,6 @@
@ApiModelProperty(value = "字符串类型查询参数", example = "10")
private String param2;
- @ApiModelProperty(value = "社区id", hidden = true)
+ @ApiModelProperty(value = "社区id")
private Long communityId;
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/BigScreenStatisticsApi.java b/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/BigScreenStatisticsApi.java
index f6a942c..aa330c8 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/BigScreenStatisticsApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/BigScreenStatisticsApi.java
@@ -80,6 +80,8 @@
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
+import static java.util.Objects.isNull;
+
@Slf4j
@Api(tags = {"大屏统计数据模块"})
@RestController
@@ -503,7 +505,9 @@
@ApiOperation(value = "首页二级页面-居民活动展示列表", response = ComActActivityVO.class)
@PostMapping("/index/residentActList")
public R indexResidentActList(@RequestBody PageBaseDTO pageBaseDTO) {
- pageBaseDTO.setCommunityId(this.getCommunityId());
+ if (isNull(pageBaseDTO.getCommunityId())) {
+ pageBaseDTO.setCommunityId(this.getCommunityId());
+ }
return communityService.indexResidentActList(pageBaseDTO);
}
@@ -522,7 +526,9 @@
@ApiOperation(value = "首页二级页面-志愿者活动展示列表", response = ComActActivityVO.class)
@PostMapping("/index/volunteerActList")
public R indexVolunteerActList(@RequestBody PageBaseDTO pageBaseDTO) {
- pageBaseDTO.setCommunityId(this.getCommunityId());
+ if (isNull(pageBaseDTO.getCommunityId())) {
+ pageBaseDTO.setCommunityId(this.getCommunityId());
+ }
return communityService.indexVolunteerActList(pageBaseDTO);
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityActivityApi.java b/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityActivityApi.java
index f153be4..810f419 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityActivityApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityActivityApi.java
@@ -21,6 +21,7 @@
import javax.validation.Valid;
import com.panzhihua.common.model.vos.community.ComActActivityTypeVO;
+import io.swagger.annotations.ApiImplicitParams;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.util.ObjectUtils;
import org.springframework.validation.annotation.Validated;
@@ -1107,9 +1108,16 @@
}
@ApiOperation(value = "获取活动类型（目前只有志愿者活动需要获取）", response = ComActActivityTypeVO.class)
- @ApiImplicitParam(name = "type", value = "活动类型（1.志愿者 2.居民 3.党员）", required = true)
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "type", value = "活动类型（1.志愿者 2.居民 3.党员）", required = true),
+ @ApiImplicitParam(name = "communityId", value = "社区id", required = false)
+ })
@GetMapping("activity/type/list")
- public R listActivityType(@RequestParam("type") Integer type) {
- return communityService.listActivityType(getCommunityId(), type);
+ public R listActivityType(@RequestParam("type") Integer type,
+ @RequestParam(value = "communityId", required = false) Long communityId) {
+ if (isNull(communityId)) {
+ communityId = getCommunityId();
+ }
+ return communityService.listActivityType(communityId, type);
}
}
--
Gitblit v1.7.1