From 9822e79febb5f30635035dc13538ce36a09d92e1 Mon Sep 17 00:00:00 2001
From: sinake <sinake1@qq.com>
Date: 星期五, 16 十月 2026 15:24:17 +0800
Subject: [PATCH] 转运单上报案例列表排序调整
---
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceTransportServiceImpl.java | 20 ++++++++++++++++++--
1 files changed, 18 insertions(+), 2 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 c666474..af1bbd2 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
@@ -10,6 +10,7 @@
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,7 +44,7 @@
// 娣诲姞create_time涓嶄负绌虹殑鏉′欢
wrappers.isNotNull(ServiceTransport::getCreateTime);
// 鐒跺悗杩涜鍊掑簭鎺掑簭
- wrappers.orderByDesc(ServiceTransport::getCreateTime);
+ wrappers.orderByDesc(ServiceTransport::getTransportStartTime);
// 鍒涘缓鍒嗛〉瀵硅薄锛岃缃〉鐮佸拰姣忛〉澶у皬
int currentPage = (serviceTransport.getPageNum() == null || serviceTransport.getPageNum() < 1) ? 1 : serviceTransport.getPageNum();
int size = (serviceTransport.getPageSize() == null || serviceTransport.getPageSize() < 1) ? 10 : serviceTransport.getPageSize();
@@ -56,7 +57,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);
@@ -64,6 +64,16 @@
}
page.setRecords(list);
return page;
+ }
+ /**
+ * 鏌ヨ渚涜�呰浆杩愮櫥璁板垪琛�
+ *
+ * @param serviceTransport 渚涜�呰浆杩愮櫥璁�
+ * @return 渚涜�呰浆杩愮櫥璁�
+ */
+ @Override
+ public List<Map<String,Object>> totalState(ServiceTransport serviceTransport) {
+ return ServiceTransportMapper.totalState(serviceTransport);
}
@Override
@@ -88,6 +98,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());
}
@@ -151,6 +164,9 @@
if (StringUtils.isNotBlank(serviceTransport.getIcuDoctorPhone())) {
wrappers.eq(ServiceTransport::getIcuDoctorPhone, serviceTransport.getIcuDoctorPhone());
}
+ if (StringUtils.isNotBlank(serviceTransport.getNotAdminId())) {
+ wrappers.eq(ServiceTransport::getCreateBy, serviceTransport.getNotAdminId());
+ }
return wrappers;
}
--
Gitblit v1.9.3