代码

xuhy

2025-01-02 b94fffb01c94100b34e2908b4fe79c1c554b0912

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TCommitteeController.java

@@ -157,14 +157,21 @@
                        .page(Page.of(informationQuery.getPageNum(), informationQuery.getPageSize()));
            }
        }
        List<TCommittee> records = page.getRecords();
        List<Integer> regionIds = records.stream().map(TCommittee::getRegionId).collect(Collectors.toList());
        List<TRegion> regions = regionService.lambdaQuery().in(TRegion::getId, regionIds).list();

        List<TRegion> regions = regionService.lambdaQuery().list();
        List<TTechnicalTitle> tTechnicalTitles = tTechnicalTitleService.lambdaQuery().list();
        List<TTitleMajor> tTitleMajors = majorService.lambdaQuery().list();
        List<TCommitteeTechnical> committeeTechnicals = committeeTechnicalService.lambdaQuery().list();
        List<TCommitteeMajor> committeeMajors = tCommitteeMajorService.lambdaQuery().list();
        List<Long> technicalIds = records.stream().map(TCommittee::getTechnicalId).collect(Collectors.toList());
        List<TTechnicalTitle> tTechnicalTitles = tTechnicalTitleService.lambdaQuery().in(TTechnicalTitle::getId, technicalIds).list();

        for (TCommittee record : page.getRecords()) {
        List<Long> majorIds = records.stream().map(TCommittee::getMajorId).collect(Collectors.toList());
        List<TTitleMajor> tTitleMajors = majorService.lambdaQuery().in(TTitleMajor::getId, majorIds).list();

        List<Long> ids = records.stream().map(TCommittee::getId).collect(Collectors.toList());
        List<TCommitteeTechnical> committeeTechnicals = committeeTechnicalService.lambdaQuery().in(TCommitteeTechnical::getCommitteeId, ids).list();
        List<TCommitteeMajor> committeeMajors = tCommitteeMajorService.lambdaQuery().in(TCommitteeMajor::getCommitteeId, ids).list();

        for (TCommittee record : records) {
            TRegion region = regions.stream().filter(e -> e.getId().equals(record.getRegionId())).findFirst().orElse(null);
            record.setRegionName(region.getProvinceName()+"-"+region.getName());
            TTechnicalTitle tTechnicalTitle = tTechnicalTitles.stream().filter(e -> e.getId().equals(record.getTechnicalId())).findFirst().orElse(null);