From 10df7e29b51d6a2efacc83d870856f57d97a9b66 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期一, 24 十月 2022 13:48:24 +0800
Subject: [PATCH] #feat 修改别名
---
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComBpActivityServiceImpl.java | 63 ++++++++++++++++++-------------
1 files changed, 36 insertions(+), 27 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComBpActivityServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComBpActivityServiceImpl.java
index f45814d..185499d 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComBpActivityServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComBpActivityServiceImpl.java
@@ -36,6 +36,8 @@
import lombok.extern.slf4j.Slf4j;
+import static java.util.Objects.nonNull;
+
/**
* @program: springcloud_k8s_panzhihuazhihuishequ
* @description: 党员活动
@@ -182,6 +184,7 @@
comBpActivityDAO.selectCommunityNameByCommunityId(partyBuildingActivityVO.getCommunityId()));
}
+ partyBuildingActivityVO.setCodeType(2);
return R.ok(partyBuildingActivityVO);
}
@@ -338,10 +341,11 @@
* 用户id
* @param communityId
* 社区id
+ * @param status
* @return 党建活动列表
*/
@Override
- public R listActivity(Long userId, Long communityId) {
+ public R listActivity(Long userId, Long communityId, Integer status) {
List<ComActActivityVO> comActActivityVOS = new ArrayList<>();
/*Long memberId=comPbActivityMemberDAO.selectMemberIdByUserId(userId,communityId);
if (ObjectUtils.isEmpty(memberId)) {
@@ -355,32 +359,37 @@
List<Long> collect = comPbActivityMemberDOS.stream()
.map(comPbActivityMemberDO -> comPbActivityMemberDO.getActivityId()).collect(Collectors.toList());
List<ComPbActivityDO> comPbActivityDOS = comBpActivityDAO.selectBatchIds(collect);
-
- comPbActivityDOS.forEach(comPbActivityDO -> {
- ComActActivityVO comActActivityVO = new ComActActivityVO();
- Long createBy = comPbActivityDO.getCreateBy();
- LoginUserInfoVO loginUserInfoVO = comPbActivityMemberDAO.selectUserInfo(createBy);
- Integer type = loginUserInfoVO.getType();
- if (type == 1) {
- comActActivityVO.setIsPerson(1);
- } else {
- comActActivityVO.setIsPerson(0);
- }
- Integer status = comPbActivityDO.getStatus();
- if (status.intValue() == 3) {
- status = 4;
- }
- comActActivityVO.setType(3);
- comActActivityVO.setId(comPbActivityDO.getId());
- comActActivityVO.setStatus(status);
- comActActivityVO.setActivityName(comPbActivityDO.getName());
- comActActivityVO.setCover(comPbActivityDO.getCover());
- comActActivityVO.setBeginAt(comPbActivityDO.getActivityTimeBegin());
- comActActivityVO.setSingDate(comPbActivityMemberDOS.stream()
- .filter(comPbActivityMemberDO -> comPbActivityMemberDO.getActivityId().equals(comActActivityVO.getId()))
- .collect(Collectors.toList()).get(0).getCreateAt());
- comActActivityVOS.add(comActActivityVO);
- });
+ if (nonNull(status)) {
+ comPbActivityDOS = comPbActivityDOS.stream()
+ .filter(activityDO -> activityDO.getStatus().equals(status)).collect(Collectors.toList());
+ }
+ if (!comPbActivityDOS.isEmpty()) {
+ comPbActivityDOS.forEach(comPbActivityDO -> {
+ ComActActivityVO comActActivityVO = new ComActActivityVO();
+ Long createBy = comPbActivityDO.getCreateBy();
+ LoginUserInfoVO loginUserInfoVO = comPbActivityMemberDAO.selectUserInfo(createBy);
+ Integer type = loginUserInfoVO.getType();
+ if (type == 1) {
+ comActActivityVO.setIsPerson(1);
+ } else {
+ comActActivityVO.setIsPerson(0);
+ }
+ Integer activityStatus = comPbActivityDO.getStatus();
+ if (activityStatus.intValue() == 3) {
+ activityStatus = 4;
+ }
+ comActActivityVO.setType(3);
+ comActActivityVO.setId(comPbActivityDO.getId());
+ comActActivityVO.setStatus(activityStatus);
+ comActActivityVO.setActivityName(comPbActivityDO.getName());
+ comActActivityVO.setCover(comPbActivityDO.getCover());
+ comActActivityVO.setBeginAt(comPbActivityDO.getActivityTimeBegin());
+ comActActivityVO.setSingDate(comPbActivityMemberDOS.stream()
+ .filter(comPbActivityMemberDO -> comPbActivityMemberDO.getActivityId().equals(comActActivityVO.getId()))
+ .collect(Collectors.toList()).get(0).getCreateAt());
+ comActActivityVOS.add(comActActivityVO);
+ });
+ }
return R.ok(comActActivityVOS);
}
--
Gitblit v1.7.1