From 0ceb3c850cc2d6df73819985dbbc67630b435314 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期五, 28 六月 2024 14:16:56 +0800
Subject: [PATCH] 花城 修改【小程序】【需求清单】位接单后，切换问题、需求数据一样
---
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbCheckUnitServiceImpl.java | 188 ++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 179 insertions(+), 9 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbCheckUnitServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbCheckUnitServiceImpl.java
index 0259658..f2e355a 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbCheckUnitServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbCheckUnitServiceImpl.java
@@ -1,34 +1,42 @@
package com.panzhihua.service_dangjian.service.impl;
+import cn.hutool.core.collection.CollUtil;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.google.common.collect.Lists;
import com.panzhihua.common.enums.ComPbCheckUnitTypeEnum;
+import com.panzhihua.common.model.dtos.common.AddComPbCheckUnitDto;
+import com.panzhihua.common.model.dtos.common.EditComPbCheckUnitDto;
+import com.panzhihua.common.model.dtos.common.PageComPbCheckUnitDto;
+import com.panzhihua.common.model.dtos.common.PagePbCheckUnitCommonDto;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.TreeListVO;
import com.panzhihua.common.model.vos.common.ComPbCheckUnitVo;
-import com.panzhihua.common.model.vos.partybuilding.PartyBuildingMemberVO;
+import com.panzhihua.common.model.vos.common.PbCheckUnitStatisticsVo;
import com.panzhihua.common.model.vos.partybuilding.excel.ComPbCheckUnitErrorExcelVO;
import com.panzhihua.common.model.vos.partybuilding.excel.ComPbCheckUnitExcelVO;
import com.panzhihua.common.utlis.StringUtils;
+import com.panzhihua.service_dangjian.dao.ComPbCheckUnitMapper;
import com.panzhihua.service_dangjian.dao.ComPbMemberDAO;
import com.panzhihua.service_dangjian.dao.ComPbMemberRoleDAO;
import com.panzhihua.service_dangjian.entity.ComPbCheckUnit;
-import com.panzhihua.service_dangjian.dao.ComPbCheckUnitMapper;
import com.panzhihua.service_dangjian.model.dos.ComPbMemberDO;
import com.panzhihua.service_dangjian.model.dos.ComPbMemberRoleDO;
import com.panzhihua.service_dangjian.service.ComPbCheckUnitService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.panzhihua.service_dangjian.service.ComPbMemberService;
import org.springframework.beans.BeanUtils;
-import com.panzhihua.common.model.dtos.common.*;
-import com.panzhihua.common.model.vos.R;
import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
/**
* title: 党建-报到单位表服务实现类
@@ -47,8 +55,7 @@
private ComPbMemberDAO comPbMemberDAO;
@Resource
private ComPbMemberRoleDAO comPbMemberRoleDAO;
- @Resource
- private ComPbMemberService comPbMemberService;
+
/**
* description queryByPage 分页查询
@@ -60,6 +67,16 @@
*/
@Override
public R queryByPage(PageComPbCheckUnitDto comPbCheckUnit) {
+
+ Long communityId = comPbCheckUnit.getCommunityId();
+ if (communityId != null){
+ List<Long> communityIds = comPbMemberDAO.selectIds(communityId);
+ if (CollUtil.isEmpty(communityIds)) {
+ communityIds = new ArrayList<>();
+ communityIds.add(communityId);
+ }
+ comPbCheckUnit.setCommunityIds(communityIds);
+ }
IPage<ComPbCheckUnitVo> checkUnitVoPage= this.baseMapper.queryAllByLimit(comPbCheckUnit, new Page(comPbCheckUnit.getPageNum(), comPbCheckUnit.getPageSize()));
checkUnitVoPage.getRecords().forEach(checkUnit -> {
if(StringUtils.isEmpty(checkUnit.getOrgName())){
@@ -67,6 +84,34 @@
}
});
return R.ok(checkUnitVoPage);
+ }
+
+ @Override
+ public R treeList(TreeListVO treeListVO) {
+ QueryWrapper<ComPbCheckUnit> wrapper = new QueryWrapper<>();
+ if(treeListVO.getName() != null){
+ wrapper.eq("belong_to",treeListVO.getName());
+ } else if(treeListVO.getOrgName() != null){
+ wrapper.eq("org_name",treeListVO.getOrgName());
+ } else {
+ return R.ok();
+ }
+ List<ComPbCheckUnit> comPbCheckUnits = this.baseMapper.selectList(wrapper);
+ return R.ok(comPbCheckUnits);
+ }
+
+ @Override
+ public R orgList() {
+ QueryWrapper<ComPbCheckUnit> wrapper = new QueryWrapper<>();
+ List<ComPbCheckUnitVo> voList = new ArrayList<>();
+ List<ComPbCheckUnit> list = this.baseMapper.selectList(wrapper);
+ Map<String, List<ComPbCheckUnit>> map = list.stream().filter(f -> f.getOrgName() != null).collect(Collectors.groupingBy(ComPbCheckUnit::getOrgName));
+ for (Map.Entry<String, List<ComPbCheckUnit>> entry : map.entrySet()) {
+ ComPbCheckUnitVo pbCheckUnitVo = new ComPbCheckUnitVo();
+ pbCheckUnitVo.setOrgName(entry.getKey());
+ voList.add(pbCheckUnitVo);
+ }
+ return R.ok(voList);
}
/**
@@ -83,6 +128,15 @@
Long communityId=this.baseMapper.selectCommunityId(comPbCheckUnit.getHelpCommunityName().split(",")[0],comPbCheckUnit.getHelpCommunityName().split(",")[1],comPbCheckUnit.getHelpCommunityName().split(",")[2]);
ComPbCheckUnit entity = new ComPbCheckUnit();
BeanUtils.copyProperties(comPbCheckUnit, entity);
+ int a=0;
+ if(!StringUtils.isEmpty(comPbCheckUnit.getAdminPhone()))
+ {
+ a=this.baseMapper.selectOrgAdmin(comPbCheckUnit.getAdminPhone());
+ }
+ if(a!=0)
+ {
+ return R.fail("该手机号已绑定管理员!");
+ }
if(communityId!=null){
entity.setCommunityId(communityId);
}
@@ -169,6 +223,15 @@
*/
@Override
public R queryByList(PageComPbCheckUnitDto comPbCheckUnit) {
+ Long communityId = comPbCheckUnit.getCommunityId();
+ if (communityId != null){
+ List<Long> communityIds = comPbMemberDAO.selectIds(communityId);
+ if (CollUtil.isEmpty(communityIds)) {
+ communityIds = new ArrayList<>();
+ communityIds.add(communityId);
+ }
+ comPbCheckUnit.setCommunityIds(communityIds);
+ }
IPage<ComPbCheckUnitVo> checkUnitList = this.baseMapper.queryAllByLimit(comPbCheckUnit,new Page(comPbCheckUnit.getPageNum(),comPbCheckUnit.getPageSize()));
checkUnitList.getRecords().forEach(checkUnit -> {
if(StringUtils.isEmpty(checkUnit.getOrgName())){
@@ -237,4 +300,111 @@
}
return R.ok();
}
+
+ /**
+ * 报到单位统计-顶部数据
+ * @param communityId
+ * @param belongTo
+ * @param choice
+ * @return
+ */
+ @Override
+ public R unitStatisticsTop(Long communityId, String belongTo, String choice,Long[] unitIds,String yearTime) {
+ List<Long> communityIds = new ArrayList<>();
+ if (null != communityId){
+ communityIds = comPbMemberDAO.selectIds(communityId);
+ if (CollUtil.isEmpty(communityIds)) {
+ communityIds.add(communityId);
+ }
+ }
+ //查询 活动总积分
+ PbCheckUnitStatisticsVo vo = this.baseMapper.unitStatisticsTop(communityIds, belongTo, choice,unitIds,yearTime);
+ if(null != vo) {
+ Integer sum = this.baseMapper.organSumIntegral(communityIds,yearTime);
+ vo.setOrganSumIntegral(sum);
+ }
+ return R.ok(vo);
+ }
+
+ /**
+ * 报到单位统计
+ * @param commonDto
+ * @return
+ */
+ @Override
+ public R unitStatistics(PagePbCheckUnitCommonDto commonDto) {
+ Long communityId = commonDto.getCommunityId();
+ if (null != communityId) {
+ List<Long> communityIds = comPbMemberDAO.selectIds(communityId);
+ if (CollUtil.isEmpty(communityIds)) {
+ communityIds = new ArrayList<>();
+ communityIds.add(communityId);
+ }
+ commonDto.setCommunityIds(communityIds);
+ }
+ return R.ok(this.baseMapper.unitStatistics(commonDto, new Page(commonDto.getPageNum(), commonDto.getPageSize())));
+ }
+
+ /**
+ * 报到党员统计-顶部数据
+ * @param communityId
+ * @param belongTo
+ * @param choice
+ * @param checkUnitId
+ * @return
+ */
+ @Override
+ public R pbStatisticsTop(Long communityId, String belongTo, String choice, Long checkUnitId,Long[] unitIds ,String yearTime) {
+
+ List<Long> communityIds = new ArrayList<>();
+ if (null != communityId){
+ communityIds = comPbMemberDAO.selectIds(communityId);
+ if (CollUtil.isEmpty(communityIds)) {
+ communityIds.add(communityId);
+ }
+ }
+ //查询 活动总积分
+ PbCheckUnitStatisticsVo vo = this.baseMapper.pbStatisticsTop(communityIds, belongTo, choice, checkUnitId,unitIds,yearTime);
+ if(null != vo) {
+ Integer sum = this.baseMapper.pbOrganSumIntegral(communityIds,yearTime);
+ vo.setOrganSumIntegral(sum);
+ }
+ return R.ok(vo);
+ }
+
+ /**
+ * 报到党员统计-按单位归属统计
+ * @param commonDto
+ * @return
+ */
+ @Override
+ public R pbStatisticsBelong(PagePbCheckUnitCommonDto commonDto) {
+ Long communityId = commonDto.getCommunityId();
+ if (null != communityId) {
+ List<Long> communityIds = comPbMemberDAO.selectIds(communityId);
+ if (CollUtil.isEmpty(communityIds)) {
+ communityIds = new ArrayList<>();
+ communityIds.add(communityId);
+ }
+ commonDto.setCommunityIds(communityIds);
+ }
+ return R.ok(this.baseMapper.pbStatisticsBelong(commonDto, new Page(commonDto.getPageNum(), commonDto.getPageSize())));
+ }
+
+ /**
+ * 报到党员统计-按单位统计
+ * @param commonDto
+ * @return
+ */
+ @Override
+ public R pbStatisticsUnit(PagePbCheckUnitCommonDto commonDto) {
+ Long communityId = commonDto.getCommunityId();
+ List<Long> communityIds = comPbMemberDAO.selectIds(communityId);
+ if (CollUtil.isEmpty(communityIds)) {
+ communityIds = new ArrayList<>();
+ communityIds.add(communityId);
+ }
+ commonDto.setCommunityIds(communityIds);
+ return R.ok(this.baseMapper.pbStatisticsUnit(commonDto, new Page(commonDto.getPageNum(), commonDto.getPageSize())));
+ }
}
--
Gitblit v1.7.1