From 34a716e48e49743083953113bfc2e8011d52444f Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期一, 15 九月 2025 19:08:05 +0800
Subject: [PATCH] 日志修改
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonationwitnessController.java | 73 ++++++++++++++++++++++++++++++------
1 files changed, 60 insertions(+), 13 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..526a61d 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,10 +4,15 @@
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.ServiceDonationwitnessorgan;
import com.ruoyi.project.domain.vo.DonationWitnessVO;
import com.ruoyi.project.domain.vo.TimeVO;
import com.ruoyi.project.service.IBaseOnlyvalueService;
@@ -19,7 +24,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 +49,7 @@
* @author ruoyi
* @date 2021-11-17
*/
+@Slf4j
@Api("鎹愮尞瑙佽瘉绠＄悊")
@RestController
@RequestMapping("/project/donationwitness")
@@ -73,7 +81,7 @@
* 鏌ヨ鎹愮尞瑙佽瘉鍒楄〃
*/
@ApiOperation("鑾峰彇鎹愮尞瑙佽瘉鍒楄〃")
- //@PreAuthorize("@ss.hasPermi('project:donationwitness:list')")
+ //// @PreAuthorize("@ss.hasPermi('project:donationwitness:list')")
@GetMapping("/list")
public TableDataInfo list(ServiceDonationwitness serviceDonationwitness) {
startPage();
@@ -94,7 +102,7 @@
* 瀵煎嚭鎹愮尞瑙佽瘉鍒楄〃
*/
@ApiOperation("瀵煎嚭鎹愮尞瑙佽瘉鍒楄〃")
- //@PreAuthorize("@ss.hasPermi('project:donationwitness:export')")
+ //// @PreAuthorize("@ss.hasPermi('project:donationwitness:export')")
@Log(title = "鎹愮尞瑙佽瘉", businessType = BusinessType.EXPORT)
@GetMapping("/export")
public AjaxResult export(ServiceDonationwitness serviceDonationwitness) {
@@ -107,7 +115,7 @@
* 鑾峰彇鎹愮尞瑙佽瘉璇︾粏淇℃伅
*/
@ApiOperation("閫氳繃id鑾峰彇瑙佽瘉淇℃伅")
- //@PreAuthorize("@ss.hasPermi('project:donationwitness:query')")
+ //// @PreAuthorize("@ss.hasPermi('project:donationwitness:query')")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id) {
return AjaxResult.success(serviceDonationwitnessService.getById(id));
@@ -117,24 +125,36 @@
* 鏂板鎹愮尞瑙佽瘉
*/
@ApiOperation("鏂板鎹愮尞瑙佽瘉")
- //@PreAuthorize("@ss.hasPermi('project:donationwitness:add')")
+ //// @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);
}
/**
* 淇敼鎹愮尞瑙佽瘉
*/
@ApiOperation("淇敼鎹愮尞瑙佽瘉")
- //@PreAuthorize("@ss.hasPermi('project:donationwitness:edit')")
+ //// @PreAuthorize("@ss.hasPermi('project:donationwitness:edit')")
@Log(title = "鎹愮尞瑙佽瘉", businessType = BusinessType.UPDATE)
@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("*");
@@ -151,7 +171,7 @@
* 鍒犻櫎鎹愮尞瑙佽瘉
*/
@ApiOperation("鍒犻櫎鎹愮尞瑙佽瘉")
- //@PreAuthorize("@ss.hasPermi('project:donationwitness:remove')")
+ //// @PreAuthorize("@ss.hasPermi('project:donationwitness:remove')")
@Log(title = "鎹愮尞瑙佽瘉", businessType = BusinessType.DELETE)
@GetMapping("/remove/{ids}")
public AjaxResult remove(@PathVariable Long[] ids) {
@@ -202,6 +222,7 @@
}
Map<String, Object> map = new HashMap<>();
map.put("downloadUrl", "/profile/download/wordtemplate/" + name + ".doc");
+ map.put("downloadName", name + ".doc");
return map;
}
@@ -305,18 +326,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 +538,31 @@
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());
+ ServiceDonationwitness sd2 = new ServiceDonationwitness();
+ sd2.setInfoid(serviceDonationwitness.getInfoid());
+ sd2.setDel_flag(0);
+ List<ServiceDonationwitness> serviceDonationwitnesses = serviceDonationwitnessService.queryList(sd2);
+ if (!CollectionUtils.isEmpty(serviceDonationwitnesses)) {
+ serviceDonationwitness.setId(serviceDonationwitnesses.get(0).getId());
+ }
+ if (serviceDonationwitness.getId() == null) {
+ i = serviceDonationwitnessService.save(serviceDonationwitness);
+ } else {
+ i = serviceDonationwitnessService.updateById(serviceDonationwitness);
+ }
+ }
+ return toAjax(i);
+ }
}
--
Gitblit v1.9.3