From b6373daa40c3dc17ca107f3666fd252f3b6b0778 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 03 一月 2025 18:34:52 +0800
Subject: [PATCH] 代码
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TCommitteeController.java | 19 +++++++++++++------
1 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TCommitteeController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TCommitteeController.java
index 0e3fd95..364c2db 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TCommitteeController.java
+++ b/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);
--
Gitblit v1.7.1