Merge remote-tracking branch 'origin/haucheng_panzhihua' into haucheng_panz...

luoxinwu

2024-03-05 c88d1658a2b6b51ed1a81c3be3e9102b661970f3

 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: 党建-报到单位表服务实现类
@@ -80,6 +85,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);
    }

    /**
     * description  insert  新增数据
     *