From 2c47237a314a8965f1b33be140f03eaa3e8804df Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期三, 26 六月 2024 16:47:44 +0800
Subject: [PATCH] 花城 修改关联项目筛选无数据2
---
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbCheckUnitServiceImpl.java | 38 +++++++++++++++++++++++++++++++++-----
1 files changed, 33 insertions(+), 5 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 3b18e5f..e562c81 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
@@ -16,6 +16,7 @@
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.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;
@@ -34,6 +35,8 @@
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
/**
* title: 党建-报到单位表服务实现类
@@ -95,6 +98,20 @@
}
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);
}
/**
@@ -283,7 +300,7 @@
* @return
*/
@Override
- public R unitStatisticsTop(Long communityId, String belongTo, String choice,Long[] unitIds) {
+ 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);
@@ -291,8 +308,13 @@
communityIds.add(communityId);
}
}
-
- return R.ok(this.baseMapper.unitStatisticsTop(communityIds, belongTo, choice,unitIds));
+ //查询 活动总积分
+ 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);
}
/**
@@ -323,7 +345,7 @@
* @return
*/
@Override
- public R pbStatisticsTop(Long communityId, String belongTo, String choice, Long checkUnitId,Long[] unitIds) {
+ public R pbStatisticsTop(Long communityId, String belongTo, String choice, Long checkUnitId,Long[] unitIds ,String yearTime) {
List<Long> communityIds = new ArrayList<>();
if (null != communityId){
@@ -332,7 +354,13 @@
communityIds.add(communityId);
}
}
- return R.ok(this.baseMapper.pbStatisticsTop(communityIds, belongTo, choice, checkUnitId,unitIds));
+ //查询 活动总积分
+ 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);
}
/**
--
Gitblit v1.7.1