From cc595b0aa24773735417accd0158da6ac98a6db0 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期四, 30 六月 2022 14:47:56 +0800
Subject: [PATCH] Merge branch 'huacheng' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleServiceImpl.java | 161 +++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 136 insertions(+), 25 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 6aace56..c971e23 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
@@ -1,12 +1,16 @@
package com.panzhihua.service_community.service.impl;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
import javax.annotation.Resource;
+import cn.hutool.core.collection.ListUtil;
+import cn.hutool.core.date.DateUtil;
+import com.panzhihua.common.model.vos.LoginUserInfoVO;
+import com.panzhihua.common.model.vos.common.ComPbCheckUnitVo;
+import com.panzhihua.common.service.user.UserService;
import com.panzhihua.service_community.service.ComActNeighborCircleTopicService;
+import org.apache.commons.lang3.ObjectUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -64,7 +68,14 @@
private ComActNeighborCircleTopicMapper comActNeighborCircleTopicMapper;
@Resource
private ComActNeighborCircleTopicService comActNeighborCircleTopicService;
-
+ @Resource
+ private UserService userService;
+ @Resource
+ private ComPbMemberDAO comPbMemberDAO;
+ @Resource
+ private ComActNeighborCircleDAO comActNeighborCircleDAO;
+ @Resource
+ private ComActActivityDAO comActActivityDAO;
/**
* 分页查询邻里圈列表
*
@@ -74,6 +85,18 @@
*/
@Override
public R pageNeighborByApp(ComActNeighborCircleAppDTO neighborCircleAppDTO) {
+// if(neighborCircleAppDTO.getCommunityId()==0L){
+// R<LoginUserInfoVO> loginUserInfoVOR=userService.getUserInfoByUserId(neighborCircleAppDTO.getUserId().toString());
+// if(R.isOk(loginUserInfoVOR)){
+// LoginUserInfoVO loginUserInfoVO=loginUserInfoVOR.getData();
+// if(loginUserInfoVO!=null){
+// ComPbMemberDO comPbMemberDO=comPbMemberDAO.selectOne(new QueryWrapper<ComPbMemberDO>().lambda().eq(ComPbMemberDO::getIdCard,loginUserInfoVO.getIdCard()));
+// if(comPbMemberDO!=null){
+// neighborCircleAppDTO.setCommunityId(comPbMemberDO.getCommunityId());
+// }
+// }
+// }
+// }
Page userPage = new Page(neighborCircleAppDTO.getPageNum(), neighborCircleAppDTO.getPageSize());
IPage<ComActNeighborCircleAppVO> doPager = this.baseMapper.pageNeighborByApp(userPage, neighborCircleAppDTO);
if (!doPager.getRecords().isEmpty()) {
@@ -106,6 +129,43 @@
return R.ok(doPager);
}
+ @Override
+ public R selectSolve(ComActNeighborCircleAppDTO neighborCircleAppDTO) {
+ IPage<ComActNeighborCircleAppVO> doPager=this.baseMapper.selectSolve(new Page<ComActNeighborCircleDO>(neighborCircleAppDTO.getPageNum(),neighborCircleAppDTO.getPageSize()),neighborCircleAppDTO);
+ if (!doPager.getRecords().isEmpty()) {
+ for (ComActNeighborCircleAppVO circleAppVO : doPager.getRecords()) {
+ if (neighborCircleAppDTO.getSolveId() != null) {
+ // 查询点赞信息
+ ComActNeighborCircleFabulousDO circleFabulousDO =
+ comActNeighborCircleFabulousDAO.selectOne(new QueryWrapper<ComActNeighborCircleFabulousDO>()
+ .lambda().eq(ComActNeighborCircleFabulousDO::getParentId, circleAppVO.getId())
+ .eq(ComActNeighborCircleFabulousDO::getUserId, neighborCircleAppDTO.getUserId())
+ .eq(ComActNeighborCircleFabulousDO::getType, ComActNeighborCircleFabulousDO.type.llq)
+ .eq(ComActNeighborCircleFabulousDO::getIsEffective,
+ ComActNeighborCircleFabulousDO.isEffective.yes));
+ if (circleFabulousDO != null) {
+ circleAppVO.setHaveSign(1);
+ } else {
+ circleAppVO.setHaveSign(2);
+ }
+ }
+ ComActDO actDO = comActDAO.selectById(circleAppVO.getCommunityId());
+ if (circleAppVO.getType() != null && circleAppVO.getType().equals(ComActNeighborCircleDO.type.admin)) {
+ if (actDO != null) {
+ circleAppVO.setName(actDO.getName());
+ }
+ }
+ else {
+ if (actDO != null) {
+ circleAppVO.setCommunityName(actDO.getName());
+ }
+ }
+
+ }
+ }
+ return R.ok(doPager);
+ }
+
/**
* 用户发布邻里圈审核
*
@@ -126,25 +186,6 @@
}
if (StringUtils.isNotEmpty(addNeighborCircleAppDTO.getPhone())) {
neighborCircleDO.setReleasePhone(addNeighborCircleAppDTO.getPhone());
- }
- //判断用户的话题是否是新增的
- if(StringUtils.isNotEmpty(addNeighborCircleAppDTO.getTopicName())){
- //新增邻里圈话题
- ComActNeighborCircleTopicDO circleTopicDO = comActNeighborCircleTopicMapper.selectOne(new QueryWrapper<ComActNeighborCircleTopicDO>()
- .lambda().eq(ComActNeighborCircleTopicDO::getCommunityId,neighborCircleDO.getCommunityId())
- .eq(ComActNeighborCircleTopicDO::getName,addNeighborCircleAppDTO.getTopicName()));
- if(circleTopicDO == null){
- circleTopicDO = new ComActNeighborCircleTopicDO();
- circleTopicDO.setCommunityId(neighborCircleDO.getCommunityId());
- circleTopicDO.setName(addNeighborCircleAppDTO.getTopicName());
- circleTopicDO.setCreateBy(neighborCircleDO.getReleaseId());
- circleTopicDO.setCreateAt(new Date());
- circleTopicDO.setCount(0);
- circleTopicDO.setHotNum(0L);
- circleTopicDO.setStatus(ComActNeighborCircleTopicDO.status.yes);
- comActNeighborCircleTopicMapper.insert(circleTopicDO);
- }
- neighborCircleDO.setTopicId(circleTopicDO.getId());
}
//判断当前邻里圈是否需要审核
if(addNeighborCircleAppDTO.getIsExamine().equals(AddComActNeighborCircleAppDTO.isExamine.no)){
@@ -307,6 +348,7 @@
comActNeighborCircleDO.setLastCommentNum(0);
comActNeighborCircleDO.setLastFabulousNum(0);
comActNeighborCircleDO.setLastViewsNum(0);
+ comActNeighborCircleDO.setBelongType(addVO.getBelongType());
this.baseMapper.insert(comActNeighborCircleDO);
return R.ok();
}
@@ -341,7 +383,7 @@
public R neighborExamineByApp(ComActNeighborCircleAppDTO neighborCircleAppDTO) {
IPage<ComActNeighborCircleAppVO> neighborCircleIPage = this.baseMapper.neighborExamineByApp(
new Page<>(neighborCircleAppDTO.getPageNum(), neighborCircleAppDTO.getPageSize()),
- neighborCircleAppDTO.getUserId());
+ neighborCircleAppDTO.getUserId(),neighborCircleAppDTO.getBelongType());
if (!neighborCircleIPage.getRecords().isEmpty()) {
for (ComActNeighborCircleAppVO circleAppVO : neighborCircleIPage.getRecords()) {
// 查询点赞信息
@@ -657,7 +699,8 @@
@Override
public R detailNeighborByAdmin(Long id) {
- ComActNeighborCircleDO comActNeighborCircleDO = this.baseMapper.selectById(id);
+ ComActNeighborCircleDetailAppVO comActNeighborCircleDO =
+ this.baseMapper.neighborDetailByApp(id);
if (comActNeighborCircleDO == null) {
return R.fail("id有误");
}
@@ -665,6 +708,7 @@
DetailNeighborCircleAdminVO vo = new DetailNeighborCircleAdminVO();
BeanUtils.copyProperties(comActNeighborCircleDO, vo);
vo.setReleaseName(user.getName());
+ vo.setImageUrl(user.getImageUrl());
// 查询话题名称
if (comActNeighborCircleDO.getTopicId() != null) {
@@ -925,4 +969,71 @@
}
return R.fail();
}
+
+ @Override
+ public R orderAndSolve(EditNeighborCircleAdminVO editNeighborCircleAdminVO) {
+ ComActNeighborCircleDO comActNeighborCircleDO=new ComActNeighborCircleDO();
+ BeanUtils.copyProperties(editNeighborCircleAdminVO,comActNeighborCircleDO);
+ if(comActNeighborCircleDO.getSolveStatus()!=null){
+ comActNeighborCircleDO.setSolveTime(new Date());
+ }
+ if(comActNeighborCircleDO.getOrderStatus()!=null){
+ comActNeighborCircleDO.setOrderTime(new Date());
+ }
+ if(StringUtils.isNotEmpty(comActNeighborCircleDO.getComment())){
+ comActNeighborCircleDO.setCommentTime(new Date());
+ }
+ return R.ok(this.baseMapper.updateById(comActNeighborCircleDO));
+ }
+
+ @Override
+ public R serviceStatic(ServiceStaticDTO serviceStaticDTO) {
+ ServiceStaticsVO serviceStaticsVO=new ServiceStaticsVO();
+ if(serviceStaticDTO.getCheckUnitId()!=null){
+ serviceStaticsVO=this.baseMapper.selectStatsCheckUnit(serviceStaticDTO.getCheckUnitId(),serviceStaticDTO.getYear());
+ serviceStaticsVO.setServiceProjecList(this.baseMapper.selectListByCheckUnitId(serviceStaticDTO.getCheckUnitId(),serviceStaticDTO.getYear()));
+ serviceStaticsVO.setServiceActivityList(comActActivityDAO.selectListByRelationId(serviceStaticDTO.getCheckUnitId(),serviceStaticDTO.getYear()));
+ }
+ else {
+ serviceStaticsVO=this.baseMapper.selectStatsUser(serviceStaticDTO.getPhone(),serviceStaticDTO.getYear());
+ serviceStaticsVO.setServiceProjecList(this.baseMapper.selectListByPhone(serviceStaticDTO.getPhone(),serviceStaticDTO.getYear()));
+ 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()));
+ }
+
+ }
+ return R.ok(serviceStaticsVO);
+ }
+
+ @Override
+ public R institutionalUnitServiceAnalysis(Integer year,Long communityId) {
+ //根据年份获取一年的开始和结束时间
+ String beginTime=null;
+ String endTime=null;
+ if (null != year && 0 !=year){
+ beginTime= year.toString()+"-01-01" ;
+ endTime=year.toString()+"-12-31";
+ }
+ //根据communityId分组获取活动时长，活动次数
+ List<ComActNeighborCircleAnalysisVO> comActNeighborCircleAnalysisVOS = comActNeighborCircleDAO.institutionalUnitServiceAnalysis(beginTime,endTime,communityId);
+ //填充单位，社区信息
+ if (comActNeighborCircleAnalysisVOS.size()>0){
+ for (ComActNeighborCircleAnalysisVO vo : comActNeighborCircleAnalysisVOS) {
+ if (ObjectUtils.isNotEmpty(vo)){
+ if (ObjectUtils.isNotEmpty(vo.getCommunityId())){
+ vo.setCommunityName(comActDAO.selectById(vo.getCommunityId()).getName());
+ }
+ if (ObjectUtils.isNotEmpty(vo.getUnitId())){
+ vo.setUnitName(comActDAO.getUnitName(vo.getUnitId()));
+ }
+ }
+ }
+ }
+ ActivityAnalysisVO activityAnalysisVO=new ActivityAnalysisVO();
+ activityAnalysisVO.setDataList(comActNeighborCircleAnalysisVOS);
+ activityAnalysisVO.setUnitCount(comActDAO.getUnitCount());
+ return R.ok(activityAnalysisVO);
+ }
}
--
Gitblit v1.7.1