From f4a5a5750df30cad778ec7a4534f55d88f640ebd Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期五, 29 四月 2022 17:12:43 +0800
Subject: [PATCH] 花城E+防疫修改
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java | 48 ++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 40 insertions(+), 8 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java
index 7a97923..f6e1f27 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java
@@ -8,6 +8,8 @@
import javax.annotation.Resource;
+import com.panzhihua.common.model.dtos.property.CommonPage;
+import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.community.ComActActivityTypeVO;
import com.panzhihua.common.model.vos.community.volunteer.ComMngVolunteerExcelVO;
import com.panzhihua.common.model.vos.user.SysTemplateConfigVO;
@@ -271,10 +273,12 @@
}
comActActivityVO1.setComActActPrizeVOList(comActActPrizeVOList);
Integer volunteerMax = comActActivityVO1.getVolunteerMax();
- if (volunteerMax.intValue() != 0) {
- comActActivityVO1.setType(1);
- } else {
- comActActivityVO1.setType(2);
+ if(comActActivityVO1.getType()==null){
+ if (volunteerMax.intValue() != 0) {
+ comActActivityVO1.setType(1);
+ } else {
+ comActActivityVO1.setType(2);
+ }
}
fillActivitySignList(id, comActActivityVO1);
});
@@ -1190,8 +1194,8 @@
* @return 类型列表
*/
@PostMapping("listbuildtype")
- public R listBuildType() {
- return comMngStructOtherBuildService.listBuildType();
+ public R listBuildType(@RequestParam("communityId")Long communityId) {
+ return comMngStructOtherBuildService.listBuildType(communityId);
}
/**
@@ -1215,6 +1219,15 @@
*/
@PostMapping("addvolunteer")
R addVolunteer(@RequestBody ComMngVolunteerMngVO comMngVolunteerMngVO) {
+ Long submitUserId = comMngVolunteerMngVO.getSubmitUserId();
+ if (Objects.nonNull(submitUserId)) {
+ //获取小程序用户信息
+ R<LoginUserInfoVO> userInfoR = userService.getUserInfoByUserId(submitUserId.toString());
+ LoginUserInfoVO userInfo = userInfoR.getData();
+ if (Objects.nonNull(userInfo)) {
+ comMngVolunteerMngVO.setIdCard(userInfo.getIdCard());
+ }
+ }
return comMngVolunteerMngService.addVolunteer(comMngVolunteerMngVO);
}
@@ -1398,8 +1411,8 @@
*/
@PostMapping("listactivity")
public R listActivity(@RequestParam("userId") Long userId,
- @RequestParam(value = "status", required = false) Integer status) {
- return comActActivityService.listActivity(userId, status);
+ @RequestParam(value = "status", required = false) Integer status,@RequestParam(value = "type", required = false) Integer type) {
+ return comActActivityService.listActivity(userId, status,type);
}
/**
@@ -2571,4 +2584,23 @@
public R partyMemberCount(@RequestParam("communityId")Long communityId,@RequestParam("year")String year){
return comActActivityService.partyMemberCount(communityId,year);
}
+
+ /**
+ * 党员活动详情数据
+ * @return
+ */
+ @PostMapping("activity/partyMemberDetail")
+ public R partyMemberDetail(@RequestBody CommonPage commonPage){
+ return comActActivityService.partyMemberDetail(commonPage);
+ }
+
+
+ /**
+ * 导出党员活动详情数据
+ * @return
+ */
+ @PostMapping("activity/exportPartyMemberDetail")
+ public R exportPartyMemberDetail(@RequestBody CommonPage commonPage){
+ return comActActivityService.exportPartyMemberDetail(commonPage);
+ }
}
--
Gitblit v1.7.1