From 206aa4bf5fd44e9b31d7284d6be8dc60b90a73ae Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期二, 22 二月 2022 18:12:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityApi.java | 34 +++++++++++++++-------------------
1 files changed, 15 insertions(+), 19 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityApi.java
index 9e3167e..85f1587 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityApi.java
@@ -4,7 +4,7 @@
import javax.annotation.Resource;
-import com.panzhihua.common.model.vos.community.MyActivityEvaluateVO;
+import com.panzhihua.common.model.vos.community.*;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
@@ -21,18 +21,6 @@
import com.panzhihua.common.model.dtos.community.PageVolunteerDTO;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
-import com.panzhihua.common.model.vos.community.ActivitySignInRecordVO;
-import com.panzhihua.common.model.vos.community.ActivitySignVO;
-import com.panzhihua.common.model.vos.community.ComActActEvaluateVO;
-import com.panzhihua.common.model.vos.community.ComActActRegistVO;
-import com.panzhihua.common.model.vos.community.ComActActivityVO;
-import com.panzhihua.common.model.vos.community.ComActDynVO;
-import com.panzhihua.common.model.vos.community.ComMngCarVO;
-import com.panzhihua.common.model.vos.community.ComMngStructAreaVO;
-import com.panzhihua.common.model.vos.community.ComMngVillageVO;
-import com.panzhihua.common.model.vos.community.ComMngVolunteerMngAppletsVO;
-import com.panzhihua.common.model.vos.community.ComMngVolunteerMngVO;
-import com.panzhihua.common.model.vos.community.SignactivityVO;
import com.panzhihua.common.model.vos.user.SysUserNoticeVO;
import com.panzhihua.common.service.community.CommunityService;
import com.panzhihua.common.service.partybuilding.PartyBuildingService;
@@ -85,6 +73,7 @@
}
comActDynVO.setIsTopping(null);
comActDynVO.setStatus(1);
+ comActDynVO.setAreaCode(this.getAreaCode());
return communityService.pageDynamic(comActDynVO);
}
@@ -123,6 +112,7 @@
comActActivityVO.setCommunityId(loginUserInfo.getCommunityId());
}
comActActivityVO.setIsApplets(1);
+ comActActivityVO.setAreaCode(this.getAreaCode());
Integer status = comActActivityVO.getStatus();
if (null != status && status.intValue() == 4) {
comActActivityVO.setIsIng(1);
@@ -238,13 +228,15 @@
@ApiOperation(value = "活动签到记录", response = ComActActRegistVO.class)
@ApiImplicitParams({
@ApiImplicitParam(name = "id", value = "活动主键", required = true),
- @ApiImplicitParam(name = "type", value = "活动类型，1.居民/志愿者活动 2.党员活动", required = true)
+ @ApiImplicitParam(name = "type", value = "活动类型，1.居民/志愿者活动 2.党员活动", required = true),
+ @ApiImplicitParam(name = "userId", value = "用户id", required = true)
})
@GetMapping("activity/regist/list")
public R listRegistRecord(@RequestParam("id") Long id,
- @RequestParam("type") Integer type) {
+ @RequestParam("type") Integer type,
+ @RequestParam("userId") Long userId) {
if (type.intValue() == 1) {
- return communityService.listRegistRecord(id, this.getUserId());
+ return communityService.listRegistRecord(id, userId);
}
return R.fail("type不存在");
}
@@ -276,10 +268,9 @@
LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
if (loginUserInfo != null) {
comMngVolunteerMngVO.setCommunityId(loginUserInfo.getCommunityId());
+ }else{
+ comMngVolunteerMngVO.setCommunityId(pageVolunteerDTO.getCommunityId());
}
- // Long communityId = this.getCommunityId();
-
- // comMngVolunteerMngVO.setCommunityId(communityId);
comMngVolunteerMngVO.setPageNum(pageVolunteerDTO.getPageNum());
comMngVolunteerMngVO.setPageSize(pageVolunteerDTO.getPageSize());
return communityService.pageVolunteer(comMngVolunteerMngVO);
@@ -319,4 +310,9 @@
required = true) @RequestParam(value = "provinceAdcode") Integer provinceAdcode) {
return communityService.getCityTreeByProvinceCode(provinceAdcode);
}
+ @ApiOperation(value = "社区详情", response = ComActVO.class)
+ @GetMapping("community")
+ public R detailCommunity() {
+ return communityService.detailCommunity(this.getCommunityId());
+ }
}
--
Gitblit v1.7.1