From 6e6f4887eaeb046ccdc76a79375a8c7ff47daa96 Mon Sep 17 00:00:00 2001
From: fengjin <1435304038@qq.com>
Date: 星期五, 21 十月 2022 17:52:18 +0800
Subject: [PATCH] Merge branch 'zigonggao_dev' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into zigonggao_dev
---
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbCheckUnitServiceImpl.java | 105 +++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 103 insertions(+), 2 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 529c53e..3a5477d 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,5 +1,7 @@
package com.panzhihua.service_dangjian.service.impl;
+import cn.hutool.core.collection.CollUtil;
+import com.alibaba.fastjson.JSONArray;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.google.common.collect.Lists;
@@ -7,6 +9,7 @@
import com.panzhihua.common.model.vos.common.ComPbCheckUnitVo;
import com.panzhihua.common.model.vos.partybuilding.excel.ComPbCheckUnitErrorExcelVO;
import com.panzhihua.common.model.vos.partybuilding.excel.ComPbCheckUnitExcelVO;
+import com.panzhihua.common.service.community.CommunityService;
import com.panzhihua.common.utlis.StringUtils;
import com.panzhihua.service_dangjian.dao.ComPbMemberDAO;
import com.panzhihua.service_dangjian.dao.ComPbMemberRoleDAO;
@@ -48,6 +51,8 @@
private ComPbMemberRoleDAO comPbMemberRoleDAO;
@Resource
private ComPbMemberService comPbMemberService;
+ @Resource
+ private CommunityService communityService;
/**
* description queryByPage 分页查询
@@ -59,6 +64,21 @@
*/
@Override
public R queryByPage(PageComPbCheckUnitDto comPbCheckUnit) {
+
+ Long communityId = comPbCheckUnit.getCommunityId();
+ R r = communityService.selectCommunityIds(communityId);
+ List<Long> communityIds = null;
+ if(R.isOk(r)){
+ communityIds = JSONArray.parseArray(JSONArray.toJSONString(r.getData()), Long.class);
+ if (CollUtil.isEmpty(communityIds)) {
+ communityIds = new ArrayList<>();
+ communityIds.add(communityId);
+ }
+ }else {
+ 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())){
@@ -168,6 +188,20 @@
*/
@Override
public R queryByList(PageComPbCheckUnitDto comPbCheckUnit) {
+ Long communityId = comPbCheckUnit.getCommunityId();
+ R r = communityService.selectCommunityIds(communityId);
+ List<Long> communityIds = null;
+ if(R.isOk(r)){
+ communityIds = JSONArray.parseArray(JSONArray.toJSONString(r.getData()), Long.class);
+ if (CollUtil.isEmpty(communityIds)) {
+ communityIds = new ArrayList<>();
+ communityIds.add(communityId);
+ }
+ }else {
+ 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())){
@@ -246,7 +280,19 @@
*/
@Override
public R unitStatisticsTop(Long communityId, String belongTo, String choice) {
- return R.ok(this.baseMapper.unitStatisticsTop(communityId, belongTo, choice));
+ R r = communityService.selectCommunityIds(communityId);
+ List<Long> communityIds = null;
+ if(R.isOk(r)){
+ communityIds = JSONArray.parseArray(JSONArray.toJSONString(r.getData()), Long.class);
+ if (CollUtil.isEmpty(communityIds)) {
+ communityIds = new ArrayList<>();
+ communityIds.add(communityId);
+ }
+ }else {
+ communityIds = new ArrayList<>();
+ communityIds.add(communityId);
+ }
+ return R.ok(this.baseMapper.unitStatisticsTop(communityIds, belongTo, choice));
}
/**
@@ -256,6 +302,20 @@
*/
@Override
public R unitStatistics(PagePbCheckUnitCommonDto commonDto) {
+ Long communityId = commonDto.getCommunityId();
+ R r = communityService.selectCommunityIds(communityId);
+ List<Long> communityIds = null;
+ if(R.isOk(r)){
+ communityIds = JSONArray.parseArray(JSONArray.toJSONString(r.getData()), Long.class);
+ if (CollUtil.isEmpty(communityIds)) {
+ communityIds = new ArrayList<>();
+ communityIds.add(communityId);
+ }
+ }else {
+ communityIds = new ArrayList<>();
+ communityIds.add(communityId);
+ }
+ commonDto.setCommunityIds(communityIds);
return R.ok(this.baseMapper.unitStatistics(commonDto, new Page(commonDto.getPageNum(), commonDto.getPageSize())));
}
@@ -269,7 +329,20 @@
*/
@Override
public R pbStatisticsTop(Long communityId, String belongTo, String choice, Long checkUnitId) {
- return R.ok(this.baseMapper.pbStatisticsTop(communityId, belongTo, choice, checkUnitId));
+
+ R r = communityService.selectCommunityIds(communityId);
+ List<Long> communityIds = null;
+ if(R.isOk(r)){
+ communityIds = JSONArray.parseArray(JSONArray.toJSONString(r.getData()), Long.class);
+ if (CollUtil.isEmpty(communityIds)) {
+ communityIds = new ArrayList<>();
+ communityIds.add(communityId);
+ }
+ }else {
+ communityIds = new ArrayList<>();
+ communityIds.add(communityId);
+ }
+ return R.ok(this.baseMapper.pbStatisticsTop(communityIds, belongTo, choice, checkUnitId));
}
/**
@@ -279,6 +352,20 @@
*/
@Override
public R pbStatisticsBelong(PagePbCheckUnitCommonDto commonDto) {
+ Long communityId = commonDto.getCommunityId();
+ R r = communityService.selectCommunityIds(communityId);
+ List<Long> communityIds = null;
+ if(R.isOk(r)){
+ communityIds = JSONArray.parseArray(JSONArray.toJSONString(r.getData()), Long.class);
+ if (CollUtil.isEmpty(communityIds)) {
+ communityIds = new ArrayList<>();
+ communityIds.add(communityId);
+ }
+ }else {
+ communityIds = new ArrayList<>();
+ communityIds.add(communityId);
+ }
+ commonDto.setCommunityIds(communityIds);
return R.ok(this.baseMapper.pbStatisticsBelong(commonDto, new Page(commonDto.getPageNum(), commonDto.getPageSize())));
}
@@ -289,6 +376,20 @@
*/
@Override
public R pbStatisticsUnit(PagePbCheckUnitCommonDto commonDto) {
+ Long communityId = commonDto.getCommunityId();
+ R r = communityService.selectCommunityIds(communityId);
+ List<Long> communityIds = null;
+ if(R.isOk(r)){
+ communityIds = JSONArray.parseArray(JSONArray.toJSONString(r.getData()), Long.class);
+ if (CollUtil.isEmpty(communityIds)) {
+ communityIds = new ArrayList<>();
+ communityIds.add(communityId);
+ }
+ }else {
+ 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