From ded03f0315e02c13f17b8bf7777c89a5cc73130e Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期二, 19 三月 2024 12:16:38 +0800
Subject: [PATCH] 代码提交
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceRelativesconfirmationController.java | 22 ++++++++++++++--------
1 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceRelativesconfirmationController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceRelativesconfirmationController.java
index 1091173..ea22706 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceRelativesconfirmationController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceRelativesconfirmationController.java
@@ -9,6 +9,7 @@
import com.ruoyi.common.enums.Education;
import com.ruoyi.common.enums.NationalityEnum;
import com.ruoyi.common.exception.ServiceException;
+import com.ruoyi.common.exception.base.BaseException;
import com.ruoyi.project.domain.vo.RelativeConfirmationVO;
import com.ruoyi.project.mapper.ServiceDonatebaseinfoMapper;
import com.ruoyi.project.mapper.ServiceRelativesconfirmationMapper;
@@ -115,10 +116,11 @@
@ApiOperation("鏂板浜插睘纭")
//@PreAuthorize("@ss.hasPermi('project:relativesconfirmation:add')")
@Log(title = "鎹愮尞浜插睘纭", businessType = BusinessType.INSERT)
- @PostMapping
+ @PostMapping("/add")
@RepeatSubmit
public AjaxResult add(@RequestBody ServiceRelativesconfirmation serviceRelativesconfirmation) {
- return toAjax(serviceRelativesconfirmationService.save(serviceRelativesconfirmation));
+ boolean save = serviceRelativesconfirmationService.save(serviceRelativesconfirmation);
+ return AjaxResult.success(serviceRelativesconfirmation);
}
/**
@@ -130,13 +132,16 @@
@PostMapping("/edit")
@RepeatSubmit
public AjaxResult edit(@RequestBody ServiceRelativesconfirmation serviceRelativesconfirmation) {
- ServiceRelativesconfirmation serviceRelativesconfirmation1 = new ServiceRelativesconfirmation();
- serviceRelativesconfirmation1.setInfoid(serviceRelativesconfirmation.getInfoid());
- List<ServiceRelativesconfirmation> list = serviceRelativesconfirmationService.queryList(serviceRelativesconfirmation1);
- if (CollectionUtils.isEmpty(list)) {
- return error("鎹愮尞浜插睘纭鏁版嵁涓嶅瓨鍦�,璇锋鏌ュ悗鍐嶆淇敼");
+ if (serviceRelativesconfirmation.getInfoid() == null || serviceRelativesconfirmation.getId() == null) {
+ throw new BaseException("璇疯仈绯诲伐绋嬪笀妫�鏌D鏄惁涓虹┖");
}
- serviceRelativesconfirmation.setId(list.get(0).getId());
+// ServiceRelativesconfirmation serviceRelativesconfirmation1 = new ServiceRelativesconfirmation();
+// serviceRelativesconfirmation1.setInfoid(serviceRelativesconfirmation.getInfoid());
+// List<ServiceRelativesconfirmation> list = serviceRelativesconfirmationService.queryList(serviceRelativesconfirmation1);
+// if (CollectionUtils.isEmpty(list)) {
+// return error("鎹愮尞浜插睘纭鏁版嵁涓嶅瓨鍦�,璇锋鏌ュ悗鍐嶆淇敼");
+// }
+// serviceRelativesconfirmation.setId(list.get(0).getId());
return toAjax(serviceRelativesconfirmationService.updateById(serviceRelativesconfirmation));
}
@@ -195,6 +200,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