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 | 17 +++++++++++++----
ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonatebaseinfo.java | 2 +-
ruoyi-project/src/main/resources/mapper/project/ServiceDonatebaseinfoMapper.xml | 2 +-
3 files changed, 15 insertions(+), 6 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 e621012..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
@@ -79,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("灏忕▼搴忕娼滃湪鎹愮尞淇℃伅鍒楄〃")
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonatebaseinfo.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonatebaseinfo.java
index ad330de..016a141 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonatebaseinfo.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonatebaseinfo.java
@@ -599,7 +599,7 @@
* 妗堜緥鏃堕棿
*/
@ApiModelProperty("妗堜緥鏃堕棿")
- @TableField(fill = FieldFill.INSERT_UPDATE)
+// @TableField(fill = FieldFill.INSERT_UPDATE)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date donatetime;
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceDonatebaseinfoMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceDonatebaseinfoMapper.xml
index a7355d1..bc0be20 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceDonatebaseinfoMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceDonatebaseinfoMapper.xml
@@ -242,7 +242,7 @@
</where>
order by ReportTime desc
-
+ <if test="pageNum != null and pageSize != null">limit #{pageNum},#{pageSize}</if>
</select>
<select id="getDonateNumberById" resultType="java.lang.String">
--
Gitblit v1.9.3