From ccd28a0c35e8fff74da6ef63042fb8a896d78f7f Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期三, 29 六月 2022 09:45:52 +0800
Subject: [PATCH] 单位服务统计
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleServiceImpl.java | 96 ++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 92 insertions(+), 4 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 417b406..ebb6550 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,14 +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;
@@ -70,6 +72,8 @@
private UserService userService;
@Resource
private ComPbMemberDAO comPbMemberDAO;
+ @Resource
+ private ComActNeighborCircleDAO comActNeighborCircleDAO;
/**
* 分页查询邻里圈列表
*
@@ -115,6 +119,43 @@
ComActDO actDO = comActDAO.selectById(circleAppVO.getCommunityId());
if (actDO != null) {
circleAppVO.setName(actDO.getName());
+ }
+ }
+
+ }
+ }
+ 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());
}
}
@@ -656,7 +697,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有误");
}
@@ -925,4 +967,50 @@
}
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 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