From 4c967fe5bdc96af202c53b63f64f6a23e9599e05 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期二, 20 二月 2024 11:21:17 +0800
Subject: [PATCH] 修改判断
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatecompletioninfoController.java | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 54 insertions(+), 3 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatecompletioninfoController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatecompletioninfoController.java
index b3309fa..0c1532c 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatecompletioninfoController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatecompletioninfoController.java
@@ -1,7 +1,6 @@
package com.ruoyi.web.controller.project;
import com.ruoyi.common.annotation.Log;
-import com.ruoyi.common.annotation.NotRepeatCommit;
import com.ruoyi.common.annotation.RepeatSubmit;
import com.ruoyi.common.config.RuoYiConfig;
import com.ruoyi.common.core.controller.BaseController;
@@ -9,11 +8,13 @@
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.enums.OrganEnum;
+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.ServiceDonateorgan;
import com.ruoyi.project.domain.vo.DonationCompletionVO;
import com.ruoyi.project.service.IServiceDonatecompletioninfoService;
+import com.ruoyi.project.service.IServiceDonatecomporganService;
import com.ruoyi.project.service.IServiceDonateorganService;
import freemarker.template.Configuration;
import freemarker.template.Template;
@@ -46,6 +47,9 @@
@Autowired
private IServiceDonateorganService serviceDonateorganService;
+
+ @Autowired
+ private IServiceDonatecomporganService serviceDonatecomporganService;
private static Configuration configuration = null;
@@ -109,12 +113,58 @@
@ApiOperation("鏂板鎹愮尞瀹屾垚")
//@PreAuthorize("@ss.hasPermi('project:donatecompletioninfo:add')")
@Log(title = "鎹愮尞瀹屾垚", businessType = BusinessType.INSERT)
- @PostMapping
+ @PostMapping("/add")
@RepeatSubmit(interval = 5000)
public AjaxResult add(@RequestBody ServiceDonatecompletioninfo serviceDonatecompletioninfo) {
log.info("鏂板鎹愮尞瀹屾垚锛歿}", serviceDonatecompletioninfo);
serviceDonatecompletioninfoService.delDuplicateDonateCompletioninfo(serviceDonatecompletioninfo.getInfoid(), serviceDonatecompletioninfo.getCreateBy());
- return toAjax(serviceDonatecompletioninfoService.save(serviceDonatecompletioninfo));
+ boolean save = serviceDonatecompletioninfoService.save(serviceDonatecompletioninfo);
+ log.info("鏂板鎹愮尞瀹屾垚serviceDonatecompletioninfo鐨処D锛歿}", serviceDonatecompletioninfo.getId());
+ return AjaxResult.success(serviceDonatecompletioninfo);
+ }
+
+// /**
+// * 鏂板鎹愮尞瀹屾垚璇︽儏
+// */
+// @ApiOperation("鏂板鎹愮尞瀹屾垚璇︽儏")
+// //@PreAuthorize("@ss.hasPermi('project:donatecompletioninfo:add')")
+// @Log(title = "鏂板鎹愮尞瀹屾垚璇︽儏", businessType = BusinessType.INSERT)
+// @PostMapping
+// @RepeatSubmit(interval = 5000)
+// public AjaxResult addDetail(@RequestBody ServiceDonatecompletioninfo serviceDonatecompletioninfo) {
+// log.info("鏂板鎹愮尞瀹屾垚锛歿}", serviceDonatecompletioninfo);
+// serviceDonatecompletioninfoService.delDuplicateDonateCompletioninfo(serviceDonatecompletioninfo.getInfoid(), serviceDonatecompletioninfo.getCreateBy());
+// //鏂板donatecomporgan鏁版嵁
+// if (CollectionUtils.isNotEmpty(serviceDonatecompletioninfo.getServiceDonatecomporganList())) {
+// for (ServiceDonatecomporgan serviceDonatecomporgan : serviceDonatecompletioninfo.getServiceDonatecomporganList()) {
+// if (serviceDonatecomporgan.getInfoid() == null) {
+// throw new BaseException("璇锋鏌ユ崘鐚櫒瀹樼Щ妞嶄俊鎭紝鏄惁涓庢崘鐚熀纭�琛ㄨ繘琛屽叧鑱�");
+// }
+// serviceDonatecomporganService.save(serviceDonatecomporgan);
+// }
+// }
+// return toAjax(serviceDonatecompletioninfoService.save(serviceDonatecompletioninfo));
+// }
+
+ @RepeatSubmit
+ @ApiOperation("鏂板鎴栦慨鏀规崘鐚畬鎴�")
+ //@PreAuthorize("@ss.hasPermi('project:donatecompletioninfo:edit')")
+ @Log(title = "鎹愮尞瀹屾垚", businessType = BusinessType.UPDATE)
+ @PostMapping("/saveOrUpdateDonatecompletioninfo")
+ public AjaxResult saveOrUpdateDonatecompletioninfo(@RequestBody List<ServiceDonatecompletioninfo> serviceDonatecompletioninfoList) {
+ if (CollectionUtils.isEmpty(serviceDonatecompletioninfoList)) {
+ throw new BaseException("璇锋鏌ラ渶瑕佹柊澧炴垨淇敼鐨勬崘鐚畬鎴愬弬鏁版槸鍚﹀畬鏁�");
+ }
+ Boolean i = null;
+ for (ServiceDonatecompletioninfo serviceDonatecompletioninfo : serviceDonatecompletioninfoList) {
+ log.info("鎹愮尞瀹屾垚id鏄惁涓虹┖ : {},鍩虹琛ㄧ殑id涓� : {}", serviceDonatecompletioninfo.getId(), serviceDonatecompletioninfo.getInfoid());
+ if (serviceDonatecompletioninfo.getId() == null) {
+ i = serviceDonatecompletioninfoService.save(serviceDonatecompletioninfo);
+ } else {
+ i = serviceDonatecompletioninfoService.updateById(serviceDonatecompletioninfo);
+ }
+ }
+ return toAjax(i);
}
/**
@@ -185,6 +235,7 @@
}
Map<String, Object> map = new HashMap<>();
map.put("downloadUrl", "/profile/download/wordtemplate/" + name + ".doc");
+ map.put("downloadName", name + ".doc");
return map;
}
--
Gitblit v1.9.3