From 7b3b0a682235669b95265424a2d15b1bc9e82b29 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期四, 10 三月 2022 09:50:05 +0800
Subject: [PATCH] 活动bug修改提交
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java | 34 ++++++++++++++++++++++++++++------
1 files changed, 28 insertions(+), 6 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..3d8188e 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,7 @@
import javax.annotation.Resource;
+import com.panzhihua.common.model.dtos.property.CommonPage;
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 +272,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);
});
@@ -1398,8 +1401,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 +2574,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