From d541a7bf066fb9f629432959d89a7369ad58a35e Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期三, 03 八月 2022 14:12:58 +0800
Subject: [PATCH] bug修改
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleServiceImpl.java | 64 +++++++++++--------------------
1 files changed, 23 insertions(+), 41 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleServiceImpl.java
index a5c7828..191f273 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleServiceImpl.java
@@ -10,6 +10,7 @@
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.PageVO;
import com.panzhihua.common.service.user.UserService;
+import com.panzhihua.common.utlis.SensitiveUtil;
import com.panzhihua.service_community.entity.ComPbCheckUnit;
import com.panzhihua.service_community.service.ComActNeighborCircleTopicService;
import org.apache.commons.lang3.ObjectUtils;
@@ -36,6 +37,7 @@
import lombok.extern.slf4j.Slf4j;
import org.springframework.util.CollectionUtils;
+import org.springframework.web.bind.annotation.RequestParam;
/**
* @auther lyq
@@ -242,7 +244,7 @@
if(circleDetailAppVO.getOrderType()!=null){
if(circleDetailAppVO.getOrderType()==2){
AdministratorsUserVO user1 = this.baseMapper.selectUserByUserId(circleDetailAppVO.getSolveId());
- circleDetailAppVO.setSolveName(user1.getName());
+ circleDetailAppVO.setSolveName(SensitiveUtil.replaceName(user1.getName()));
}
if(circleDetailAppVO.getOrderType()==1){
ComPbCheckUnit comPbCheckUnit=comPbCheckUnitDao.selectById(circleDetailAppVO.getSolveUnitId());
@@ -267,7 +269,12 @@
circleDetailAppVO.setHaveSign(2);
}
}
-
+ ComActActivityDO comActActivityDO=comActActivityDAO.selectOne(new QueryWrapper<ComActActivityDO>().lambda().eq(ComActActivityDO::getRelationId,neighborCircleAppDTO.getCircleId()));
+ if(comActActivityDO!=null){
+ circleDetailAppVO.setActivityDate(comActActivityDO.getCreateAt());
+ circleDetailAppVO.setActivityId(comActActivityDO.getId());
+ circleDetailAppVO.setActivityName(comActActivityDO.getActivityName());
+ }
// 查询邻里圈下评论列表
IPage<ComActNeighborCircleCommentAppVO> circleCommentAppPage =
comActNeighborCircleCommentDAO.pageNeighborCommentByApp(
@@ -478,6 +485,7 @@
ComActNeighborCircleCommentDO circleCommentDO =
comActNeighborCircleCommentDAO.selectById(fabulousAppDTO.getServiceId());
if (circleCommentDO != null) {
+
circleCommentDO.setFabulousNum(circleCommentDO.getFabulousNum() + 1);
comActNeighborCircleCommentDAO.updateById(circleCommentDO);
//计算需要增加的热度值
@@ -724,8 +732,10 @@
AdministratorsUserVO user = this.baseMapper.selectUserByUserId(comActNeighborCircleDO.getReleaseId());
DetailNeighborCircleAdminVO vo = new DetailNeighborCircleAdminVO();
BeanUtils.copyProperties(comActNeighborCircleDO, vo);
- vo.setReleaseName(user.getName());
- vo.setImageUrl(user.getImageUrl());
+ if(user!=null){
+ vo.setReleaseName(user.getName());
+ vo.setImageUrl(user.getImageUrl());
+ }
if(comActNeighborCircleDO.getOrderType()!=null){
if(comActNeighborCircleDO.getOrderType()==2){
AdministratorsUserVO user1 = this.baseMapper.selectUserByUserId(comActNeighborCircleDO.getSolveId());
@@ -1051,9 +1061,9 @@
activityVO.setPartyMemberCount(comActDAO.selectUnitCount());
activityVO.setUnitCount(comActDAO.selectMemberCount());
//获取单位活动统计数据（邻里圈）
- List<UnitActivityAnalysisVO> unitActivityAnalysisVOS = comActNeighborCircleDAO.institutionalUnitServiceAnalysis(beginTime, endTime, belongTo);
+ List<UnitActivityAnalysisVO> unitActivityAnalysisVOS = comActNeighborCircleDAO.institutionalUnitServiceAnalysis(beginTime, endTime, belongTo,communityId);
//获取单位活动统计数据（活动）
- List<UnitActivityAnalysisVO> unitActivityAnalysisVOS1 = comActNeighborCircleDAO.institutionalUnitActivityAnalysis(beginTime, endTime, belongTo);
+ List<UnitActivityAnalysisVO> unitActivityAnalysisVOS1 = comActNeighborCircleDAO.institutionalUnitActivityAnalysis(beginTime, endTime, belongTo,communityId);
if (unitActivityAnalysisVOS.size()>0){
for (UnitActivityAnalysisVO unitActivityAnalysisVO : unitActivityAnalysisVOS){
if (ObjectUtils.isNotEmpty(unitActivityAnalysisVO)){
@@ -1113,7 +1123,6 @@
}
}
}
-
//统计总时长和总次数
Integer unitServiceCount=0;
Integer unitServiceTotalTime=0;
@@ -1157,12 +1166,6 @@
// ListUtil.sortByProperty(partyMemberAnalysisVOS, "serviceTimes");
// }
// }
- //统一进行排序，避免统计之后顺序混乱
- ListUtil.sortByProperty(unitActivityAnalysisVOS, "serviceTime");
- partyMemberAnalysisVOS = ListUtil.sortByProperty(partyMemberAnalysisVOS, "serviceTime");
- //执行倒序
- Collections.reverse(unitActivityAnalysisVOS);
- Collections.reverse(partyMemberAnalysisVOS);
//处理分页
PageVO<List<UnitActivityAnalysisVO>> unitPage=new PageVO<>();
PageVO<List<PartyMemberAnalysisVO>> memberPage=new PageVO<>();
@@ -1182,34 +1185,8 @@
unitPage.setRecords(unitActivityAnalysisVOS);
memberPage.setRecords(partyMemberAnalysisVOS);
}
- activityVO.setUnitListByTime(unitPage);
- activityVO.setPartyMemberListByTime(memberPage);
- List<UnitActivityAnalysisVO> unitActivityAnalysisVOTimes=unitActivityAnalysisVOS;
- List<PartyMemberAnalysisVO> partyMemberAnalysisVOTimes=partyMemberAnalysisVOS;
- ListUtil.sortByProperty(unitActivityAnalysisVOTimes, "serviceTimes");
- ListUtil.sortByProperty(partyMemberAnalysisVOTimes, "serviceTimes");
- Collections.reverse(unitActivityAnalysisVOTimes);
- Collections.reverse(partyMemberAnalysisVOTimes);
- PageVO<List<UnitActivityAnalysisVO>> unitPage1=new PageVO<>();
- PageVO<List<PartyMemberAnalysisVO>> memberPage1=new PageVO<>();
- if (ObjectUtils.isNotEmpty(page) && ObjectUtils.isNotEmpty(size)){
- //分页处理
- unitPage1.setRecordsCount(unitActivityAnalysisVOS.size());
- unitPage1.setPage(page);
- unitPage1.setPages(getPages(unitPage.getRecordsCount(),size ));
- memberPage1.setPage(page);
- memberPage1.setRecordsCount(partyMemberAnalysisVOS.size());
- memberPage1.setPages(getPages(memberPage.getRecordsCount(), size));
- //处理分页的结果
- unitPage1.setRecords(subUnitList((ArrayList) unitActivityAnalysisVOTimes, page,size));
- memberPage1.setRecords(subUnitList((ArrayList)partyMemberAnalysisVOTimes,page ,size));
-
- }else {
- unitPage1.setRecords(unitActivityAnalysisVOS);
- memberPage1.setRecords(partyMemberAnalysisVOS);
- }
- activityVO.setPartyMemberByTimes(memberPage1);
- activityVO.setUnitListByTimes(unitPage1);
+ activityVO.setUnitList(unitPage);
+ activityVO.setPartyMemberList(memberPage);
return R.ok(activityVO);
}
@@ -1220,6 +1197,11 @@
return null;
}
+ @Override
+ public R selectCount(Integer type, String phone,Long communityId) {
+ return R.ok(this.baseMapper.selectCount(type,phone,communityId));
+ }
+
/**
* 判断活动统计列表中是否已有该单位的数据
* */
--
Gitblit v1.7.1