From b94fffb01c94100b34e2908b4fe79c1c554b0912 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期四, 02 一月 2025 13:55:03 +0800
Subject: [PATCH] 代码
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TAppUserController.java | 53 +++++++++----
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TTechnicalTitleController.java | 28 +++---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TCourseCommentController.java | 20 +++-
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TOrderController.java | 23 +++++
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TConsultationController.java | 20 +++-
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TCourseController.java | 26 ++++--
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TCommitteeController.java | 19 +++-
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TConsultationMessageController.java | 21 ++++-
8 files changed, 146 insertions(+), 64 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TAppUserController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TAppUserController.java
index 80c0040..5c14ec0 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TAppUserController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TAppUserController.java
@@ -25,6 +25,7 @@
import com.ruoyi.web.controller.query.dto.RegisterDto;
import io.swagger.annotations.ApiOperation;
import org.apache.poi.ss.usermodel.Workbook;
+import org.springframework.util.CollectionUtils;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@@ -279,6 +280,11 @@
.orderByDesc(TAppUser::getCreateTime)
.page(Page.of(appUserQuery.getPageNum(), appUserQuery.getPageSize()));
+ List<TRegion> regions = regionService.lambdaQuery().list();
+ List<TTechnicalTitle> tTechnicalTitles = tTechnicalTitleService.lambdaQuery().list();
+ List<TTitleMajor> tTitleMajors = majorService.lambdaQuery().list();
+ List<TLevel> levels = levelService.lambdaQuery().list();
+
for (TAppUser record : page.getRecords()) {
List<String> newString = new ArrayList<>();
//拿到最新的change
@@ -286,11 +292,11 @@
if (newest!=null){
List<TUserChangeDetail> list = tUserChangeDetailService.lambdaQuery().eq(TUserChangeDetail::getChangeId, newest.getId()).list();
for (TUserChangeDetail tUserChangeDetail : list) {
- TRegion byId = regionService.getById(tUserChangeDetail.getRegionId());
- TTechnicalTitle byId1 = tTechnicalTitleService.getById(tUserChangeDetail.getTitleId());
- TTitleMajor byId2 = majorService.getById(tUserChangeDetail.getMajorId());
- TLevel byId3 = levelService.getById(tUserChangeDetail.getLevelId());
- newString.add(byId.getName()+"-"+byId1.getTitileName()+"-"+byId2.getMajorName()+"-"+byId3.getName());
+ TRegion region = regions.stream().filter(e -> e.getId().equals(tUserChangeDetail.getRegionId())).findFirst().orElse(null);
+ TTechnicalTitle tTechnicalTitle = tTechnicalTitles.stream().filter(e -> e.getId().equals(tUserChangeDetail.getTitleId())).findFirst().orElse(null);
+ TTitleMajor tTitleMajor = tTitleMajors.stream().filter(e -> e.getId().equals(tUserChangeDetail.getMajorId())).findFirst().orElse(null);
+ TLevel tLevel = levels.stream().filter(e -> e.getId().equals(tUserChangeDetail.getLevelId())).findFirst().orElse(null);
+ newString.add(region.getName()+"-"+tTechnicalTitle.getTitileName()+"-"+tTitleMajor.getMajorName()+"-"+tLevel.getName());
}
}
@@ -301,11 +307,11 @@
if (latest!=null){
List<TUserChangeDetail> list = tUserChangeDetailService.lambdaQuery().eq(TUserChangeDetail::getChangeId, latest.getId()).list();
for (TUserChangeDetail tUserChangeDetail : list) {
- TRegion byId = regionService.getById(tUserChangeDetail.getRegionId());
- TTechnicalTitle byId1 = tTechnicalTitleService.getById(tUserChangeDetail.getTitleId());
- TTitleMajor byId2 = majorService.getById(tUserChangeDetail.getMajorId());
- TLevel byId3 = levelService.getById(tUserChangeDetail.getLevelId());
- lateString.add(byId.getName()+"-"+byId1.getTitileName()+"-"+byId2.getMajorName()+"-"+byId3.getName());
+ TRegion region = regions.stream().filter(e -> e.getId().equals(tUserChangeDetail.getRegionId())).findFirst().orElse(null);
+ TTechnicalTitle tTechnicalTitle = tTechnicalTitles.stream().filter(e -> e.getId().equals(tUserChangeDetail.getTitleId())).findFirst().orElse(null);
+ TTitleMajor tTitleMajor = tTitleMajors.stream().filter(e -> e.getId().equals(tUserChangeDetail.getMajorId())).findFirst().orElse(null);
+ TLevel tLevel = levels.stream().filter(e -> e.getId().equals(tUserChangeDetail.getLevelId())).findFirst().orElse(null);
+ lateString.add(region.getName()+"-"+tTechnicalTitle.getTitileName()+"-"+tTitleMajor.getMajorName()+"-"+tLevel.getName());
}
}
@@ -402,13 +408,26 @@
endTime = appUserQuery.getCreateTime2().atTime(23, 59, 59, 999999999);
}
- List<TAppUser> page = appUserService.lambdaQuery().like(appUserQuery.getName() != null, TAppUser::getName, appUserQuery.getName())
- .like(appUserQuery.getPhone() != null, TAppUser::getPhone, appUserQuery.getPhone())
- .eq(appUserQuery.getStatus() != null, TAppUser::getStatus, appUserQuery.getStatus())
- .ge(appUserQuery.getCreateTime1() != null, TAppUser::getCreateTime, startTime)
- .le(appUserQuery.getCreateTime2() != null, TAppUser::getCreateTime, endTime)
- .in(finalIds.size() > 0, TAppUser::getId, finalIds).list()
- ;
+ int pageSize = 100;
+ int currentPage = 0;
+ List<TAppUser> page = new ArrayList<>();
+
+ while (true) {
+ Page<TAppUser> pageItems = appUserService.lambdaQuery().like(appUserQuery.getName() != null, TAppUser::getName, appUserQuery.getName())
+ .like(appUserQuery.getPhone() != null, TAppUser::getPhone, appUserQuery.getPhone())
+ .eq(appUserQuery.getStatus() != null, TAppUser::getStatus, appUserQuery.getStatus())
+ .ge(appUserQuery.getCreateTime1() != null, TAppUser::getCreateTime,startTime)
+ .le(appUserQuery.getCreateTime2() != null, TAppUser::getCreateTime,endTime)
+ .in(finalIds.size() > 0, TAppUser::getId, finalIds)
+ .orderByDesc(TAppUser::getCreateTime)
+ .page(Page.of(currentPage * pageSize, pageSize));
+ List<TAppUser> records = pageItems.getRecords();
+ if (CollectionUtils.isEmpty(records)) {
+ break; // 没有更多数据，退出循环
+ }
+ page.addAll(records); // 累加当前页数据
+ currentPage++; // 进入下一页
+ }
List<Long> collect = page.stream().map(TAppUser::getId).collect(Collectors.toList());
Map<Long, TUserChange> collect1 = tUserChangeService.lambdaQuery()
.in(TUserChange::getUserId, collect).orderByDesc(TUserChange::getCreateTime).list()
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);
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TConsultationController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TConsultationController.java
index 509b651..1b15c7c 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TConsultationController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TConsultationController.java
@@ -182,14 +182,22 @@
}
}
-
+ List<TConsultation> records = page.getRecords();
Set<Long> cacheSet = redisCache.getCacheSet("Consultation:" + userId);
- List<TRegion> regions = regionService.lambdaQuery().list();
- List<TTechnicalTitle> tTechnicalTitles = tTechnicalTitleService.lambdaQuery().list();
- List<TTitleMajor> tTitleMajors = majorService.lambdaQuery().list();
- List<TConsultationClassification> consultationClassifications = consultationClassificationService.lambdaQuery().list();
- for (TConsultation record : page.getRecords()) {
+ List<Integer> regionIds = records.stream().map(TConsultation::getRegionId).collect(Collectors.toList());
+ List<TRegion> regions = regionService.lambdaQuery().in(TRegion::getId, regionIds).list();
+
+ List<Long> technicalIds = records.stream().map(TConsultation::getTitleId).collect(Collectors.toList());
+ List<TTechnicalTitle> tTechnicalTitles = tTechnicalTitleService.lambdaQuery().in(TTechnicalTitle::getId, technicalIds).list();
+
+ List<Long> majorIds = records.stream().map(TConsultation::getMajorId).collect(Collectors.toList());
+ List<TTitleMajor> tTitleMajors = majorService.lambdaQuery().in(TTitleMajor::getId, majorIds).list();
+
+ List<Long> classificationIds = records.stream().map(TConsultation::getClassificationId).collect(Collectors.toList());
+ List<TConsultationClassification> consultationClassifications = consultationClassificationService.lambdaQuery().in(TConsultationClassification::getId, classificationIds).list();
+
+ for (TConsultation record : records) {
TRegion region = regions.stream().filter(e -> e.getId().equals(record.getRegionId())).findFirst().orElse(null);
TTechnicalTitle tTechnicalTitle = tTechnicalTitles.stream().filter(e -> e.getId().equals(record.getTitleId())).findFirst().orElse(null);
TTitleMajor tTitleMajor = tTitleMajors.stream().filter(e -> e.getId().equals(record.getMajorId())).findFirst().orElse(null);
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 ff65bcc..53fed7d 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
@@ -16,6 +16,7 @@
import javax.annotation.Resource;
import java.util.Arrays;
import java.util.List;
+import java.util.stream.Collectors;
/**
* <p>
@@ -44,11 +45,21 @@
@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()) {
+
+ List<TConsultationMessage> records = tConsultationMessagePageInfo.getRecords();
+
+ List<Long> consultationId = records.stream().map(TConsultationMessage::getConsultationId).collect(Collectors.toList());
+ List<TConsultation> consultations = consultationService.lambdaQuery().in(TConsultation::getId,consultationId).list();
+
+ List<Long> titleId = consultations.stream().map(TConsultation::getTitleId).collect(Collectors.toList());
+ List<TTechnicalTitle> tTechnicalTitles = tTechnicalTitleService.lambdaQuery().in(TTechnicalTitle::getId,titleId).list();
+
+ List<Long> majorId = consultations.stream().map(TConsultation::getMajorId).collect(Collectors.toList());
+ List<TTitleMajor> tTitleMajors = majorService.lambdaQuery().in(TTitleMajor::getId,majorId).list();
+
+ List<Integer> level = consultations.stream().map(TConsultation::getLevel).collect(Collectors.toList());
+ List<TLevel> levels = levelService.lambdaQuery().in(TLevel::getId,level).list();
+ for (TConsultationMessage record : records) {
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);
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TCourseCommentController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TCourseCommentController.java
index d020c9a..18bb371 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TCourseCommentController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TCourseCommentController.java
@@ -18,6 +18,7 @@
import javax.naming.ldap.PagedResultsControl;
import java.util.Arrays;
import java.util.List;
+import java.util.stream.Collectors;
/**
* <p>
@@ -48,11 +49,20 @@
@PostMapping("/list")
public R<PageInfo<TCourseComment>> list(@RequestBody CommentQuery commentQuery){
PageInfo<TCourseComment> tCourseCommentPageInfo = courseCommentService.pageQuery(commentQuery);
- List<TCourse> courses = courseService.lambdaQuery().list();
- List<TTechnicalTitle> tTechnicalTitles = tTechnicalTitleService.lambdaQuery().list();
- List<TTitleMajor> tTitleMajors = majorService.lambdaQuery().list();
- List<TLevel> levels = levelService.lambdaQuery().list();
- for (TCourseComment record : tCourseCommentPageInfo.getRecords()) {
+ List<TCourseComment> records = tCourseCommentPageInfo.getRecords();
+
+ List<Long> courseId = records.stream().map(TCourseComment::getCourseId).collect(Collectors.toList());
+ List<TCourse> courses = courseService.lambdaQuery().in(TCourse::getId, courseId).list();
+
+ List<Long> technicalId = courses.stream().map(TCourse::getTechnicalId).collect(Collectors.toList());
+ List<TTechnicalTitle> tTechnicalTitles = tTechnicalTitleService.lambdaQuery().in(TTechnicalTitle::getId, technicalId).list();
+
+ List<Long> majorId = courses.stream().map(TCourse::getMajorId).collect(Collectors.toList());
+ List<TTitleMajor> tTitleMajors = majorService.lambdaQuery().in(TTitleMajor::getId, majorId).list();
+
+ List<Integer> level = courses.stream().map(TCourse::getLevel).collect(Collectors.toList());
+ List<TLevel> levels = levelService.lambdaQuery().in(TLevel::getId, level).list();
+ for (TCourseComment record : records) {
TCourse tCourse = courses.stream().filter(e -> e.getId().equals(record.getCourseId())).findFirst().orElse(null);
TTechnicalTitle tTechnicalTitle = tTechnicalTitles.stream().filter(e -> e.getId().equals(tCourse.getTechnicalId())).findFirst().orElse(null);
TTitleMajor tTitleMajor = tTitleMajors.stream().filter(e -> e.getId().equals(tCourse.getMajorId())).findFirst().orElse(null);
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TCourseController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TCourseController.java
index 4e37a05..2a2fb51 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TCourseController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TCourseController.java
@@ -131,13 +131,20 @@
}
Set<Long> cacheSet = redisCache.getCacheSet("COURSE:" + userId);
- List<TTechnicalTitle> tTechnicalTitles = tTechnicalTitleService.lambdaQuery().list();
- List<TTitleMajor> tTitleMajors = majorService.lambdaQuery().list();
- List<TRegion> regions = regionService.lambdaQuery().list();
+
+ List<TCourse> records = page.getRecords();
+ List<Long> technicalId = records.stream().map(TCourse::getTechnicalId).collect(Collectors.toList());
+ List<TTechnicalTitle> tTechnicalTitles = tTechnicalTitleService.lambdaQuery().in(TTechnicalTitle::getId, technicalId).list();
+ List<Long> majorId = records.stream().map(TCourse::getMajorId).collect(Collectors.toList());
+ List<TTitleMajor> tTitleMajors = majorService.lambdaQuery().in(TTitleMajor::getId, majorId).list();
+ List<Integer> regionId = records.stream().map(TCourse::getRegionId).collect(Collectors.toList());
+ List<TRegion> regions = regionService.lambdaQuery().in(TRegion::getId,regionId).list();
+ List<Long> ids = records.stream().map(TCourse::getId).collect(Collectors.toList());
List<TOrder> orders = orderService.lambdaQuery()
.eq(TOrder::getGoodType, 1)
- .eq(TOrder::getPaymentStatus, 2).list();
- for (TCourse record : page.getRecords()) {
+ .eq(TOrder::getPaymentStatus, 2)
+ .in(TOrder::getGoodId, ids).list();
+ for (TCourse record : records) {
TTechnicalTitle tTechnicalTitle = tTechnicalTitles.stream().filter(e -> e.getId().equals(record.getTechnicalId())).findFirst().orElse(null);
TTitleMajor tTitleMajor = tTitleMajors.stream().filter(e -> e.getId().equals(record.getMajorId())).findFirst().orElse(null);
TRegion region = regions.stream().filter(e -> e.getId().equals(record.getRegionId())).findFirst().orElse(null);
@@ -170,9 +177,12 @@
@PostMapping(value = "/other")
public R<List<TCourse>> other(@RequestParam Long id) {
List<TCourse> list = courseService.lambdaQuery().ne(TCourse::getId, id).last("limit 3").list();
- List<TRegion> regions = regionService.lambdaQuery().list();
- List<TTechnicalTitle> tTechnicalTitles = tTechnicalTitleService.lambdaQuery().list();
- List<TTitleMajor> tTitleMajors = majorService.lambdaQuery().list();
+ List<Integer> regionId = list.stream().map(TCourse::getRegionId).collect(Collectors.toList());
+ List<TRegion> regions = regionService.lambdaQuery().in(TRegion::getId,regionId).list();
+ List<Long> technicalId = list.stream().map(TCourse::getTechnicalId).collect(Collectors.toList());
+ List<TTechnicalTitle> tTechnicalTitles = tTechnicalTitleService.lambdaQuery().in(TTechnicalTitle::getId,technicalId).list();
+ List<Long> majorId = list.stream().map(TCourse::getMajorId).collect(Collectors.toList());
+ List<TTitleMajor> tTitleMajors = majorService.lambdaQuery().in(TTitleMajor::getId,majorId).list();
for (TCourse record : list) {
TRegion region = regions.stream().filter(e -> e.getId().equals(record.getRegionId())).findFirst().orElse(null);
TTechnicalTitle tTechnicalTitle = tTechnicalTitles.stream().filter(e -> e.getId().equals(record.getTechnicalId())).findFirst().orElse(null);
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TOrderController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TOrderController.java
index 274815b..1a13061 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TOrderController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TOrderController.java
@@ -21,6 +21,7 @@
import io.swagger.annotations.ApiOperation;
import org.apache.poi.ss.usermodel.Workbook;
import org.springframework.security.core.parameters.P;
+import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
@@ -226,10 +227,26 @@
@PostMapping(value = "/export")
public void mealGeneratorExport(@RequestBody OrderQuery orderQuery) {
- List<TOrder> tOrders = orderService.listExport(orderQuery);
+
+ int pageSize = 100;
+ int currentPage = 0;
+ List<TOrder> page = new ArrayList<>();
+
+ while (true) {
+ orderQuery.setPageNum(currentPage * pageSize);
+ orderQuery.setPageSize(pageSize);
+ PageInfo<TOrder> tOrderPageInfo = orderService.pageList(orderQuery);
+ List<TOrder> records = tOrderPageInfo.getRecords();
+ if (CollectionUtils.isEmpty(records)) {
+ break; // 没有更多数据，退出循环
+ }
+ page.addAll(records); // 累加当前页数据
+ currentPage++; // 进入下一页
+ }
+
List<TCourse> courses = courseService.lambdaQuery().list();
List<TInformation> informations = informationService.lambdaQuery().list();
- for (TOrder record : tOrders) {
+ for (TOrder record : page) {
record.getFormattedCreateTime();
if (record.getGoodType()==1){
TCourse course = courses.stream().filter(e -> e.getId().equals(record.getGoodId())).findFirst().orElse(null);
@@ -243,7 +260,7 @@
}
- Workbook workbook = ExcelExportUtil.exportExcel(new ExportParams(), TOrder.class,tOrders );
+ Workbook workbook = ExcelExportUtil.exportExcel(new ExportParams(), TOrder.class,page);
HttpServletResponse response = WebUtils.response();
response.setContentType("application/vnd.ms-excel");
response.setCharacterEncoding("utf-8");
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TTechnicalTitleController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TTechnicalTitleController.java
index 8d60151..221c8e6 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TTechnicalTitleController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TTechnicalTitleController.java
@@ -44,6 +44,20 @@
private TTitleMajorService majorService;
@Resource
private TLevelService levelService;
+ @Resource
+ private TUserChangeDetailService userChangeDetailService;
+ @Resource
+ private TConsultationService consultationService;
+ @Resource
+ private TDeclareNoticeService declareNoticeService;
+ @Resource
+ private TCommitteeTechnicalService committeeTechnicalService;
+ @Resource
+ private TCommitteeService committeeService;
+ @Resource
+ private TInformationService informationService;
+ @Resource
+ private TCourseService courseService;
//添加接口
@ApiOperation(value = "添加",tags = "后台-系统设置-职称系列")
@PostMapping(value = "/add")
@@ -88,20 +102,6 @@
return R.ok();
}
- @Resource
- private TUserChangeDetailService userChangeDetailService;
- @Resource
- private TConsultationService consultationService;
- @Resource
- private TDeclareNoticeService declareNoticeService;
- @Resource
- private TCommitteeTechnicalService committeeTechnicalService;
- @Resource
- private TCommitteeService committeeService;
- @Resource
- private TInformationService informationService;
- @Resource
- private TCourseService courseService;
//批量删除接口
@ApiOperation(value = "删除",tags = "后台-系统设置-职称系列")
@PostMapping(value = "/deleteByIds")
--
Gitblit v1.7.1