From c121dc8d2d5b56c17efe7e53e7ef3505387169c7 Mon Sep 17 00:00:00 2001
From: sinake <sinake1@qq.com>
Date: 星期四, 21 五月 2026 15:27:43 +0800
Subject: [PATCH] 转运附件数据不对
---
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceTransportFileServiceImpl.java | 6 +++---
ruoyi-project/src/main/resources/mapper/project/ServiceDonatecompletioninfoMapper.xml | 3 ++-
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceTransportServiceImpl.java | 1 -
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceTransportController.java | 5 ++---
4 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceTransportController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceTransportController.java
index c235d7d..d444ab8 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceTransportController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceTransportController.java
@@ -72,8 +72,7 @@
//琛ュ厖 闄勪欢
ServiceTransportFile serviceTransportFile = new ServiceTransportFile();
serviceTransportFile.setDelFlag(0);
- serviceTransportFile.setTransportId(transport.getReportId());
- serviceTransportFile.setCaseNo(transport.getCaseNo());
+ serviceTransportFile.setTransportId(transport.getId());
List<ServiceTransportFile> serviceTransportFiles = serviceTransportFileService.queryList(serviceTransportFile);
transport.setAnnexfilesList(serviceTransportFiles);
}
@@ -107,7 +106,7 @@
public AjaxResult edit(@RequestBody ServiceTransport serviceTransport) {
boolean b = serviceTransportService.updateById(serviceTransport);
if (b) {
- serviceTransportFileService.updateList(serviceTransport.getAnnexfilesList(), serviceTransport.getReportId(), serviceTransport.getCaseNo(), getNickName());
+ serviceTransportFileService.updateList(serviceTransport.getAnnexfilesList(), serviceTransport.getId(), serviceTransport.getCaseNo(), getNickName());
}
return toAjax(b);
}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceTransportFileServiceImpl.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceTransportFileServiceImpl.java
index 09e782c..aef9bcd 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceTransportFileServiceImpl.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceTransportFileServiceImpl.java
@@ -77,9 +77,9 @@
@Transactional(rollbackFor = Exception.class)
@Override
- public Boolean updateList(List<ServiceTransportFile> annexfilesList, Long reportId,String caseNo,String updateName) {
+ public Boolean updateList(List<ServiceTransportFile> annexfilesList, Long transportId,String caseNo,String updateName) {
// 鍏堝皢鏁版嵁鏌ュ嚭鏉�
- List<ServiceTransportFile> list = list(new LambdaQueryWrapper<ServiceTransportFile>().eq(ServiceTransportFile::getTransportId, reportId));
+ List<ServiceTransportFile> list = list(new LambdaQueryWrapper<ServiceTransportFile>().eq(ServiceTransportFile::getTransportId, transportId));
// 鎻愬彇鐜版湁璁板綍鐨勮矾寰勯泦鍚堬紝鐢ㄤ簬楂樻晥姣旇緝
Set<String> existingPaths = list.stream().map(file -> file.getFileName() != null ? file.getPath().trim() : "").filter(StringUtils::isNotEmpty).collect(Collectors.toSet());
@@ -103,7 +103,7 @@
for (ServiceTransportFile serviceTransportFile : annexfilesList) {
if (StringUtils.isNotEmpty(serviceTransportFile.getFileName()) && !existingPaths.contains(serviceTransportFile.getFileName().trim())) {
serviceTransportFile.setId(null);
- serviceTransportFile.setTransportId(reportId);
+ serviceTransportFile.setTransportId(transportId);
serviceTransportFile.setCreateBy(updateName);
serviceTransportFile.setUpdateTime(new Date());
result &= save(serviceTransportFile);
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 4c2c8d1..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
@@ -58,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);
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceDonatecompletioninfoMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceDonatecompletioninfoMapper.xml
index 33156c6..51fb2f7 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceDonatecompletioninfoMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceDonatecompletioninfoMapper.xml
@@ -209,7 +209,8 @@
sdc.AssessAnnex AS assessannex,
sdc.DonateOrgan AS donateorgan,
sdc.complete_state as completeState,
- sdc.signfamilyrelations
+ sdc.signfamilyrelations,
+ sdc.relationname
FROM
service_donatebaseinfo sd
LEFT JOIN service_donatecompletioninfo sdc ON sd.ID = sdc.InfoID
--
Gitblit v1.9.3