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/ServiceDonationwitnessController.java | 41 ++++++++++++++++++++++++++---------------
1 files changed, 26 insertions(+), 15 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 63a95a0..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
@@ -12,6 +12,7 @@
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;
@@ -80,7 +81,7 @@
* 鏌ヨ鎹愮尞瑙佽瘉鍒楄〃
*/
@ApiOperation("鑾峰彇鎹愮尞瑙佽瘉鍒楄〃")
- //@PreAuthorize("@ss.hasPermi('project:donationwitness:list')")
+ //// @PreAuthorize("@ss.hasPermi('project:donationwitness:list')")
@GetMapping("/list")
public TableDataInfo list(ServiceDonationwitness serviceDonationwitness) {
startPage();
@@ -101,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) {
@@ -114,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));
@@ -124,21 +125,22 @@
* 鏂板鎹愮尞瑙佽瘉
*/
@ApiOperation("鏂板鎹愮尞瑙佽瘉")
- //@PreAuthorize("@ss.hasPermi('project:donationwitness:add')")
+ //// @PreAuthorize("@ss.hasPermi('project:donationwitness:add')")
@Log(title = "鎹愮尞瑙佽瘉", businessType = BusinessType.INSERT)
@PostMapping("/add")
@RepeatSubmit
public AjaxResult add(@RequestBody ServiceDonationwitness serviceDonationwitness) {
boolean save = serviceDonationwitnessService.save(serviceDonationwitness);
- 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("鏂板鎹愮尞瑙佽瘉鏄惁鎴愬姛锛歿},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);
}
@@ -146,11 +148,13 @@
* 淇敼鎹愮尞瑙佽瘉
*/
@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("*");
@@ -167,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) {
@@ -545,6 +549,13 @@
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 {
--
Gitblit v1.9.3