From 9e99e7e192c62c2274f8f5362b354cbf55c3d80f Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期一, 22 七月 2024 16:21:32 +0800
Subject: [PATCH] 变更
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatecompletioninfoController.java | 23 +++++++++++++----------
1 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatecompletioninfoController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatecompletioninfoController.java
index 702620b..0c05ca2 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatecompletioninfoController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatecompletioninfoController.java
@@ -9,6 +9,7 @@
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.enums.OrganEnum;
import com.ruoyi.common.exception.base.BaseException;
+import com.ruoyi.common.utils.bean.DtoConversionUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.project.domain.ServiceDonatecompletioninfo;
import com.ruoyi.project.domain.ServiceDonateorgan;
@@ -62,7 +63,7 @@
* 鏌ヨ鎹愮尞瀹屾垚鍒楄〃
*/
@ApiOperation("鏌ヨ鎹愮尞瀹屾垚鍒楄〃")
- //@PreAuthorize("@ss.hasPermi('project:donatecompletioninfo:list')")
+ //// @PreAuthorize("@ss.hasPermi('project:donatecompletioninfo:list')")
@GetMapping("/list")
public TableDataInfo list(ServiceDonatecompletioninfo serviceDonatecompletioninfo) {
log.info("鏌ヨ鎹愮尞瀹屾垚鍒楄〃锛歿}", serviceDonatecompletioninfo);
@@ -86,7 +87,7 @@
* 瀵煎嚭鎹愮尞瀹屾垚鍒楄〃
*/
@ApiOperation("瀵煎嚭鎹愮尞瀹屾垚鍒楄〃")
- //@PreAuthorize("@ss.hasPermi('project:donatecompletioninfo:export')")
+ //// @PreAuthorize("@ss.hasPermi('project:donatecompletioninfo:export')")
@Log(title = "鎹愮尞瀹屾垚", businessType = BusinessType.EXPORT)
@GetMapping("/export")
public AjaxResult export(ServiceDonatecompletioninfo serviceDonatecompletioninfo) {
@@ -100,7 +101,7 @@
* 鑾峰彇鎹愮尞瀹屾垚璇︾粏淇℃伅
*/
@ApiOperation("閫氳繃id鑾峰彇鏌愪竴鏉℃崘鐚畬鎴愪俊鎭�")
- //@PreAuthorize("@ss.hasPermi('project:donatecompletioninfo:query')")
+ //// @PreAuthorize("@ss.hasPermi('project:donatecompletioninfo:query')")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id) {
log.info("閫氳繃id鑾峰彇鏌愪竴鏉℃崘鐚畬鎴愪俊鎭細{}", id);
@@ -111,21 +112,23 @@
* 鏂板鎹愮尞瀹屾垚
*/
@ApiOperation("鏂板鎹愮尞瀹屾垚")
- //@PreAuthorize("@ss.hasPermi('project:donatecompletioninfo:add')")
+ //// @PreAuthorize("@ss.hasPermi('project:donatecompletioninfo:add')")
@Log(title = "鎹愮尞瀹屾垚", businessType = BusinessType.INSERT)
- @PostMapping
+ @PostMapping("/add")
@RepeatSubmit(interval = 5000)
public AjaxResult add(@RequestBody ServiceDonatecompletioninfo serviceDonatecompletioninfo) {
log.info("鏂板鎹愮尞瀹屾垚锛歿}", serviceDonatecompletioninfo);
serviceDonatecompletioninfoService.delDuplicateDonateCompletioninfo(serviceDonatecompletioninfo.getInfoid(), serviceDonatecompletioninfo.getCreateBy());
- return toAjax(serviceDonatecompletioninfoService.save(serviceDonatecompletioninfo));
+ boolean save = serviceDonatecompletioninfoService.save(serviceDonatecompletioninfo);
+ log.info("鏂板鎹愮尞瀹屾垚serviceDonatecompletioninfo鐨処D锛歿}", serviceDonatecompletioninfo.getId());
+ return AjaxResult.success(serviceDonatecompletioninfo);
}
// /**
// * 鏂板鎹愮尞瀹屾垚璇︽儏
// */
// @ApiOperation("鏂板鎹愮尞瀹屾垚璇︽儏")
-// //@PreAuthorize("@ss.hasPermi('project:donatecompletioninfo:add')")
+// //// @PreAuthorize("@ss.hasPermi('project:donatecompletioninfo:add')")
// @Log(title = "鏂板鎹愮尞瀹屾垚璇︽儏", businessType = BusinessType.INSERT)
// @PostMapping
// @RepeatSubmit(interval = 5000)
@@ -146,7 +149,7 @@
@RepeatSubmit
@ApiOperation("鏂板鎴栦慨鏀规崘鐚畬鎴�")
- //@PreAuthorize("@ss.hasPermi('project:donatecompletioninfo:edit')")
+ //// @PreAuthorize("@ss.hasPermi('project:donatecompletioninfo:edit')")
@Log(title = "鎹愮尞瀹屾垚", businessType = BusinessType.UPDATE)
@PostMapping("/saveOrUpdateDonatecompletioninfo")
public AjaxResult saveOrUpdateDonatecompletioninfo(@RequestBody List<ServiceDonatecompletioninfo> serviceDonatecompletioninfoList) {
@@ -170,7 +173,7 @@
*/
@RepeatSubmit
@ApiOperation("淇敼鎹愮尞瀹屾垚")
- //@PreAuthorize("@ss.hasPermi('project:donatecompletioninfo:edit')")
+ //// @PreAuthorize("@ss.hasPermi('project:donatecompletioninfo:edit')")
@Log(title = "鎹愮尞瀹屾垚", businessType = BusinessType.UPDATE)
@PostMapping("/edit")
public AjaxResult edit(@RequestBody ServiceDonatecompletioninfo serviceDonatecompletioninfo) {
@@ -188,7 +191,7 @@
* 鍒犻櫎鎹愮尞瀹屾垚
*/
@ApiOperation("鍒犻櫎鎹愮尞瀹屾垚")
- //@PreAuthorize("@ss.hasPermi('project:donatecompletioninfo:remove')")
+ //// @PreAuthorize("@ss.hasPermi('project:donatecompletioninfo:remove')")
@Log(title = "鎹愮尞瀹屾垚", businessType = BusinessType.DELETE)
@GetMapping("/remove/{ids}")
public AjaxResult remove(@PathVariable Long[] ids) {
--
Gitblit v1.9.3