From cbd223ee2185f2cc39267e37a72edaadf6a3aa19 Mon Sep 17 00:00:00 2001
From: sinake <sinake1@qq.com>
Date: 星期三, 18 三月 2026 08:57:12 +0800
Subject: [PATCH] 死亡判定相关接口新增死亡判定说明、扩展 器官分配相关接口新增记录状态、附件、扩展 器官获取相关接口新增附件、扩展 新开发去态查询API接口
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatemaintenanceController.java | 57 +++++++++++++++++++++++++++++++--------------------------
1 files changed, 31 insertions(+), 26 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatemaintenanceController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatemaintenanceController.java
index 7c31ca2..782f80a 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatemaintenanceController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatemaintenanceController.java
@@ -7,13 +7,17 @@
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.PageUtils;
+import com.ruoyi.common.utils.bean.DtoConversionUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.project.domain.ServiceDonatemaintenance;
-import com.ruoyi.project.domain.vo.ServiceDonatemaintenanceVO;
+import com.ruoyi.project.domain.entity.ServiceDonatemaintenanceEntity;
+import com.ruoyi.project.domain.ServiceDonatemaintenanceVO;
+import com.ruoyi.project.domain.dto.MaintenanceBaseInfoDTO;
+import com.ruoyi.project.domain.vo.MaintenanceBaseInfoVO;
import com.ruoyi.project.service.IServiceDonatemaintenanceService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
import java.util.List;
@@ -32,28 +36,24 @@
@Autowired
private IServiceDonatemaintenanceService serviceDonatemaintenanceService;
-// /**
-// * 鏌ヨ渚涗綋缁存姢璁板綍鍒楄〃
-// */
-// @ApiOperation("鏌ヨ渚涗綋缁存姢璁板綍鍒楄〃")
-// // @PreAuthorize("@ss.hasPermi('system:donatemaintenance:list')")
-// @PostMapping("/list")
-// public Map<String, Object> list(@RequestBody ServiceDonatemaintenance serviceDonatemaintenance) {
-// Page<ServiceDonatemaintenance> serviceDonatemaintenancePage = serviceDonatemaintenanceService.queryList(serviceDonatemaintenance);
-// return getDataTable(serviceDonatemaintenancePage.getRecords(), (int) serviceDonatemaintenancePage.getTotal());
-// }
-
- /**
+ /*
* 鏌ヨ渚涗綋缁存姢璁板綍鍒楄〃
*/
@ApiOperation("鑾峰彇渚涗綋缁存姢璁板綍鍩烘湰淇℃伅鍒楄〃")
// @PreAuthorize("@ss.hasPermi('system:donatemaintenance:list')")
@PostMapping("/maintenanceBaseInfoList")
- public Map<String, Object> maintenanceBaseInfoList(@RequestBody ServiceDonatemaintenanceVO serviceDonatemaintenanceVO) {
- Integer offset = PageUtils.getOffset(serviceDonatemaintenanceVO.getPageNum(), serviceDonatemaintenanceVO.getPageSize());
- serviceDonatemaintenanceVO.setPageNum(offset);
- Page serviceDonatemaintenancePage = serviceDonatemaintenanceService.maintenanceBaseInfoList(serviceDonatemaintenanceVO);
- return getDataTable(serviceDonatemaintenancePage.getRecords(), (int) serviceDonatemaintenancePage.getTotal());
+ public Map<String, Object> maintenanceBaseInfoList(@RequestBody MaintenanceBaseInfoVO maintenanceBaseInfoVO) {
+ Integer offset = PageUtils.getOffset(maintenanceBaseInfoVO.getPageNum(), maintenanceBaseInfoVO.getPageSize());
+ maintenanceBaseInfoVO.setPageNum(offset);
+ List<MaintenanceBaseInfoDTO> maintenanceBaseInfoDTOS = serviceDonatemaintenanceService.maintenanceBaseInfoList(maintenanceBaseInfoVO);
+
+ //鑾峰彇鎬绘暟
+ maintenanceBaseInfoVO.setPageNum(null);
+ maintenanceBaseInfoVO.setPageSize(null);
+ Integer totalCount = 0;
+ List<MaintenanceBaseInfoDTO> total = serviceDonatemaintenanceService.maintenanceBaseInfoList(maintenanceBaseInfoVO);
+ if (!CollectionUtils.isEmpty(total)) totalCount = total.size();
+ return getDataTable(maintenanceBaseInfoDTOS, totalCount);
}
/**
@@ -63,10 +63,11 @@
// @PreAuthorize("@ss.hasPermi('system:donatemaintenance:export')")
@Log(title = "渚涗綋缁存姢璁板綍", businessType = BusinessType.EXPORT)
@GetMapping("/export")
- public AjaxResult export(ServiceDonatemaintenance serviceDonatemaintenance) {
- Page<ServiceDonatemaintenance> serviceDonatemaintenancePage = serviceDonatemaintenanceService.queryList(serviceDonatemaintenance);
- List<ServiceDonatemaintenance> list = serviceDonatemaintenancePage.getRecords();
- ExcelUtil<ServiceDonatemaintenance> util = new ExcelUtil<ServiceDonatemaintenance>(ServiceDonatemaintenance.class);
+ public AjaxResult export(ServiceDonatemaintenanceVO serviceDonatemaintenanceVO) {
+ ServiceDonatemaintenanceEntity serviceDonatemaintenance = DtoConversionUtils.sourceToTarget(serviceDonatemaintenanceVO, ServiceDonatemaintenanceEntity.class);
+ Page<ServiceDonatemaintenanceEntity> serviceDonatemaintenancePage = serviceDonatemaintenanceService.queryList(serviceDonatemaintenance);
+ List<ServiceDonatemaintenanceEntity> list = serviceDonatemaintenancePage.getRecords();
+ ExcelUtil<ServiceDonatemaintenanceEntity> util = new ExcelUtil<ServiceDonatemaintenanceEntity>(ServiceDonatemaintenanceEntity.class);
return util.exportExcel(list, "渚涗綋缁存姢璁板綍鏁版嵁");
}
@@ -88,7 +89,9 @@
@Log(title = "渚涗綋缁存姢璁板綍", businessType = BusinessType.INSERT)
@PostMapping("/add")
@RepeatSubmit
- public AjaxResult add(@RequestBody ServiceDonatemaintenance serviceDonatemaintenance) {
+ public AjaxResult add(@RequestBody ServiceDonatemaintenanceVO serviceDonatemaintenanceVO) {
+ ServiceDonatemaintenanceEntity serviceDonatemaintenance = DtoConversionUtils.sourceToTarget(serviceDonatemaintenanceVO, ServiceDonatemaintenanceEntity.class);
+ serviceDonatemaintenance.setItemDesc(serviceDonatemaintenanceVO.getItemDesc().toString());
return toAjax(serviceDonatemaintenanceService.save(serviceDonatemaintenance));
}
@@ -100,7 +103,9 @@
@Log(title = "渚涗綋缁存姢璁板綍", businessType = BusinessType.UPDATE)
@PostMapping("/edit")
@RepeatSubmit
- public AjaxResult edit(@RequestBody ServiceDonatemaintenance serviceDonatemaintenance) {
+ public AjaxResult edit(@RequestBody ServiceDonatemaintenanceVO serviceDonatemaintenanceVO) {
+ ServiceDonatemaintenanceEntity serviceDonatemaintenance = DtoConversionUtils.sourceToTarget(serviceDonatemaintenanceVO, ServiceDonatemaintenanceEntity.class);
+ serviceDonatemaintenance.setItemDesc(serviceDonatemaintenanceVO.getItemDesc().toString());
return toAjax(serviceDonatemaintenanceService.updateById(serviceDonatemaintenance));
}
@@ -112,7 +117,7 @@
@Log(title = "渚涗綋缁存姢璁板綍", businessType = BusinessType.DELETE)
@GetMapping("/remove/{id}")
public AjaxResult remove(@PathVariable Long id) {
- ServiceDonatemaintenance serviceDonatemaintenance = new ServiceDonatemaintenance();
+ ServiceDonatemaintenanceEntity serviceDonatemaintenance = new ServiceDonatemaintenanceEntity();
serviceDonatemaintenance.setId(id);
serviceDonatemaintenance.setDelFlag(1);
return toAjax(serviceDonatemaintenanceService.updateById(serviceDonatemaintenance));
--
Gitblit v1.9.3