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 | 94 ++++++++++++++++++++++++++--------------------
1 files changed, 53 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 351ec42..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,8 @@
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;
import org.springframework.beans.BeanUtils;
@@ -35,6 +37,7 @@
import lombok.extern.slf4j.Slf4j;
import org.springframework.util.CollectionUtils;
+import org.springframework.web.bind.annotation.RequestParam;
/**
* @auther lyq
@@ -75,9 +78,11 @@
@Resource
private ComPbMemberDAO comPbMemberDAO;
@Resource
+ private ComActNeighborCircleDAO comActNeighborCircleDAO;
+ @Resource
private ComActActivityDAO comActActivityDAO;
- @Resource ComActNeighborCircleDAO comActNeighborCircleDAO;
-
+ @Resource
+ private ComPbCheckUnitDao comPbCheckUnitDao;
/**
* 分页查询邻里圈列表
*
@@ -236,6 +241,18 @@
circleDetailAppVO.setName(actDO.getName());
}
}
+ if(circleDetailAppVO.getOrderType()!=null){
+ if(circleDetailAppVO.getOrderType()==2){
+ AdministratorsUserVO user1 = this.baseMapper.selectUserByUserId(circleDetailAppVO.getSolveId());
+ circleDetailAppVO.setSolveName(SensitiveUtil.replaceName(user1.getName()));
+ }
+ if(circleDetailAppVO.getOrderType()==1){
+ ComPbCheckUnit comPbCheckUnit=comPbCheckUnitDao.selectById(circleDetailAppVO.getSolveUnitId());
+ if(comPbCheckUnit!=null){
+ circleDetailAppVO.setSolveName(comPbCheckUnit.getName());
+ }
+ }
+ }
if (neighborCircleAppDTO.getUserId() != null) {
// 查询邻里圈点赞信息
@@ -252,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(
@@ -463,6 +485,7 @@
ComActNeighborCircleCommentDO circleCommentDO =
comActNeighborCircleCommentDAO.selectById(fabulousAppDTO.getServiceId());
if (circleCommentDO != null) {
+
circleCommentDO.setFabulousNum(circleCommentDO.getFabulousNum() + 1);
comActNeighborCircleCommentDAO.updateById(circleCommentDO);
//计算需要增加的热度值
@@ -679,7 +702,7 @@
return R.fail();
}
if (comActNeighborCircleDO.getStatus() == 1) {
- return R.fail("待审核的邻里圈不能删除");
+ return R.fail("待审核的数据不能删除");
}
// 邻里圈删除
this.baseMapper.deleteById(id);
@@ -709,8 +732,22 @@
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());
+ vo.setSolveName(user1.getName());
+ }
+ if(comActNeighborCircleDO.getOrderType()==1){
+ ComPbCheckUnit comPbCheckUnit=comPbCheckUnitDao.selectById(comActNeighborCircleDO.getSolveUnitId());
+ if(comPbCheckUnit!=null){
+ vo.setSolveName(comPbCheckUnit.getName());
+ }
+ }
+ }
// 查询话题名称
if (comActNeighborCircleDO.getTopicId() != null) {
@@ -1003,7 +1040,7 @@
ComPbMemberDO comPbMemberDO=comPbMemberDAO.selectOne(new QueryWrapper<ComPbMemberDO>().lambda().eq(ComPbMemberDO::getPhone,serviceStaticDTO.getPhone()).last("limit 1"));
if(comPbMemberDO!=null){
serviceStaticsVO.setWorkActivityList(comActActivityDAO.selectListByRelationId(comPbMemberDO.getCheckUnitId(),serviceStaticDTO.getYear()));
- serviceStaticsVO.setServiceActivityList(comActActivityDAO.selectListByCommunityId(comPbMemberDO.getCommunityId(),serviceStaticDTO.getYear()));
+ serviceStaticsVO.setServiceActivityList(comActActivityDAO.selectListByCommunityId(comPbMemberDO.getCommunityId(),serviceStaticDTO.getYear(),serviceStaticDTO.getPhone()));
}
}
@@ -1092,6 +1129,7 @@
Integer memberServiceCount=0;
Integer memberServiceTotalTome=0;
for (UnitActivityAnalysisVO vo : unitActivityAnalysisVOS) {
+ //避免空指针
if (ObjectUtils.isNotEmpty(vo)){
if (ObjectUtils.isNotEmpty(vo.getServiceTime())){
unitServiceCount+=vo.getServiceTime();
@@ -1102,6 +1140,7 @@
}
}
for (PartyMemberAnalysisVO vo : partyMemberAnalysisVOS) {
+ //避免空指针
if (ObjectUtils.isNotEmpty(vo)){
if (ObjectUtils.isNotEmpty(vo.getServiceTime())){
memberServiceCount+=vo.getServiceTime();
@@ -1127,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<>();
@@ -1152,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);
}
@@ -1190,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