From ee089a8ac4a9d99ef0a0491bbf1d80a2d4fbc393 Mon Sep 17 00:00:00 2001
From: sinake <sinake1@qq.com>
Date: 星期二, 10 十一月 2026 09:15:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonorchargeorganController.java | 22 +++++++++++++++++++++-
1 files changed, 21 insertions(+), 1 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonorchargeorganController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonorchargeorganController.java
index e41c09b..efb42a1 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonorchargeorganController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonorchargeorganController.java
@@ -112,6 +112,15 @@
}
/**
+ * 鍣ㄥ畼璐圭敤姹囨�伙紙搴旀敹/瀹炴敹/鏈洖娆撅級锛屾寜褰撳墠鏌ヨ鏉′欢缁熻鍏ㄩ儴缁撴灉
+ */
+ @ApiOperation("鍣ㄥ畼璐圭敤姹囨��")
+ @GetMapping("/organfeeSummary")
+ public AjaxResult organfeeSummary(ServiceDonorchargeorgan serviceDonorchargeorgan) {
+ return AjaxResult.success(serviceDonorchargeorganService.organfeeSummary(serviceDonorchargeorgan));
+ }
+
+ /**
* 鍣ㄥ畼鐘舵�佸�艰浆鏂囨湰
*/
private String organStateName(String organState) {
@@ -207,7 +216,7 @@
@Log(title = "鎹愮尞鍣ㄥ畼", businessType = BusinessType.DELETE)
@GetMapping("/remove/{ids}")
public AjaxResult remove(@PathVariable Long[] ids) {
- return toAjax(serviceDonorchargeorganService.removeByIds(Arrays.asList(ids)));
+ return toAjax(serviceDonorchargeorganService.removeByIds(ids) > 0);
}
@RepeatSubmit
@@ -242,6 +251,17 @@
}
/**
+ * 鏀惰垂缁熻鏄庣粏锛堢偣鍑诲凡鏀�/鏈敹閲戦閽诲彇锛�
+ */
+ @ApiOperation("鏀惰垂缁熻鏄庣粏")
+ @PostMapping("/getSpStatChangeDetail")
+ public TableDataInfo getSpStatChangeDetail(@RequestBody SpStatChangeDetailReq spStatChangeDetailReq) {
+ startPage();
+ List<SpStatChangeDetail> list = serviceDonorchargeorganService.getSpStatChangeDetail(spStatChangeDetailReq);
+ return getDataTable(list);
+ }
+
+ /**
* 瀵煎嚭鏀舵缁熻
*/
@ApiOperation("瀵煎嚭鏀舵缁熻")
--
Gitblit v1.9.3