From 5be07b1a021f596b003eac001f4cb77416ae6c7b Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 11 十二月 2024 17:08:47 +0800
Subject: [PATCH] 修改
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TDeclareNoticeController.java | 41 ++++++++++++++++++++++++++++++-----------
1 files changed, 30 insertions(+), 11 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TDeclareNoticeController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TDeclareNoticeController.java
index 93278a8..8fb6d7a 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TDeclareNoticeController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TDeclareNoticeController.java
@@ -20,6 +20,7 @@
import java.lang.reflect.Array;
import java.util.Arrays;
import java.util.List;
+import java.util.stream.Collectors;
/**
* <p>
@@ -128,17 +129,32 @@
@ApiOperation(value = "查询",tags = {"后台-申报通知","web-职称申报"})
@PostMapping(value = "/list")
public R<Page<TDeclareNotice>> list(@RequestBody DeclareNoticeQuery informationQuery) {
- Page<TDeclareNotice> page = tDeclareNoticeService.lambdaQuery()
- .like(!StringUtils.isEmpty(informationQuery.getDeclareNoticeName()), TDeclareNotice::getDeclareNoticeName, informationQuery.getDeclareNoticeName())
- .eq(informationQuery.getRegionId() != null, TDeclareNotice::getRegionId, informationQuery.getRegionId())
- .eq(informationQuery.getTechnicalId() != null, TDeclareNotice::getTechnicalId, informationQuery.getTechnicalId())
- .eq(informationQuery.getMajorId() != null, TDeclareNotice::getMajorId, informationQuery.getMajorId())
- .eq(informationQuery.getLevel() != null, TDeclareNotice::getLevel, informationQuery.getLevel())
- .eq(informationQuery.getIsOnline()!=null, TDeclareNotice::getIsOnline, informationQuery.getIsOnline())
- .between(informationQuery.getDeclareStartTime1()!=null,TDeclareNotice::getDeclareStartTime,informationQuery.getDeclareStartTime1(),informationQuery.getDeclareStartTime2())
- .between(informationQuery.getDeclareEndTime1()!=null,TDeclareNotice::getDeclareEndTime,informationQuery.getDeclareEndTime1(),informationQuery.getDeclareEndTime2())
- .orderByDesc(TDeclareNotice::getNoticeSort)
- .page(Page.of(informationQuery.getPageNum(), informationQuery.getPageSize()));
+ Page<TDeclareNotice> page;
+ if(informationQuery.getSortType()==1){
+ page = tDeclareNoticeService.lambdaQuery()
+ .like(!StringUtils.isEmpty(informationQuery.getDeclareNoticeName()), TDeclareNotice::getDeclareNoticeName, informationQuery.getDeclareNoticeName())
+ .eq(informationQuery.getRegionId() != null, TDeclareNotice::getRegionId, informationQuery.getRegionId())
+ .eq(informationQuery.getTechnicalId() != null, TDeclareNotice::getTechnicalId, informationQuery.getTechnicalId())
+ .eq(informationQuery.getMajorId() != null, TDeclareNotice::getMajorId, informationQuery.getMajorId())
+ .eq(informationQuery.getLevel() != null, TDeclareNotice::getLevel, informationQuery.getLevel())
+ .eq(informationQuery.getIsOnline()!=null, TDeclareNotice::getIsOnline, informationQuery.getIsOnline())
+ .between(informationQuery.getDeclareStartTime1()!=null,TDeclareNotice::getDeclareStartTime,informationQuery.getDeclareStartTime1(),informationQuery.getDeclareStartTime2())
+ .between(informationQuery.getDeclareEndTime1()!=null,TDeclareNotice::getDeclareEndTime,informationQuery.getDeclareEndTime1(),informationQuery.getDeclareEndTime2())
+ .orderByDesc(TDeclareNotice::getCreateTime)
+ .page(Page.of(informationQuery.getPageNum(), informationQuery.getPageSize()));
+ }else {
+ page = tDeclareNoticeService.lambdaQuery()
+ .like(!StringUtils.isEmpty(informationQuery.getDeclareNoticeName()), TDeclareNotice::getDeclareNoticeName, informationQuery.getDeclareNoticeName())
+ .eq(informationQuery.getRegionId() != null, TDeclareNotice::getRegionId, informationQuery.getRegionId())
+ .eq(informationQuery.getTechnicalId() != null, TDeclareNotice::getTechnicalId, informationQuery.getTechnicalId())
+ .eq(informationQuery.getMajorId() != null, TDeclareNotice::getMajorId, informationQuery.getMajorId())
+ .eq(informationQuery.getLevel() != null, TDeclareNotice::getLevel, informationQuery.getLevel())
+ .eq(informationQuery.getIsOnline()!=null, TDeclareNotice::getIsOnline, informationQuery.getIsOnline())
+ .between(informationQuery.getDeclareStartTime1()!=null,TDeclareNotice::getDeclareStartTime,informationQuery.getDeclareStartTime1(),informationQuery.getDeclareStartTime2())
+ .between(informationQuery.getDeclareEndTime1()!=null,TDeclareNotice::getDeclareEndTime,informationQuery.getDeclareEndTime1(),informationQuery.getDeclareEndTime2())
+ .orderByDesc(TDeclareNotice::getNoticeSort)
+ .page(Page.of(informationQuery.getPageNum(), informationQuery.getPageSize()));
+ }
for (TDeclareNotice record : page.getRecords()) {
TRegion byId = regionService.getById(record.getRegionId());
@@ -160,6 +176,9 @@
tDeclareNotice.setDeclareNoticeFiles(tDeclareNoticeFiles);
tDeclareNotice.setDeclareNoticeTechnicals(tDeclareNoticeTechnicals);
tDeclareNotice.setDeclareNoticeMajors(tDeclareNoticeMajors);
+ if(StringUtils.isEmpty(tDeclareNotice.getDeclareLevel())){
+ tDeclareNotice.setDeclareLevel(tDeclareNoticeTechnicals.stream().map(TDeclareNoticeTechnical::getLevelName).collect(Collectors.joining("/")));
+ }
return R.ok(tDeclareNotice);
}
--
Gitblit v1.7.1