From c02e4e8ebd88f2d277935111ca16f2119adbac23 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期日, 24 七月 2022 10:20:57 +0800
Subject: [PATCH] bug修改
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleServiceImpl.java | 44 ++++++++++++++++++++++++++++++++++++++------
1 files changed, 38 insertions(+), 6 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 2245a9e..0277595 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.service_community.entity.ComPbCheckUnit;
import com.panzhihua.service_community.service.ComActNeighborCircleTopicService;
import org.apache.commons.lang3.ObjectUtils;
import org.springframework.beans.BeanUtils;
@@ -75,9 +76,11 @@
@Resource
private ComPbMemberDAO comPbMemberDAO;
@Resource
+ private ComActNeighborCircleDAO comActNeighborCircleDAO;
+ @Resource
private ComActActivityDAO comActActivityDAO;
- @Resource ComActNeighborCircleDAO comActNeighborCircleDAO;
-
+ @Resource
+ private ComPbCheckUnitDao comPbCheckUnitDao;
/**
* 分页查询邻里圈列表
*
@@ -234,6 +237,18 @@
ComActDO actDO = comActDAO.selectById(circleDetailAppVO.getCommunityId());
if (actDO != null) {
circleDetailAppVO.setName(actDO.getName());
+ }
+ }
+ if(circleDetailAppVO.getOrderType()!=null){
+ if(circleDetailAppVO.getOrderType()==2){
+ AdministratorsUserVO user1 = this.baseMapper.selectUserByUserId(circleDetailAppVO.getSolveId());
+ circleDetailAppVO.setSolveName(user1.getName());
+ }
+ if(circleDetailAppVO.getOrderType()==1){
+ ComPbCheckUnit comPbCheckUnit=comPbCheckUnitDao.selectById(circleDetailAppVO.getSolveUnitId());
+ if(comPbCheckUnit!=null){
+ circleDetailAppVO.setSolveName(comPbCheckUnit.getName());
+ }
}
}
@@ -463,6 +478,7 @@
ComActNeighborCircleCommentDO circleCommentDO =
comActNeighborCircleCommentDAO.selectById(fabulousAppDTO.getServiceId());
if (circleCommentDO != null) {
+
circleCommentDO.setFabulousNum(circleCommentDO.getFabulousNum() + 1);
comActNeighborCircleCommentDAO.updateById(circleCommentDO);
//计算需要增加的热度值
@@ -679,7 +695,7 @@
return R.fail();
}
if (comActNeighborCircleDO.getStatus() == 1) {
- return R.fail("待审核的邻里圈不能删除");
+ return R.fail("待审核的数据不能删除");
}
// 邻里圈删除
this.baseMapper.deleteById(id);
@@ -709,8 +725,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 +1033,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 +1122,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 +1133,7 @@
}
}
for (PartyMemberAnalysisVO vo : partyMemberAnalysisVOS) {
+ //避免空指针
if (ObjectUtils.isNotEmpty(vo)){
if (ObjectUtils.isNotEmpty(vo.getServiceTime())){
memberServiceCount+=vo.getServiceTime();
--
Gitblit v1.7.1