From b6dd47b05107fc36d8ff4f7f29a4446521f95503 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期四, 02 一月 2025 18:44:28 +0800
Subject: [PATCH] 代码提交
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatecomporganController.java | 25 +++++++++++++------------
1 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatecomporganController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatecomporganController.java
index a0ae668..9d4e17c 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatecomporganController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatecomporganController.java
@@ -8,7 +8,6 @@
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.exception.base.BaseException;
import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.project.domain.ServiceDonatecompletioninfo;
import com.ruoyi.project.domain.ServiceDonatecomporgan;
import com.ruoyi.project.service.IServiceDonatecomporganService;
import io.swagger.annotations.Api;
@@ -16,7 +15,6 @@
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
import java.util.Arrays;
@@ -40,7 +38,7 @@
* 鏌ヨ鎹愮尞鍣ㄥ畼绉绘鍒楄〃
*/
@ApiOperation("鏌ヨ鎹愮尞鍣ㄥ畼绉绘鍒楄〃")
- // @PreAuthorize("@ss.hasPermi('project:donatecomporgan:list')")
+ // // @PreAuthorize("@ss.hasPermi('project:donatecomporgan:list')")
@GetMapping("/list")
public TableDataInfo list(ServiceDonatecomporgan serviceDonatecomporgan) {
startPage();
@@ -52,7 +50,7 @@
* 瀵煎嚭鎹愮尞鍣ㄥ畼绉绘鍒楄〃
*/
@ApiOperation("瀵煎嚭鎹愮尞鍣ㄥ畼绉绘鍒楄〃")
- // @PreAuthorize("@ss.hasPermi('project:donatecomporgan:export')")
+ // // @PreAuthorize("@ss.hasPermi('project:donatecomporgan:export')")
@Log(title = "鎹愮尞鍣ㄥ畼绉绘", businessType = BusinessType.EXPORT)
@GetMapping("/export")
public AjaxResult export(ServiceDonatecomporgan serviceDonatecomporgan) {
@@ -65,7 +63,7 @@
* 鑾峰彇鎹愮尞鍣ㄥ畼绉绘璇︾粏淇℃伅
*/
@ApiOperation("鑾峰彇鎹愮尞鍣ㄥ畼绉绘璇︾粏淇℃伅")
- // @PreAuthorize("@ss.hasPermi('project:donatecomporgan:query')")
+ // // @PreAuthorize("@ss.hasPermi('project:donatecomporgan:query')")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id) {
return AjaxResult.success(serviceDonatecomporganService.getById(id));
@@ -75,7 +73,7 @@
* 鏂板鎹愮尞鍣ㄥ畼绉绘
*/
@ApiOperation("鏂板鎹愮尞鍣ㄥ畼绉绘")
- // @PreAuthorize("@ss.hasPermi('project:donatecomporgan:add')")
+ // // @PreAuthorize("@ss.hasPermi('project:donatecomporgan:add')")
@Log(title = "鎹愮尞鍣ㄥ畼绉绘", businessType = BusinessType.INSERT)
@PostMapping("/add")
@RepeatSubmit
@@ -88,7 +86,7 @@
* 淇敼鎹愮尞鍣ㄥ畼绉绘
*/
@ApiOperation("淇敼鎹愮尞鍣ㄥ畼绉绘")
- // @PreAuthorize("@ss.hasPermi('project:donatecomporgan:edit')")
+ // // @PreAuthorize("@ss.hasPermi('project:donatecomporgan:edit')")
@Log(title = "鎹愮尞鍣ㄥ畼绉绘", businessType = BusinessType.UPDATE)
@PostMapping("/edit")
@RepeatSubmit
@@ -100,17 +98,14 @@
* 鍒犻櫎鎹愮尞鍣ㄥ畼绉绘
*/
@ApiOperation("鍒犻櫎鎹愮尞鍣ㄥ畼绉绘")
- // @PreAuthorize("@ss.hasPermi('project:donatecomporgan:remove')")
+ // // @PreAuthorize("@ss.hasPermi('project:donatecomporgan:remove')")
@Log(title = "鎹愮尞鍣ㄥ畼绉绘", businessType = BusinessType.DELETE)
@GetMapping("/remove/{ids}")
public AjaxResult remove(@PathVariable Long[] ids) {
return toAjax(serviceDonatecomporganService.removeByIds(Arrays.asList(ids)));
}
-
- @RepeatSubmit
@ApiOperation("鏂板鎴栦慨鏀规崘鐚櫒瀹樼Щ妞�")
- @Log(title = "鎹愮尞瀹屾垚", businessType = BusinessType.UPDATE)
@PostMapping("/saveOrUpdateDonatecomporgan")
public AjaxResult saveOrUpdateDonatecomporgan(@RequestBody List<ServiceDonatecomporgan> serviceDonatecomporganList) {
if (CollectionUtils.isEmpty(serviceDonatecomporganList)) {
@@ -119,9 +114,15 @@
Boolean i = null;
for (ServiceDonatecomporgan serviceDonatecompletion : serviceDonatecomporganList) {
log.info("鎹愮尞鍣ㄥ畼绉绘id鏄惁涓虹┖ : {},鍩虹琛ㄧ殑id涓� : {}", serviceDonatecompletion.getId(), serviceDonatecompletion.getInfoid());
- if (serviceDonatecompletion.getId() == null) {
+ ServiceDonatecomporgan sd = new ServiceDonatecomporgan();
+ sd.setInfoid(serviceDonatecompletion.getInfoid());
+ sd.setOrganno(serviceDonatecompletion.getOrganno());
+ sd.setDel_flag(0);
+ List<ServiceDonatecomporgan> serviceDonatecomporgans = serviceDonatecomporganService.queryList(sd);
+ if (serviceDonatecompletion.getId() == null && CollectionUtils.isEmpty(serviceDonatecomporgans)) {
i = serviceDonatecomporganService.save(serviceDonatecompletion);
} else {
+ serviceDonatecompletion.setId(serviceDonatecomporgans.get(0).getId());
i = serviceDonatecomporganService.updateById(serviceDonatecompletion);
}
}
--
Gitblit v1.9.3