From ce4a770744d7a0b4e4ea3b5101556b94e72bdf1c Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期二, 14 十一月 2023 17:49:20 +0800
Subject: [PATCH] 修改打卡
---
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbCheckUnitServiceImpl.java | 92 ++++++++++++++++++++++++++++++----------------
1 files changed, 60 insertions(+), 32 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 774989d..b3cf77c 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,30 +1,30 @@
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.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.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.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;
@@ -49,10 +49,7 @@
private ComPbMemberDAO comPbMemberDAO;
@Resource
private ComPbMemberRoleDAO comPbMemberRoleDAO;
- @Resource
- private ComPbMemberService comPbMemberService;
- @Resource
- private CommunityService communityService;
+
/**
* description queryByPage 分页查询
@@ -66,19 +63,14 @@
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 (communityId != null){
+ List<Long> communityIds = comPbMemberDAO.selectIds(communityId);
if (CollUtil.isEmpty(communityIds)) {
communityIds = new ArrayList<>();
communityIds.add(communityId);
}
- }else {
- communityIds = new ArrayList<>();
- communityIds.add(communityId);
+ comPbCheckUnit.setCommunityIds(communityIds);
}
- 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())){
@@ -189,19 +181,14 @@
@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 (communityId != null){
+ List<Long> communityIds = comPbMemberDAO.selectIds(communityId);
if (CollUtil.isEmpty(communityIds)) {
communityIds = new ArrayList<>();
communityIds.add(communityId);
}
- }else {
- communityIds = new ArrayList<>();
- communityIds.add(communityId);
+ comPbCheckUnit.setCommunityIds(communityIds);
}
- 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())){
@@ -279,8 +266,16 @@
* @return
*/
@Override
- public R unitStatisticsTop(Long communityId, String belongTo, String choice) {
- return R.ok(this.baseMapper.unitStatisticsTop(communityId, belongTo, choice));
+ public R unitStatisticsTop(Long communityId, String belongTo, String choice,Long[] unitIds) {
+ List<Long> communityIds = new ArrayList<>();
+ if (null != communityId){
+ communityIds = comPbMemberDAO.selectIds(communityId);
+ if (CollUtil.isEmpty(communityIds)) {
+ communityIds.add(communityId);
+ }
+ }
+
+ return R.ok(this.baseMapper.unitStatisticsTop(communityIds, belongTo, choice,unitIds));
}
/**
@@ -290,6 +285,15 @@
*/
@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())));
}
@@ -302,8 +306,16 @@
* @return
*/
@Override
- public R pbStatisticsTop(Long communityId, String belongTo, String choice, Long checkUnitId) {
- return R.ok(this.baseMapper.pbStatisticsTop(communityId, belongTo, choice, checkUnitId));
+ public R pbStatisticsTop(Long communityId, String belongTo, String choice, Long checkUnitId,Long[] unitIds) {
+
+ List<Long> communityIds = new ArrayList<>();
+ if (null != communityId){
+ communityIds = comPbMemberDAO.selectIds(communityId);
+ if (CollUtil.isEmpty(communityIds)) {
+ communityIds.add(communityId);
+ }
+ }
+ return R.ok(this.baseMapper.pbStatisticsTop(communityIds, belongTo, choice, checkUnitId,unitIds));
}
/**
@@ -313,6 +325,15 @@
*/
@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())));
}
@@ -323,6 +344,13 @@
*/
@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