From 2a3af1e765722cae585967c0010d90acef077aee Mon Sep 17 00:00:00 2001
From: sinake <sinake1@qq.com>
Date: 星期一, 25 五月 2026 17:41:54 +0800
Subject: [PATCH] 捐献基础表新增归档时间 捐献亲属确认表新增其他亲属 供体维护记录新增住院号排序，新增年龄区间、入院区间，协调员查询 捐献亲属确认修改住院号排序 医学评估表新增住院号排序，新增评估时间区间查询 患者死亡信息增住院号排序，新增死亡时间区间查询 伦理审查发起表增住院号排序，新增发起时间区间查询 捐献器官分配基础表表增住院号排序，新增分配状态，分配时间区间查询 捐献完成表增住院号排序，新增分配状态查询
---
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceTransportServiceImpl.java | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceTransportServiceImpl.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceTransportServiceImpl.java
index e6268d1..f457903 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceTransportServiceImpl.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceTransportServiceImpl.java
@@ -6,13 +6,11 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.project.domain.ServiceDonatebaseinfoReport;
-import com.ruoyi.project.domain.ServiceDonatebaseinfoReportFile;
-import com.ruoyi.project.domain.ServiceTransport;
-import com.ruoyi.project.domain.ServiceTransportFile;
+import com.ruoyi.project.domain.*;
import com.ruoyi.project.mapper.ServiceTransportMapper;
import com.ruoyi.project.service.IServiceTransportFileService;
import com.ruoyi.project.service.IServiceTransportService;
+import org.apache.commons.lang3.ObjectUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -43,6 +41,11 @@
@Override
public Page<ServiceTransport> queryList(ServiceTransport serviceTransport) {
LambdaQueryWrapper<ServiceTransport> wrappers = getWrappers(serviceTransport);
+ // 娣诲姞create_time涓嶄负绌虹殑鏉′欢
+ wrappers.isNotNull(ServiceTransport::getCreateTime);
+
+ // 鐒跺悗杩涜鍊掑簭鎺掑簭
+ wrappers.orderByDesc(ServiceTransport::getCreateTime);
// 鍒涘缓鍒嗛〉瀵硅薄锛岃缃〉鐮佸拰姣忛〉澶у皬
int currentPage = (serviceTransport.getPageNum() == null || serviceTransport.getPageNum() < 1) ? 1 : serviceTransport.getPageNum();
int size = (serviceTransport.getPageSize() == null || serviceTransport.getPageSize() < 1) ? 10 : serviceTransport.getPageSize();
@@ -55,7 +58,6 @@
ServiceTransportFile serviceTransportFile = new ServiceTransportFile();
serviceTransportFile.setDelFlag(0);
serviceTransportFile.setTransportId(serviceTransport1.getId());
- serviceTransportFile.setCaseNo(serviceTransport1.getCaseNo());
List<ServiceTransportFile> serviceTransportFiles = serviceTransportFileService.queryList(serviceTransportFile);
serviceTransport1.setAnnexfilesList(serviceTransportFiles);
@@ -87,6 +89,9 @@
private LambdaQueryWrapper<ServiceTransport> getWrappers(ServiceTransport serviceTransport) {
LambdaQueryWrapper<ServiceTransport> wrappers = Wrappers.lambdaQuery();
+ if (ObjectUtils.isNotEmpty(serviceTransport.getId() )) {
+ wrappers.eq(ServiceTransport::getId, serviceTransport.getId());
+ }
if (serviceTransport.getReportId() != null) {
wrappers.eq(ServiceTransport::getReportId, serviceTransport.getReportId());
}
--
Gitblit v1.9.3