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

@@ -34,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: 党建-报到单位表服务实现类
@@ -88,14 +90,29 @@
        QueryWrapper<ComPbCheckUnit> wrapper = new QueryWrapper<>();
        if(treeListVO.getName() != null){
            wrapper.eq("belong_to",treeListVO.getName());
        }
        if(treeListVO.getOrgName() != null){
        } 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  新增数据
     *