From a2562974917ee6ef93325bb0a9ba785c82222792 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 27 二月 2026 11:27:14 +0800
Subject: [PATCH] 代码提交
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatebaseinfoController.java | 39 ++++++++++++++-------------------------
1 files changed, 14 insertions(+), 25 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatebaseinfoController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatebaseinfoController.java
index 9750a90..c8eb954 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatebaseinfoController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatebaseinfoController.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.annotation.RepeatSubmit;
+import com.ruoyi.common.annotation.UniqueCheck;
import com.ruoyi.common.config.RuoYiConfig;
import com.ruoyi.common.constant.HttpStatus;
import com.ruoyi.common.core.controller.BaseController;
@@ -78,12 +79,21 @@
* 鏌ヨ鎹愮尞鍩虹鍒楄〃
*/
@ApiOperation("娼滃湪鎹愮尞淇℃伅鍒楄〃")
- @GetMapping("/list")
- public TableDataInfo list(ServiceDonatebaseinfo serviceDonatebaseinfo) {
+ @PostMapping("/list")
+ public Map<String, Object> list(@RequestBody ServiceDonatebaseinfo serviceDonatebaseinfo) {
log.info("娼滃湪鎹愮尞淇℃伅鍒楄〃锛歿}", serviceDonatebaseinfo);
- startPage();
+ Integer offset = PageUtils.getOffset(serviceDonatebaseinfo.getPageNum(), serviceDonatebaseinfo.getPageSize());
+ serviceDonatebaseinfo.setPageNum(offset);
List<ServiceDonatebaseinfo> list = serviceDonatebaseinfoService.selectServiceDonatebaseinfoList(serviceDonatebaseinfo);
- return getDataTable(list);
+
+ //鑾峰彇鎬绘暟
+ serviceDonatebaseinfo.setPageNum(null);
+ serviceDonatebaseinfo.setPageSize(null);
+ Integer totalCount = 0;
+ List<ServiceDonatebaseinfo> total = serviceDonatebaseinfoService.selectServiceDonatebaseinfoList(serviceDonatebaseinfo);
+
+ if (!CollectionUtils.isEmpty(total)) totalCount = total.size();
+ return getDataTable(list, totalCount);
}
@ApiOperation("灏忕▼搴忕娼滃湪鎹愮尞淇℃伅鍒楄〃")
@@ -189,27 +199,6 @@
public AjaxResult add(@RequestBody ServiceDonatebaseinfo serviceDonatebaseinfo) {
log.info("鏂板娼滃湪鎹愮尞淇℃伅锛歿}", serviceDonatebaseinfo);
SysUser user = SecurityUtils.getLoginUser().getUser();
-
-// String bh = "";
-// bh = serviceDonatebaseinfoService.getDonateNumber(serviceDonatebaseinfo);
-// if (bh == "") {
-// return AjaxResult.error("鏂板鏃剁敓鎴愮殑缂栧彿涓虹┖,鍒涘缓澶辫触!");
-// } else {
-// ServiceDonatebaseinfo serviceDonatebaseinfo1 = new ServiceDonatebaseinfo();
-// serviceDonatebaseinfo1.setDonorno(bh);
-// List<ServiceDonatebaseinfo> listrecord = serviceDonatebaseinfoService.queryList(serviceDonatebaseinfo1);
-// if (listrecord.size() > 0) {
-// return AjaxResult.error("鏂板鏃剁敓鎴愮殑缂栧彿" + bh + "宸插瓨鍦�,鏃犳硶淇濆瓨!");
-// }
-//
-// }
- String idcardno = serviceDonatebaseinfo.getIdcardno();
- ServiceDonatebaseinfo serviceDonatebaseinfo2 = new ServiceDonatebaseinfo();
- serviceDonatebaseinfo2.setIdcardno(idcardno);
- List<ServiceDonatebaseinfo> listrecord2 = serviceDonatebaseinfoService.queryList(serviceDonatebaseinfo2);
- if (listrecord2.size() > 0) {
- return AjaxResult.error("鏂板鏃惰韩浠借瘉" + idcardno + "宸插瓨鍦�,鏃犳硶淇濆瓨!");
- }
// serviceDonatebaseinfo.setDonorno(bh);
serviceDonatebaseinfo.setDeptid(user.getDeptId());
--
Gitblit v1.9.3