From 19b8481dd1b30368f97a2a983f61ff93a340a98c Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 10 十一月 2023 18:28:20 +0800
Subject: [PATCH] 代码提交
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonateorganController.java | 85 +++++++++++++++++++++++++++++-------------
1 files changed, 59 insertions(+), 26 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonateorganController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonateorganController.java
index faef426..99a3912 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonateorganController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonateorganController.java
@@ -1,36 +1,28 @@
package com.ruoyi.web.controller.project;
-import java.util.Arrays;
-import java.util.List;
-
-import com.ruoyi.project.domain.BaseOrganization;
-import com.ruoyi.project.domain.ServiceDonatebaseinfo;
-import com.ruoyi.project.domain.vo.DonateOrganVO;
-import com.ruoyi.project.domain.vo.NumberOfOrgans;
-import com.ruoyi.project.domain.vo.TimeVO;
-import com.ruoyi.project.mapper.BaseOrganizationMapper;
-import com.ruoyi.project.service.IServiceDonatebaseinfoService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.annotation.RepeatSubmit;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.project.domain.ServiceDonateorgan;
-import com.ruoyi.project.service.IServiceDonateorganService;
-import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.bean.DtoConversionUtils;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.project.domain.ServiceDonateorgan;
+import com.ruoyi.project.domain.ServiceDonateorganVO;
+import com.ruoyi.project.domain.ServiceOrganallocation;
+import com.ruoyi.project.domain.vo.DonateOrganVO;
+import com.ruoyi.project.domain.vo.TimeVO;
+import com.ruoyi.project.service.IServiceDonateorganService;
+import com.ruoyi.project.service.IServiceOrganallocationService;
+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.Arrays;
+import java.util.List;
/**
* 鎹愮尞鍣ㄥ畼绠＄悊Controller
@@ -45,6 +37,9 @@
@Autowired
private IServiceDonateorganService serviceDonateorganService;
+ @Autowired
+ private IServiceOrganallocationService serviceOrganallocationService;
+
/**
* 鏌ヨ鎹愮尞鍣ㄥ畼绠＄悊鍒楄〃
@@ -55,6 +50,17 @@
public TableDataInfo list(ServiceDonateorgan serviceDonateorgan) {
startPage();
List<ServiceDonateorgan> list = serviceDonateorganService.queryList(serviceDonateorgan);
+ if (!CollectionUtils.isEmpty(list)) {
+ List<ServiceDonateorganVO> serviceDonateorganVOS = DtoConversionUtils.sourceToTarget(list, ServiceDonateorganVO.class);
+// for (ServiceDonateorganVO serviceDonateorganVO : serviceDonateorganVOS) {
+// ServiceOrganallocation serviceOrganallocation = new ServiceOrganallocation();
+// serviceOrganallocation.setOrganid(serviceDonateorganVO.getId());
+// List<ServiceOrganallocation> serviceOrganallocations = serviceOrganallocationService.selectServiceOrganallocationList(serviceOrganallocation);
+// serviceDonateorganVO.setServiceOrganallocations(serviceOrganallocations);
+// }
+ return getDataTable(serviceDonateorganVOS);
+ }
+
return getDataTable(list);
}
@@ -113,6 +119,33 @@
return toAjax(serviceDonateorganService.save(serviceDonateorgan));
}
+
+ /**
+ * 鏂板鎹愮尞鍣ㄥ畼绠＄悊
+ */
+ @ApiOperation("鏂板鎹愮尞鍣ㄥ畼淇℃伅")
+ //@PreAuthorize("@ss.hasPermi('project:donateorgan:add')")
+ @Log(title = "鎹愮尞鍣ㄥ畼绠＄悊", businessType = BusinessType.INSERT)
+ @PostMapping("/addData")
+ @RepeatSubmit
+ public TableDataInfo addData(@RequestBody List<ServiceDonateorgan> serviceDonateorgans) {
+ List<ServiceDonateorgan> serviceDonateorgans1 = serviceDonateorganService.saveData(serviceDonateorgans);
+ return saveDataTable(serviceDonateorgans1);
+ }
+
+
+ /**
+ * 淇敼鍣ㄥ畼鍒嗛厤
+ */
+ @ApiOperation("淇敼鍣ㄥ畼鍒嗛厤淇℃伅")
+ //@PreAuthorize("@ss.hasPermi('project:organallocation:edit')")
+ @Log(title = "鍣ㄥ畼鍒嗛厤", businessType = BusinessType.UPDATE)
+ @PostMapping("/editarraydata")
+ @RepeatSubmit
+ public AjaxResult editArrayData(@RequestBody List<ServiceDonateorgan> serviceDonateorgans) {
+ return AjaxResult.success(serviceDonateorganService.editArrayData(serviceDonateorgans));
+ }
+
/**
* 淇敼鎹愮尞鍣ㄥ畼绠＄悊
*/
--
Gitblit v1.9.3