From 598fb8a0f390e99c332b68c539b43d62a1db3dd6 Mon Sep 17 00:00:00 2001
From: sinake <sinake1@qq.com>
Date: 星期五, 24 四月 2026 11:07:55 +0800
Subject: [PATCH] API通用接口
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatebaseinfoReportController.java | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatebaseinfoReportController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatebaseinfoReportController.java
index 7796d1d..2373c8f 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatebaseinfoReportController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatebaseinfoReportController.java
@@ -14,9 +14,11 @@
import com.ruoyi.project.common.IdGeneratorUtils;
import com.ruoyi.project.domain.ServiceDonatebaseinfoReport;
import com.ruoyi.project.domain.ServiceDonatebaseinfoReportFile;
+import com.ruoyi.project.domain.ServiceTransport;
import com.ruoyi.project.domain.VUserOrg;
import com.ruoyi.project.service.IServiceDonatebaseinfoReportFileService;
import com.ruoyi.project.service.IServiceDonatebaseinfoReportService;
+import com.ruoyi.project.service.IServiceTransportService;
import com.ruoyi.project.service.IVUserOrgService;
import com.ruoyi.system.domain.SysConfig;
import com.ruoyi.system.service.ISysConfigService;
@@ -26,6 +28,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -35,7 +38,7 @@
* @author ruoyi
* @date 2025-12-15
*/
-@Api(description = "鎹愮尞涓婃姤鍩虹")
+@Api(description = "鎹愮尞涓婃姤鍩虹",tags={"鎹愮尞涓婃姤"})
@RestController
@RequestMapping("/project/donatebaseinforeport")
public class ServiceDonatebaseinfoReportController extends BaseController {
@@ -47,6 +50,9 @@
private ISysConfigService sysConfigService;
@Autowired
private IVUserOrgService vUserOrgService;
+ @Autowired
+ private IServiceTransportService serviceTransport;
+
/**
* 鏌ヨ鎹愮尞涓婃姤鍩虹鍒楄〃
@@ -103,6 +109,10 @@
serviceDonatebaseinfoReportFile.setDelFlag(0);
List<ServiceDonatebaseinfoReportFile> serviceDonatebaseinfoReportFiles = serviceDonatebaseinfoReportFileService.queryList(serviceDonatebaseinfoReportFile);
serviceDonatebaseinfoReport.setAnnexfilesList(serviceDonatebaseinfoReportFiles);
+ Map<String,Object> transportMap=new HashMap<>();
+ transportMap.put("report_id",serviceDonatebaseinfoReport.getId());
+ List<ServiceTransport> transports= serviceTransport.listByMap(transportMap);
+ serviceDonatebaseinfoReport.setServiceTransport(transports);
return AjaxResult.success(serviceDonatebaseinfoReport);
}
@@ -132,7 +142,7 @@
boolean save = serviceDonatebaseinfoReportService.save(serviceDonatebaseinfoReport);
//灏嗙敓鎴愮殑鏂囦欢鍦板潃瀛樺偍鍒版暟鎹簱涓�
if (save)
- serviceDonatebaseinfoReportFileService.addList(serviceDonatebaseinfoReport.getAnnexfilesList(), serviceDonatebaseinfoReport.getCaseNo(), getNickName());
+ serviceDonatebaseinfoReportFileService.addList(serviceDonatebaseinfoReport.getAnnexfilesList(), serviceDonatebaseinfoReport.getCaseNo(), getNickName(), serviceDonatebaseinfoReport.getId());
return toAjax(save);
}
--
Gitblit v1.9.3