From 1163e4b9013274aeb57562fbd9346be1db3299d9 Mon Sep 17 00:00:00 2001
From: sinake <sinake1@qq.com>
Date: 星期三, 22 四月 2026 17:27:51 +0800
Subject: [PATCH] 修改捐献上报基础ID未保存
---
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceTransportServiceImpl.java | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 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..4c2c8d1 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();
@@ -87,6 +90,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