From ca070436770f715572405880cfe548c02f639c73 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 01 一月 2025 10:08:31 +0800
Subject: [PATCH] 代码修改
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TConsultationMessageController.java | 19 +++++++++++--------
1 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TConsultationMessageController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TConsultationMessageController.java
index da8e3ed..ff65bcc 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TConsultationMessageController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TConsultationMessageController.java
@@ -15,6 +15,7 @@
import javax.annotation.Resource;
import java.util.Arrays;
+import java.util.List;
/**
* <p>
@@ -43,15 +44,17 @@
@PostMapping("/list")
public R<PageInfo<TConsultationMessage>> list(@RequestBody MessageQuery messageQuery){
PageInfo<TConsultationMessage> tConsultationMessagePageInfo = consultationMessageService.pageQuery(messageQuery);
+ List<TConsultation> consultations = consultationService.lambdaQuery().list();
+ List<TTechnicalTitle> tTechnicalTitles = tTechnicalTitleService.lambdaQuery().list();
+ List<TTitleMajor> tTitleMajors = majorService.lambdaQuery().list();
+ List<TLevel> levels = levelService.lambdaQuery().list();
for (TConsultationMessage record : tConsultationMessagePageInfo.getRecords()) {
- TConsultation byId = consultationService.getById(record.getConsultationId());
- record.setTitle(byId.getClassificationName());
-
-
- TTechnicalTitle byId1 = tTechnicalTitleService.getById(byId.getTitleId() );
- TTitleMajor byId2 = majorService.getById(byId.getMajorId());
- TLevel byId3 = levelService.getById(byId.getLevel());
- record.setClassName(byId1.getTitileName()+"-"+byId2.getMajorName()+"-"+byId3.getName());
+ TConsultation consultation = consultations.stream().filter(e -> e.getId().equals(record.getConsultationId())).findFirst().orElse(null);
+ record.setTitle(consultation.getClassificationName());
+ TTechnicalTitle tTechnicalTitle = tTechnicalTitles.stream().filter(e -> e.getId().equals(consultation.getTitleId())).findFirst().orElse(null);
+ TTitleMajor tTitleMajor = tTitleMajors.stream().filter(e -> e.getId().equals(consultation.getMajorId())).findFirst().orElse(null);
+ TLevel tLevel = levels.stream().filter(e -> e.getId().equals(consultation.getLevel())).findFirst().orElse(null);
+ record.setClassName(tTechnicalTitle.getTitileName()+"-"+tTitleMajor.getMajorName()+"-"+tLevel.getName());
}
return R.ok(tConsultationMessagePageInfo);
}
--
Gitblit v1.7.1