From 0bb9f6c3e894e56ff58d335110fbe4cfa87b64b2 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期三, 28 一月 2026 14:17:19 +0800
Subject: [PATCH] 代码提交
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatecompletioninfoController.java | 33 ++++++++++++++++++++++-----------
1 files changed, 22 insertions(+), 11 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 5d5af86..2d52701 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,10 +9,13 @@
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.enums.OrganEnum;
import com.ruoyi.common.exception.base.BaseException;
+import com.ruoyi.common.utils.PageUtils;
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;
+import com.ruoyi.project.domain.dto.DonationCompletionBaseInfoDTO;
+import com.ruoyi.project.domain.dto.DonationwitnessBaseInfoDTO;
import com.ruoyi.project.domain.vo.DonationCompletionBaseInfoVO;
import com.ruoyi.project.domain.vo.DonationCompletionVO;
import com.ruoyi.project.service.IServiceDonatecompletioninfoService;
@@ -60,17 +63,25 @@
configuration.setDefaultEncoding("utf-8");
}
-// /**
-// * 鏌ヨ鎹愮尞瀹屾垚鍒楄〃
-// */
-// @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);
-// }
+ /**
+ * 鏌ヨ鎹愮尞瀹屾垚鍒楄〃鍩烘湰淇℃伅
+ */
+ @ApiOperation("鏌ヨ鎹愮尞瀹屾垚鍒楄〃鍩烘湰淇℃伅锛堝櫒瀹樺埄鐢級")
+ //// @PreAuthorize("@ss.hasPermi('project:donatecompletioninfo:list')")
+ @PostMapping("/getDonationCompletionBaseInfo")
+ public Map<String, Object> getDonationCompletionBaseInfo(@RequestBody DonationCompletionBaseInfoVO donationCompletionBaseInfoVO) {
+ log.info("鏌ヨ鎹愮尞瀹屾垚鍒楄〃鍩烘湰淇℃伅锛歿}", donationCompletionBaseInfoVO);
+ Integer offset = PageUtils.getOffset(donationCompletionBaseInfoVO.getPageNum(), donationCompletionBaseInfoVO.getPageSize());
+ donationCompletionBaseInfoVO.setPageNum(offset);
+ List<DonationCompletionBaseInfoDTO> donationCompletionBaseInfoDTOList = serviceDonatecompletioninfoService.getDonationCompletionBaseInfo(donationCompletionBaseInfoVO);
+
+ donationCompletionBaseInfoVO.setPageNum(null);
+ donationCompletionBaseInfoVO.setPageSize(null);
+ Integer totalCount = 0;
+ List<DonationCompletionBaseInfoDTO> total = serviceDonatecompletioninfoService.getDonationCompletionBaseInfo(donationCompletionBaseInfoVO);
+ if (!org.springframework.util.CollectionUtils.isEmpty(total)) totalCount = total.size();
+ return getDataTable(donationCompletionBaseInfoDTOList,totalCount);
+ }
/**
--
Gitblit v1.9.3