From 4c42cd3d556ea72d70ea43a734cc38acd6b81e74 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 15 三月 2024 18:26:43 +0800
Subject: [PATCH] 代码提交
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonorchargeorganController.java | 8 +++++---
1 files changed, 5 insertions(+), 3 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 90918ba..3cdcc28 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,9 +6,12 @@
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;
@@ -63,8 +66,7 @@
serviceDonorchargeorganVO.setAnnexFilesList(rbDetailFiles);
}
}
-
- return getDataTable(serviceDonorchargeorganVOList);
+ return getDataTable2(serviceDonorchargeorganVOList, list);
}
/**
@@ -161,7 +163,7 @@
@ApiOperation("鏀惰垂缁熻")
@PostMapping("/getListBySpStatChange")
- public TableDataInfo getListBySpStatChange(SpStatChangeReq spStatChangeReq) {
+ public TableDataInfo getListBySpStatChange(@RequestBody SpStatChangeReq spStatChangeReq) {
return getDataTable(serviceDonorchargeorganService.getListBySpStatChange(spStatChangeReq));
}
}
--
Gitblit v1.9.3