From 4b9cbaf7b8b5e2b5cf5682dc1c0654abc2122f3f Mon Sep 17 00:00:00 2001
From: ZY <zc857179121@qq.com>
Date: 星期四, 26 九月 2024 13:26:30 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/asrs/controller/PlaController.java | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/PlaController.java b/src/main/java/com/zy/asrs/controller/PlaController.java
index 5688b5d..56d4df1 100644
--- a/src/main/java/com/zy/asrs/controller/PlaController.java
+++ b/src/main/java/com/zy/asrs/controller/PlaController.java
@@ -11,7 +11,6 @@
import com.core.common.R;
import com.core.common.SnowflakeIdWorker;
import com.core.exception.CoolException;
-import com.microsoft.sqlserver.jdbc.SQLServerException;
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.GlobleParameter;
import com.zy.asrs.entity.result.KeyValueVo;
@@ -366,9 +365,14 @@
.andNew().like("batch", condition)
.groupBy("batch")
.orderBy("batch", false);
- List<Pla> plas = plaService.selectPage(new Page<Pla>(1, 30), wrapper).getRecords();
+ Page<Pla> plaPage = new Page<>(1, 30);
+ plaPage.setSearchCount(false);
+ Page<Pla> plaPage1 = plaService.selectPage(plaPage, wrapper);
+ // 閲嶆柊鏌ヨ鐒跺悗缁檖age璁剧疆Total
+ plaPage.setTotal(this.plaService.selectCount(new EntityWrapper<Pla>().setSqlSelect("batch")
+ .andNew().like("batch", condition)));
List<KeyValueVo> valueVos = new ArrayList<>();
- for (Pla pla : plas) {
+ for (Pla pla : plaPage1.getRecords()) {
KeyValueVo vo = new KeyValueVo();
vo.setName(pla.getBatch());
vo.setValue(pla.getBatch());
--
Gitblit v1.9.1