From 5bf6c3ca9a6c389e4da26131b22bdd2e4dcfa51e Mon Sep 17 00:00:00 2001
From: sinake <sinake1@qq.com>
Date: 星期二, 14 七月 2026 18:36:44 +0800
Subject: [PATCH] 上报短信不用附件
---
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceTransportServiceImpl.java | 17 ++++++++++++++---
1 files changed, 14 insertions(+), 3 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 f846cbb..83dc7c3 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
@@ -43,7 +43,6 @@
LambdaQueryWrapper<ServiceTransport> wrappers = getWrappers(serviceTransport);
// 娣诲姞create_time涓嶄负绌虹殑鏉′欢
wrappers.isNotNull(ServiceTransport::getCreateTime);
-
// 鐒跺悗杩涜鍊掑簭鎺掑簭
wrappers.orderByDesc(ServiceTransport::getCreateTime);
// 鍒涘缓鍒嗛〉瀵硅薄锛岃缃〉鐮佸拰姣忛〉澶у皬
@@ -57,8 +56,7 @@
for (ServiceTransport serviceTransport1 : list) {
ServiceTransportFile serviceTransportFile = new ServiceTransportFile();
serviceTransportFile.setDelFlag(0);
- serviceTransportFile.setTransportId(serviceTransport1.getReportId());
- serviceTransportFile.setCaseNo(serviceTransport1.getCaseNo());
+ serviceTransportFile.setTransportId(serviceTransport1.getId());
List<ServiceTransportFile> serviceTransportFiles = serviceTransportFileService.queryList(serviceTransportFile);
serviceTransport1.setAnnexfilesList(serviceTransportFiles);
@@ -66,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
@@ -156,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