From c88d1658a2b6b51ed1a81c3be3e9102b661970f3 Mon Sep 17 00:00:00 2001
From: luoxinwu <934743099@qq.com>
Date: 星期二, 05 三月 2024 09:42:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/haucheng_panzhihua' into haucheng_panzhihua
---
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbCheckUnitServiceImpl.java | 41 +++++++++++++++++++++++++++++++++++++----
1 files changed, 37 insertions(+), 4 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 21c87c0..b9ed48e 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,6 +1,8 @@
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;
@@ -12,6 +14,7 @@
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.excel.ComPbCheckUnitErrorExcelVO;
import com.panzhihua.common.model.vos.partybuilding.excel.ComPbCheckUnitExcelVO;
@@ -31,6 +34,8 @@
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
/**
* title: 党建-报到单位表服务实现类
@@ -78,6 +83,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);
}
/**
@@ -266,7 +299,7 @@
* @return
*/
@Override
- public R unitStatisticsTop(Long communityId, String belongTo, String choice) {
+ public R unitStatisticsTop(Long communityId, String belongTo, String choice,Long[] unitIds) {
List<Long> communityIds = new ArrayList<>();
if (null != communityId){
communityIds = comPbMemberDAO.selectIds(communityId);
@@ -275,7 +308,7 @@
}
}
- return R.ok(this.baseMapper.unitStatisticsTop(communityIds, belongTo, choice));
+ return R.ok(this.baseMapper.unitStatisticsTop(communityIds, belongTo, choice,unitIds));
}
/**
@@ -306,7 +339,7 @@
* @return
*/
@Override
- public R pbStatisticsTop(Long communityId, String belongTo, String choice, Long checkUnitId) {
+ public R pbStatisticsTop(Long communityId, String belongTo, String choice, Long checkUnitId,Long[] unitIds) {
List<Long> communityIds = new ArrayList<>();
if (null != communityId){
@@ -315,7 +348,7 @@
communityIds.add(communityId);
}
}
- return R.ok(this.baseMapper.pbStatisticsTop(communityIds, belongTo, choice, checkUnitId));
+ return R.ok(this.baseMapper.pbStatisticsTop(communityIds, belongTo, choice, checkUnitId,unitIds));
}
/**
--
Gitblit v1.7.1