From 29f287cf6e4869d7bbc283991458e09a03b59c52 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期三, 21 一月 2026 14:29:55 +0800
Subject: [PATCH] 代码提交
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatecompletioninfoController.java | 36 +++++++++++++-----------------------
1 files changed, 13 insertions(+), 23 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 130e095..5d5af86 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
@@ -13,6 +13,7 @@
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.project.domain.ServiceDonatecompletioninfo;
import com.ruoyi.project.domain.ServiceDonateorgan;
+import com.ruoyi.project.domain.vo.DonationCompletionBaseInfoVO;
import com.ruoyi.project.domain.vo.DonationCompletionVO;
import com.ruoyi.project.service.IServiceDonatecompletioninfoService;
import com.ruoyi.project.service.IServiceDonatecomporganService;
@@ -39,7 +40,7 @@
* @date 2021-11-19
*/
@Slf4j
-@Api( description = "鎹愮尞瀹屾垚鐧昏绠＄悊")
+@Api(description = "鎹愮尞瀹屾垚鐧昏绠＄悊")
@RestController
@RequestMapping("/project/donatecompletioninfo")
public class ServiceDonatecompletioninfoController extends BaseController {
@@ -59,28 +60,17 @@
configuration.setDefaultEncoding("utf-8");
}
- /**
- * 鏌ヨ鎹愮尞瀹屾垚鍒楄〃
- */
- @ApiOperation("鏌ヨ鎹愮尞瀹屾垚鍒楄〃")
- //// @PreAuthorize("@ss.hasPermi('project:donatecompletioninfo:list')")
- @GetMapping("/list")
- public TableDataInfo list(ServiceDonatecompletioninfo serviceDonatecompletioninfo) {
- log.info("鏌ヨ鎹愮尞瀹屾垚鍒楄〃锛歿}", serviceDonatecompletioninfo);
- startPage();
- List<ServiceDonatecompletioninfo> list = serviceDonatecompletioninfoService.queryList(serviceDonatecompletioninfo);
- return getDataTable(list);
- }
-
- @ApiOperation("鏌ヨ鎹愮尞瀹屾垚鍒楄〃锛堟柊锛�")
- @GetMapping("/listnew")
- @Log(title = "鏌ヨ鎹愮尞瀹屾垚鍒楄〃锛堟柊锛�", businessType = BusinessType.OTHER)
- public TableDataInfo listnew(DonationCompletionVO donationCompletionVO) {
- log.info("鏌ヨ鎹愮尞瀹屾垚鍒楄〃锛堟柊锛夛細{}", donationCompletionVO);
- startPage();
- List<DonationCompletionVO> list = serviceDonatecompletioninfoService.selectVOList(donationCompletionVO);
- return getDataTable(list);
- }
+// /**
+// * 鏌ヨ鎹愮尞瀹屾垚鍒楄〃
+// */
+// @ApiOperation("鏌ヨ鎹愮尞瀹屾垚鍒楄〃")
+// //// @PreAuthorize("@ss.hasPermi('project:donatecompletioninfo:list')")
+// @GetMapping("/list")
+// public Map<String, Object> list(DonationCompletionBaseInfoVO donationCompletionBaseInfoVO) {
+// log.info("鏌ヨ鎹愮尞瀹屾垚鍒楄〃锛歿}", donationCompletionBaseInfoVO);
+// List<ServiceDonatecompletioninfo> list = serviceDonatecompletioninfoService.queryList(donationCompletionBaseInfoVO);
+// return getDataTable(list);
+// }
/**
--
Gitblit v1.9.3