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/TCommitteeController.java | 33 +++++++++++++++++++++++----------
1 files changed, 23 insertions(+), 10 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 e35db69..77047a8 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
@@ -93,18 +93,31 @@
return R.ok();
}
//列表
- @ApiOperation(value = "查询",tags = {"后台-评审委员会管理","web-评审委员会"})
+ @ApiOperation(value = "查询",tags = {"后台-评审委员会管理"})
@PostMapping("/list")
public R<Page<TCommittee>> list(@RequestBody CommitteeQuery informationQuery){
- Page<TCommittee> page = tCommitteeService.lambdaQuery()
- .like(!StringUtils.isEmpty(informationQuery.getName()), TCommittee::getCommitteeName, informationQuery.getName())
- .like(!StringUtils.isEmpty(informationQuery.getCommitteeUnit()), TCommittee::getCommitteeLevel, informationQuery.getCommitteeUnit())
- .eq(informationQuery.getRegionId() != null, TCommittee::getRegionId, informationQuery.getRegionId())
- .eq(informationQuery.getTechnicalId() != null, TCommittee::getTechnicalId, informationQuery.getTechnicalId())
- .eq(informationQuery.getMajorId() != null, TCommittee::getMajorId, informationQuery.getMajorId())
- .eq(informationQuery.getLevel() != null, TCommittee::getLevel, informationQuery.getLevel())
- .orderByDesc(TCommittee::getCommitteeSort)
- .page(Page.of(informationQuery.getPageNum(), informationQuery.getPageSize()));
+ Page<TCommittee> page;
+ if(informationQuery.getSortType() == 1){
+ page = tCommitteeService.lambdaQuery()
+ .like(!StringUtils.isEmpty(informationQuery.getName()), TCommittee::getCommitteeName, informationQuery.getName())
+ .like(!StringUtils.isEmpty(informationQuery.getCommitteeUnit()), TCommittee::getCommitteeUnit, informationQuery.getCommitteeUnit())
+ .eq(informationQuery.getRegionId() != null, TCommittee::getRegionId, informationQuery.getRegionId())
+ .eq(informationQuery.getTechnicalId() != null, TCommittee::getTechnicalId, informationQuery.getTechnicalId())
+ .eq(informationQuery.getMajorId() != null, TCommittee::getMajorId, informationQuery.getMajorId())
+ .eq(informationQuery.getLevel() != null, TCommittee::getLevel, informationQuery.getLevel())
+ .orderByDesc(TCommittee::getCreateTime)
+ .page(Page.of(informationQuery.getPageNum(), informationQuery.getPageSize()));
+ }else {
+ page = tCommitteeService.lambdaQuery()
+ .like(!StringUtils.isEmpty(informationQuery.getName()), TCommittee::getCommitteeName, informationQuery.getName())
+ .like(!StringUtils.isEmpty(informationQuery.getCommitteeUnit()), TCommittee::getCommitteeUnit, informationQuery.getCommitteeUnit())
+ .eq(informationQuery.getRegionId() != null, TCommittee::getRegionId, informationQuery.getRegionId())
+ .eq(informationQuery.getTechnicalId() != null, TCommittee::getTechnicalId, informationQuery.getTechnicalId())
+ .eq(informationQuery.getMajorId() != null, TCommittee::getMajorId, informationQuery.getMajorId())
+ .eq(informationQuery.getLevel() != null, TCommittee::getLevel, informationQuery.getLevel())
+ .orderByDesc(TCommittee::getCommitteeSort)
+ .page(Page.of(informationQuery.getPageNum(), informationQuery.getPageSize()));
+ }
for (TCommittee record : page.getRecords()) {
TRegion byId = regionService.getById(record.getRegionId());
--
Gitblit v1.7.1