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 | 19 ++++++++++++++-----
1 files changed, 14 insertions(+), 5 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 ce38fdf..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,19 +14,21 @@
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;
-import com.sun.org.apache.bcel.internal.generic.NEW;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.collections4.CollectionUtils;
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;
@@ -36,7 +38,7 @@
* @author ruoyi
* @date 2025-12-15
*/
-@Api(description = "鎹愮尞涓婃姤鍩虹")
+@Api(description = "鎹愮尞涓婃姤鍩虹",tags={"鎹愮尞涓婃姤"})
@RestController
@RequestMapping("/project/donatebaseinforeport")
public class ServiceDonatebaseinfoReportController extends BaseController {
@@ -48,13 +50,16 @@
private ISysConfigService sysConfigService;
@Autowired
private IVUserOrgService vUserOrgService;
+ @Autowired
+ private IServiceTransportService serviceTransport;
+
/**
* 鏌ヨ鎹愮尞涓婃姤鍩虹鍒楄〃
*/
@ApiOperation("鏌ヨ鎹愮尞涓婃姤鍩虹鍒楄〃")
@PostMapping("/list")
- public Map<String, Object> list(ServiceDonatebaseinfoReport serviceDonatebaseinfoReport) {
+ public Map<String, Object> list(@RequestBody ServiceDonatebaseinfoReport serviceDonatebaseinfoReport) {
Page<ServiceDonatebaseinfoReport> serviceDonatebaseinfoReportPage = serviceDonatebaseinfoReportService.queryList(serviceDonatebaseinfoReport);
return getDataTable(serviceDonatebaseinfoReportPage.getRecords(), (int) serviceDonatebaseinfoReportPage.getTotal());
}
@@ -64,7 +69,7 @@
*/
@ApiOperation("鑾峰彇鍚勭被鍨嬬殑鎬绘暟")
@PostMapping("/getTotal")
- public Map<String, Object> getTotal(ServiceDonatebaseinfoReport serviceDonatebaseinfoReport) {
+ public Map<String, Object> getTotal(@RequestBody ServiceDonatebaseinfoReport serviceDonatebaseinfoReport) {
//鍘婚厤缃枃浠朵腑锛岃幏鍙栦笂鎶ョ被鍨�
SysConfig config = new SysConfig();
config.setConfigKey("sys.report.type");
@@ -104,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);
}
@@ -133,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