From 49120f2b9db33455756a911e56cfefd7c3120a14 Mon Sep 17 00:00:00 2001
From: sinake <sinake1@qq.com>
Date: 星期三, 28 十月 2026 17:05:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonorchargeorganController.java | 41 +++++++++++++++++++++++++++++------------
1 files changed, 29 insertions(+), 12 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 572d096..c529985 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
@@ -6,16 +6,16 @@
import com.ruoyi.common.annotation.RepeatSubmit;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.page.PageDomain;
import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.core.page.TableSupport;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.exception.base.BaseException;
+import com.ruoyi.common.utils.PageUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.bean.DtoConversionUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.project.domain.RbDetailFile;
-import com.ruoyi.project.domain.ServiceDonorchargeorgan;
-import com.ruoyi.project.domain.ServiceDonorchargeorganVO;
-import com.ruoyi.project.domain.ServiceFunddetailVO;
+import com.ruoyi.project.domain.*;
import com.ruoyi.project.service.IServiceDonorchargeorganService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -47,7 +47,7 @@
* 鏌ヨ鎹愮尞鍣ㄥ畼鍒楄〃
*/
@ApiOperation("鏌ヨ鎹愮尞鍣ㄥ畼鍒楄〃")
- @PreAuthorize("@ss.hasPermi('project:donorchargeorgan:list')")
+// // @PreAuthorize("@ss.hasPermi('project:donorchargeorgan:list')")
@GetMapping("/list")
public TableDataInfo list(ServiceDonorchargeorgan serviceDonorchargeorgan) {
log.info("鏌ヨ鎹愮尞鍣ㄥ畼鍒楄〃鐨勫叆鍙傦細{}", serviceDonorchargeorgan);
@@ -66,15 +66,14 @@
serviceDonorchargeorganVO.setAnnexFilesList(rbDetailFiles);
}
}
-
- return getDataTable(serviceDonorchargeorganVOList);
+ return getDataTable2(serviceDonorchargeorganVOList, list);
}
/**
* 瀵煎嚭鎹愮尞鍣ㄥ畼鍒楄〃
*/
@ApiOperation("瀵煎嚭鎹愮尞鍣ㄥ畼鍒楄〃")
- @PreAuthorize("@ss.hasPermi('project:donorchargeorgan:export')")
+// // @PreAuthorize("@ss.hasPermi('project:donorchargeorgan:export')")
@Log(title = "鎹愮尞鍣ㄥ畼", businessType = BusinessType.EXPORT)
@GetMapping("/export")
public AjaxResult export(ServiceDonorchargeorgan serviceDonorchargeorgan) {
@@ -87,7 +86,7 @@
* 鑾峰彇鎹愮尞鍣ㄥ畼璇︾粏淇℃伅
*/
@ApiOperation("鑾峰彇鎹愮尞鍣ㄥ畼璇︾粏淇℃伅")
- @PreAuthorize("@ss.hasPermi('project:donorchargeorgan:query')")
+// // @PreAuthorize("@ss.hasPermi('project:donorchargeorgan:query')")
@GetMapping(value = "/getInfo/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id) {
return AjaxResult.success(serviceDonorchargeorganService.getById(id));
@@ -97,7 +96,7 @@
* 鏂板鎹愮尞鍣ㄥ畼
*/
@ApiOperation("鏂板鎹愮尞鍣ㄥ畼")
- @PreAuthorize("@ss.hasPermi('project:donorchargeorgan:add')")
+// // @PreAuthorize("@ss.hasPermi('project:donorchargeorgan:add')")
@Log(title = "鎹愮尞鍣ㄥ畼", businessType = BusinessType.INSERT)
@PostMapping("/add")
@RepeatSubmit
@@ -114,7 +113,7 @@
* 淇敼鎹愮尞鍣ㄥ畼
*/
@ApiOperation("淇敼鎹愮尞鍣ㄥ畼")
- @PreAuthorize("@ss.hasPermi('project:donorchargeorgan:edit')")
+// // @PreAuthorize("@ss.hasPermi('project:donorchargeorgan:edit')")
@Log(title = "鎹愮尞鍣ㄥ畼", businessType = BusinessType.UPDATE)
@PostMapping("/edit")
@RepeatSubmit
@@ -130,7 +129,7 @@
* 鍒犻櫎鎹愮尞鍣ㄥ畼
*/
@ApiOperation("鍒犻櫎鎹愮尞鍣ㄥ畼")
- @PreAuthorize("@ss.hasPermi('project:donorchargeorgan:remove')")
+// // @PreAuthorize("@ss.hasPermi('project:donorchargeorgan:remove')")
@Log(title = "鎹愮尞鍣ㄥ畼", businessType = BusinessType.DELETE)
@GetMapping("/remove/{ids}")
public AjaxResult remove(@PathVariable Long[] ids) {
@@ -161,4 +160,22 @@
}
return toAjax(i);
}
+
+ @ApiOperation("鏀惰垂缁熻")
+ @PostMapping("/getListBySpStatChange")
+ public TableDataInfo getListBySpStatChange(@RequestBody SpStatChangeReq spStatChangeReq) {
+ return getDataTable(serviceDonorchargeorganService.getListBySpStatChange(spStatChangeReq));
+ }
+
+ /**
+ * 瀵煎嚭鏀舵缁熻
+ */
+ @ApiOperation("瀵煎嚭鏀舵缁熻")
+ @Log(title = "鏀舵缁熻", businessType = BusinessType.EXPORT)
+ @GetMapping("/exportChange")
+ public AjaxResult exportChange(SpStatChangeReq spStatChangeReq) {
+ List<SpStatChange> list = serviceDonorchargeorganService.getListBySpStatChange(spStatChangeReq);
+ ExcelUtil<SpStatChange> util = new ExcelUtil<SpStatChange>(SpStatChange.class);
+ return util.exportExcel(list, "鏀舵缁熻鏁版嵁");
+ }
}
--
Gitblit v1.9.3