From 893f8cffb39a6c728d231f0f63895388e9a21ae1 Mon Sep 17 00:00:00 2001
From: luoyuanqiao <2376770955@qq.com>
Date: 星期三, 02 三月 2022 17:09:02 +0800
Subject: [PATCH] Merge branch 'dev' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into partyBuilding_lyq
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java | 82 ++++++++++++++++++++++++++++-------------
1 files changed, 56 insertions(+), 26 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 13782bb..4941a19 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
@@ -4,16 +4,12 @@
import java.math.BigDecimal;
import java.math.RoundingMode;
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
+import java.util.*;
import javax.annotation.Resource;
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;
import com.panzhihua.service_community.dao.ComActActEvaluateDAO;
import com.panzhihua.service_community.model.dos.*;
@@ -22,14 +18,7 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.ObjectUtils;
import org.springframework.util.StringUtils;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
@@ -282,10 +271,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);
});
@@ -298,7 +289,7 @@
/**
* 社区后台分页查询社区活动
- *
+ *
* @param comActActivityVO
* 查询参数
* @return 返回结果
@@ -906,7 +897,7 @@
/**
* 查询随手拍是否有活动
- *
+ *
* @return 活动详情
*/
@PostMapping("getEasyPhotoActivity")
@@ -1197,7 +1188,7 @@
/**
* 查询所有建筑类型
- *
+ *
* @return 类型列表
*/
@PostMapping("listbuildtype")
@@ -1207,7 +1198,7 @@
/**
* 分页查询 其他建筑
- *
+ *
* @param comMngStructOtherBuildVO
* 分页查询参数
* @return 查询结果
@@ -1219,7 +1210,7 @@
/**
* 增加志愿者
- *
+ *
* @param comMngVolunteerMngVO
* 志愿者信息
* @return 增加结果
@@ -1231,7 +1222,7 @@
/**
* 获取志愿者详情
- *
+ *
* @param id
* @return
*/
@@ -1409,8 +1400,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);
}
/**
@@ -2543,4 +2534,43 @@
public R listMyActivityEvaluate(@RequestParam("userId") Long userId, @RequestParam("activityId") Long activityId) {
return comActActEvaluateService.listMyActivityEvaluate(userId, activityId);
}
+
+ /**
+ * 志愿者导入
+ *
+ * @param list 志愿者数据列表
+ * @param communityId 社区id
+ * @param userId 用户id
+ * @return 导入结果
+ */
+ @PostMapping("/volunteer/import/admin")
+ public R importVolunteerAdmin(@RequestBody List<ComMngVolunteerExcelVO> list,
+ @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId) {
+ return comMngVolunteerMngService.importVolunteerAdmin(list,communityId,userId);
+ }
+
+ /**
+ * [方法描述] 根据社区ID查询所属城市所在区区域代码，
+ *
+ * @param communityId
+ * 社区ID
+ * @return String 区域code
+ * @author manailin
+ * @date 2022/2/17 10:09
+ */
+ @GetMapping("act/getActBelongRegionCode")
+ public String getActBelongRegionCode(@RequestParam("communityId") Long communityId) {
+ return comActActivityService.getActBelongRegionCode(communityId);
+ }
+
+ /**
+ * 党员活动统计
+ * @param communityId
+ * @param year
+ * @return
+ */
+ @GetMapping("activity/partyMemberCount")
+ public R partyMemberCount(@RequestParam("communityId")Long communityId,@RequestParam("year")String year){
+ return comActActivityService.partyMemberCount(communityId,year);
+ }
}
--
Gitblit v1.7.1