From 4207b9bd1dd2f81eea512a82085c4083be5e6d44 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期二, 09 四月 2024 17:33:21 +0800
Subject: [PATCH] 代码提交
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonationwitnessController.java | 53 ++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 46 insertions(+), 7 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonationwitnessController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonationwitnessController.java
index c28d50e..212a970 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonationwitnessController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonationwitnessController.java
@@ -4,9 +4,13 @@
import java.text.SimpleDateFormat;
import java.util.*;
+import com.ruoyi.common.annotation.NotRepeatCommit;
import com.ruoyi.common.config.RuoYiConfig;
import com.ruoyi.common.enums.OrganEnum;
+import com.ruoyi.common.exception.base.BaseException;
import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.bean.DtoConversionUtils;
+import com.ruoyi.project.domain.ServiceDonatebaseinfo;
import com.ruoyi.project.domain.ServiceDonateorgan;
import com.ruoyi.project.domain.vo.DonationWitnessVO;
import com.ruoyi.project.domain.vo.TimeVO;
@@ -19,7 +23,9 @@
import freemarker.template.TemplateException;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PathVariable;
@@ -42,6 +48,7 @@
* @author ruoyi
* @date 2021-11-17
*/
+@Slf4j
@Api("鎹愮尞瑙佽瘉绠＄悊")
@RestController
@RequestMapping("/project/donationwitness")
@@ -119,11 +126,21 @@
@ApiOperation("鏂板鎹愮尞瑙佽瘉")
//@PreAuthorize("@ss.hasPermi('project:donationwitness:add')")
@Log(title = "鎹愮尞瑙佽瘉", businessType = BusinessType.INSERT)
- @PostMapping
+ @PostMapping("/add")
@RepeatSubmit
public AjaxResult add(@RequestBody ServiceDonationwitness serviceDonationwitness) {
-
- return toAjax(serviceDonationwitnessService.save(serviceDonationwitness));
+ boolean save = serviceDonationwitnessService.save(serviceDonationwitness);
+ log.info("鏂板鎹愮尞瑙佽瘉鏄惁鎴愬姛锛歿},id涓猴細{},infoId涓猴細{}", save, serviceDonationwitness.getId(), serviceDonationwitness.getInfoid());
+// if (save) {
+// //鐢熸垚鈥滄崘鐚�呯紪鍙封��
+// ServiceDonatebaseinfo serviceDonatebaseinfo = serviceDonatebaseinfoService.getById(serviceDonationwitness.getInfoid());
+// log.info("serviceDonatebaseinfo鐨勪俊鎭负{}", serviceDonatebaseinfo);
+// String donorno = serviceDonatebaseinfoService.getDonateNumber(serviceDonatebaseinfo);
+// log.info("鐢熸垚鐨勬崘鐚�呯紪鍙蜂负:{}", donorno);
+// serviceDonatebaseinfo.setDonorno(donorno);
+// serviceDonatebaseinfoService.updateById(serviceDonatebaseinfo);
+// }
+ return AjaxResult.success(serviceDonationwitness);
}
/**
@@ -135,6 +152,8 @@
@PostMapping("/edit")
@RepeatSubmit
public AjaxResult edit(@RequestBody ServiceDonationwitness serviceDonationwitness) {
+ log.info("鏂板鎹愮尞瑙佽瘉id涓猴細{},infoId涓猴細{}", serviceDonationwitness.getId(), serviceDonationwitness.getInfoid());
+
int last = -1;
if (StringUtils.isNotEmpty(serviceDonationwitness.getDonorno())) {
last = serviceDonationwitness.getDonorno().lastIndexOf("*");
@@ -202,6 +221,7 @@
}
Map<String, Object> map = new HashMap<>();
map.put("downloadUrl", "/profile/download/wordtemplate/" + name + ".doc");
+ map.put("downloadName", name + ".doc");
return map;
}
@@ -305,18 +325,18 @@
dataMap.put("ZDMCG", donationWitness.getAortacannulatime() == null ? "" : sformat.format(donationWitness.getAortacannulatime()));
dataMap.put("ZDMGZ", donationWitness.getAortaperfusiontime() == null ? "" : sformat.format(donationWitness.getAortaperfusiontime()));
- if (donationWitness.getIsrestoreremains() == 0) {
+ if (donationWitness.getIsrestoreremains() != null && donationWitness.getIsrestoreremains() == 0) {
dataMap.put("HFYT", "鈻�");
dataMap.put("BHFYT", (char) 8730);
- } else if (donationWitness.getIsrestoreremains() == 1) {
+ } else if (donationWitness.getIsrestoreremains() != null && donationWitness.getIsrestoreremains() == 1) {
dataMap.put("HFYT", (char) 8730);
dataMap.put("BHFYT", "鈻�");
}
- if (donationWitness.getIsspendremember() == 0) {
+ if (donationWitness.getIsspendremember() != null && donationWitness.getIsspendremember() == 0) {
dataMap.put("MA", "鈻�");
dataMap.put("BMA", (char) 8730);
- } else if (donationWitness.getIsspendremember() == 1) {
+ } else if (donationWitness.getIsspendremember() != null && donationWitness.getIsspendremember() == 1) {
dataMap.put("MA", (char) 8730);
dataMap.put("BMA", "鈻�");
}
@@ -517,5 +537,24 @@
return AjaxResult.success(serviceDonationwitnessService.getStats(timeVO));
}
+ @RepeatSubmit
+ @ApiOperation("鏂板鎴栦慨鏀规崘鐚璇佺鐞�")
+ @Log(title = "鎹愮尞瀹屾垚", businessType = BusinessType.UPDATE)
+ @PostMapping("/saveOrUpdateDonationwitness")
+ public AjaxResult saveOrUpdateDonationwitness(@RequestBody List<ServiceDonationwitness> serviceDonationwitnessList) {
+ if (CollectionUtils.isEmpty(serviceDonationwitnessList)) {
+ throw new BaseException("璇锋鏌ラ渶瑕佹柊澧炴垨淇敼鐨勬崘鐚璇佺鐞嗗弬鏁版槸鍚﹀畬鏁�");
+ }
+ Boolean i = null;
+ for (ServiceDonationwitness serviceDonationwitness : serviceDonationwitnessList) {
+ log.info("鎹愮尞瑙佽瘉绠＄悊id鏄惁涓虹┖ : {},鍩虹琛ㄧ殑id涓� : {}", serviceDonationwitness.getId(), serviceDonationwitness.getInfoid());
+ if (serviceDonationwitness.getId() == null) {
+ i = serviceDonationwitnessService.save(serviceDonationwitness);
+ } else {
+ i = serviceDonationwitnessService.updateById(serviceDonationwitness);
+ }
+ }
+ return toAjax(i);
+ }
}
--
Gitblit v1.9.3