From 349617384c7334699043e1f8a8a235c47f3a6b1c Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 14 八月 2026 16:51:47 +0800
Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/~yxh/opo
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonationwitnessController.java | 25 ++++++++++++++-----------
1 files changed, 14 insertions(+), 11 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 526a61d..5559c14 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
@@ -130,17 +130,20 @@
@PostMapping("/add")
@RepeatSubmit
public AjaxResult add(@RequestBody ServiceDonationwitness 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);
-// }
+ log.info("鏂板鎹愮尞瑙佽瘉infoId涓猴細{}", serviceDonationwitness.getInfoid());
+ ServiceDonationwitness sd = new ServiceDonationwitness();
+ sd.setInfoid(serviceDonationwitness.getInfoid());
+ sd.setDel_flag(0);
+ List<ServiceDonationwitness> serviceDonationwitnesses = serviceDonationwitnessService.selectServiceDonationwitnessList(sd);
+ if (CollectionUtils.isEmpty(serviceDonationwitnesses)) {
+ boolean save = serviceDonationwitnessService.save(serviceDonationwitness);
+ log.info("鏂板鎹愮尞瑙佽瘉鏄惁鎴愬姛锛歿},id涓猴細{},infoId涓猴細{}", save, serviceDonationwitness.getId(), serviceDonationwitness.getInfoid());
+ } else {
+ log.info("鏂板鎹愮尞瑙佽瘉id涓猴細{}", serviceDonationwitnesses.get(0).getId());
+ serviceDonationwitness.setId(serviceDonationwitnesses.get(0).getId());
+ serviceDonationwitnessService.updateById(serviceDonationwitness);
+ }
+
return AjaxResult.success(serviceDonationwitness);
}
--
Gitblit v1.9.3