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/ServiceDonatebaseinfoController.java | 52 ++++++++++++++++++++++++----------------------------
1 files changed, 24 insertions(+), 28 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatebaseinfoController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatebaseinfoController.java
index 269094d..c744b6d 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatebaseinfoController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatebaseinfoController.java
@@ -1,7 +1,6 @@
package com.ruoyi.web.controller.project;
import com.ruoyi.common.annotation.Log;
-import com.ruoyi.common.annotation.NotRepeatCommit;
import com.ruoyi.common.annotation.RepeatSubmit;
import com.ruoyi.common.config.RuoYiConfig;
import com.ruoyi.common.constant.HttpStatus;
@@ -31,8 +30,6 @@
import java.io.*;
import java.text.SimpleDateFormat;
import java.util.*;
-
-//import javafx.scene.input.DataFormat;
/**
@@ -70,7 +67,7 @@
* 鏌ヨ鎹愮尞鍩虹鍒楄〃
*/
@ApiOperation("娼滃湪鎹愮尞淇℃伅鍒楄〃")
- //@PreAuthorize("@ss.hasPermi('project:donatebaseinfo:list')")
+ //// @PreAuthorize("@ss.hasPermi('project:donatebaseinfo:list')")
@GetMapping("/list")
public TableDataInfo list(ServiceDonatebaseinfo serviceDonatebaseinfo) {
log.info("娼滃湪鎹愮尞淇℃伅鍒楄〃锛歿}", serviceDonatebaseinfo);
@@ -89,12 +86,11 @@
return getDataTable(list);
}
-
/**
* 瀵煎嚭鎹愮尞鍩虹鍒楄〃
*/
@ApiOperation("瀵煎嚭娼滃湪鎹愮尞淇℃伅鍒楄〃")
- //@PreAuthorize("@ss.hasPermi('project:donatebaseinfo:export')")
+ //// @PreAuthorize("@ss.hasPermi('project:donatebaseinfo:export')")
@Log(title = "鎹愮尞鍩虹", businessType = BusinessType.EXPORT)
@GetMapping("/export")
public AjaxResult export(ServiceDonatebaseinfo serviceDonatebaseinfo) {
@@ -108,7 +104,7 @@
* 鑾峰彇鎹愮尞鍩虹璇︾粏淇℃伅
*/
@ApiOperation("閫氳繃id鑾峰緱娼滃湪鎹愮尞淇℃伅")
- //@PreAuthorize("@ss.hasPermi('project:donatebaseinfo:query')")
+ //// @PreAuthorize("@ss.hasPermi('project:donatebaseinfo:query')")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id) {
log.info("閫氳繃id鑾峰緱娼滃湪鎹愮尞淇℃伅锛歿}", id);
@@ -119,27 +115,27 @@
* 鏂板鎹愮尞鍩虹
*/
@ApiOperation("鏂板娼滃湪鎹愮尞淇℃伅")
- //@PreAuthorize("@ss.hasPermi('project:donatebaseinfo:add')")
+ //// @PreAuthorize("@ss.hasPermi('project:donatebaseinfo:add')")
@Log(title = "鎹愮尞鍩虹", businessType = BusinessType.INSERT)
- @PostMapping
+ @PostMapping("/add")
@RepeatSubmit
public AjaxResult add(@RequestBody ServiceDonatebaseinfo serviceDonatebaseinfo) {
log.info("鏂板娼滃湪鎹愮尞淇℃伅锛歿}", serviceDonatebaseinfo);
SysUser user = SecurityUtils.getLoginUser().getUser();
- String bh = "";
- bh = serviceDonatebaseinfoService.getDonateNumber(serviceDonatebaseinfo);
- if (bh == "") {
- return AjaxResult.error("鏂板鏃剁敓鎴愮殑缂栧彿涓虹┖,鍒涘缓澶辫触!");
- } else {
- ServiceDonatebaseinfo serviceDonatebaseinfo1 = new ServiceDonatebaseinfo();
- serviceDonatebaseinfo1.setDonorno(bh);
- List<ServiceDonatebaseinfo> listrecord = serviceDonatebaseinfoService.queryList(serviceDonatebaseinfo1);
- if (listrecord.size() > 0) {
- return AjaxResult.error("鏂板鏃剁敓鎴愮殑缂栧彿" + bh + "宸插瓨鍦�,鏃犳硶淇濆瓨!");
- }
-
- }
+// String bh = "";
+// bh = serviceDonatebaseinfoService.getDonateNumber(serviceDonatebaseinfo);
+// if (bh == "") {
+// return AjaxResult.error("鏂板鏃剁敓鎴愮殑缂栧彿涓虹┖,鍒涘缓澶辫触!");
+// } else {
+// ServiceDonatebaseinfo serviceDonatebaseinfo1 = new ServiceDonatebaseinfo();
+// serviceDonatebaseinfo1.setDonorno(bh);
+// List<ServiceDonatebaseinfo> listrecord = serviceDonatebaseinfoService.queryList(serviceDonatebaseinfo1);
+// if (listrecord.size() > 0) {
+// return AjaxResult.error("鏂板鏃剁敓鎴愮殑缂栧彿" + bh + "宸插瓨鍦�,鏃犳硶淇濆瓨!");
+// }
+//
+// }
String idcardno = serviceDonatebaseinfo.getIdcardno();
ServiceDonatebaseinfo serviceDonatebaseinfo2 = new ServiceDonatebaseinfo();
serviceDonatebaseinfo2.setIdcardno(idcardno);
@@ -148,7 +144,7 @@
return AjaxResult.error("鏂板鏃惰韩浠借瘉" + idcardno + "宸插瓨鍦�,鏃犳硶淇濆瓨!");
}
- serviceDonatebaseinfo.setDonorno(bh);
+ // serviceDonatebaseinfo.setDonorno(bh);
serviceDonatebaseinfo.setDeptid(user.getDeptId());
serviceDonatebaseinfo.setDeptname(sysDeptMapper.getDeptNameByDeptId(user.getDeptId()));
serviceDonatebaseinfoService.save(serviceDonatebaseinfo);
@@ -161,7 +157,7 @@
* 淇敼鎹愮尞鍩虹
*/
@ApiOperation("淇敼娼滃湪鎹愮尞淇℃伅")
- //@PreAuthorize("@ss.hasPermi('project:donatebaseinfo:edit')")
+ //// @PreAuthorize("@ss.hasPermi('project:donatebaseinfo:edit')")
@Log(title = "鎹愮尞鍩虹", businessType = BusinessType.UPDATE)
@PostMapping("/edit")
@RepeatSubmit
@@ -174,7 +170,7 @@
* 鍒犻櫎鎹愮尞鍩虹
*/
@ApiOperation("鍒犻櫎娼滃湪鎹愮尞淇℃伅")
- //@PreAuthorize("@ss.hasPermi('project:donatebaseinfo:remove')")
+ //// @PreAuthorize("@ss.hasPermi('project:donatebaseinfo:remove')")
@Log(title = "鎹愮尞鍩虹", businessType = BusinessType.DELETE)
@GetMapping("/remove/{ids}")
public AjaxResult remove(@PathVariable Long[] ids) {
@@ -183,8 +179,8 @@
}
@ApiOperation("鑾峰彇鎹愮尞缂栧彿")
- @GetMapping("/donatenumber")
- public AjaxResult getDonateNumber(ServiceDonatebaseinfo serviceDonatebaseinfo) {
+ @PostMapping("/donatenumber")
+ public AjaxResult getDonateNumber(@RequestBody ServiceDonatebaseinfo serviceDonatebaseinfo) {
log.info("鑾峰彇鎹愮尞缂栧彿锛歿}", serviceDonatebaseinfo);
return AjaxResult.success(serviceDonatebaseinfoService.getDonateNumber(serviceDonatebaseinfo));
}
@@ -244,7 +240,7 @@
}
Map<String, Object> map = new HashMap<>();
map.put("downloadUrl", "/profile/download/wordtemplate/" + name + ".doc");
- map.put("downloadName", name + ".doc");
+ map.put("downloadName", name + ".doc");
return map;
}
--
Gitblit v1.9.3