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/ServiceDonationwitnessController.java | 60 ++++++++++++++++++++++++++++++++++++------------------------
1 files changed, 36 insertions(+), 24 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonationwitnessController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonationwitnessController.java
index e862b61..599b159 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonationwitnessController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonationwitnessController.java
@@ -4,15 +4,14 @@
import java.text.SimpleDateFormat;
import java.util.*;
-import com.ruoyi.common.annotation.NotRepeatCommit;
import com.ruoyi.common.config.RuoYiConfig;
import com.ruoyi.common.enums.OrganEnum;
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.project.domain.ServiceDonatebaseinfo;
+import com.ruoyi.project.domain.vo.DonationwitnessBaseInfoVO;
import com.ruoyi.project.domain.ServiceDonateorgan;
-import com.ruoyi.project.domain.ServiceDonationwitnessorgan;
+import com.ruoyi.project.domain.dto.DonationwitnessBaseInfoDTO;
import com.ruoyi.project.domain.vo.DonationWitnessVO;
import com.ruoyi.project.domain.vo.TimeVO;
import com.ruoyi.project.service.IBaseOnlyvalueService;
@@ -41,7 +40,6 @@
import com.ruoyi.project.domain.ServiceDonationwitness;
import com.ruoyi.project.service.IServiceDonationwitnessService;
import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.common.core.page.TableDataInfo;
/**
* 鎹愮尞瑙佽瘉Controller
@@ -50,7 +48,7 @@
* @date 2021-11-17
*/
@Slf4j
-@Api(description = "鎹愮尞瑙佽瘉绠＄悊")
+@Api(description = "鎹愮尞瑙佽瘉绠＄悊锛堟浜″垽瀹氾級")
@RestController
@RequestMapping("/project/donationwitness")
public class ServiceDonationwitnessController extends BaseController {
@@ -77,25 +75,39 @@
configuration.setDefaultEncoding("utf-8");
}
- /**
- * 鏌ヨ鎹愮尞瑙佽瘉鍒楄〃
- */
- @ApiOperation("鑾峰彇鎹愮尞瑙佽瘉鍒楄〃")
- //// @PreAuthorize("@ss.hasPermi('project:donationwitness:list')")
- @GetMapping("/list")
- public TableDataInfo list(ServiceDonationwitness serviceDonationwitness) {
- startPage();
- List<ServiceDonationwitness> list = serviceDonationwitnessService.queryList(serviceDonationwitness);
- return getDataTable(list);
- }
+// /**
+// * 鏌ヨ鎹愮尞瑙佽瘉鍒楄〃
+// */
+// @ApiOperation("鑾峰彇鎹愮尞瑙佽瘉鍒楄〃")
+// //// @PreAuthorize("@ss.hasPermi('project:donationwitness:list')")
+// @GetMapping("/list")
+// public TableDataInfo list(ServiceDonationwitness serviceDonationwitness) {
+// startPage();
+// List<ServiceDonationwitness> list = serviceDonationwitnessService.queryList(serviceDonationwitness);
+// return getDataTable(list);
+// }
+//
+// @ApiOperation("鑾峰彇鎹愮尞瑙佽瘉鍒楄〃-鏂�")
+// @GetMapping("/listnew")
+// public TableDataInfo listnew(DonationWitnessVO donationWitnessVO) {
+// startPage();
+// List<DonationWitnessVO> list = serviceDonationwitnessService.selectVOList(donationWitnessVO);
+// return getDataTable(list);
+// }
+@ApiOperation("鑾峰彇鎹愮尞瑙佽瘉鍩烘湰淇℃伅(鍣ㄥ畼鑾峰彇)")
+@PostMapping("/getDonationwitnessBaseInfo")
+public Map<String,Object> getDonationwitnessBaseInfo(@RequestBody DonationwitnessBaseInfoVO donationwitnessBaseInfoVO) {
+ Integer offset = PageUtils.getOffset(donationwitnessBaseInfoVO.getPageNum(), donationwitnessBaseInfoVO.getPageSize());
+ donationwitnessBaseInfoVO.setPageNum(offset);
+ List<DonationwitnessBaseInfoDTO> donationwitnessBaseInfo = serviceDonationwitnessService.getDonationwitnessBaseInfo(donationwitnessBaseInfoVO);
- @ApiOperation("鑾峰彇鎹愮尞瑙佽瘉鍒楄〃-鏂�")
- @GetMapping("/listnew")
- public TableDataInfo listnew(DonationWitnessVO donationWitnessVO) {
- startPage();
- List<DonationWitnessVO> list = serviceDonationwitnessService.selectVOList(donationWitnessVO);
- return getDataTable(list);
- }
+ donationwitnessBaseInfoVO.setPageNum(null);
+ donationwitnessBaseInfoVO.setPageSize(null);
+ Integer totalCount = 0;
+ List<DonationwitnessBaseInfoDTO> total = serviceDonationwitnessService.getDonationwitnessBaseInfo(donationwitnessBaseInfoVO);
+ if (!CollectionUtils.isEmpty(total)) totalCount = total.size();
+ return getDataTable(donationwitnessBaseInfo, totalCount);
+}
/**
--
Gitblit v1.9.3