From f3f76a51c4e41ae9617b592ae7747ba6b4d8d272 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期五, 18 四月 2025 15:06:15 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/controller/BasWrkIotypeController.java | 8 +++++++-
src/main/java/com/zy/asrs/controller/BasPlcerrorController.java | 8 +++++++-
src/main/java/com/zy/asrs/controller/BasCrnErrorController.java | 7 ++++++-
3 files changed, 20 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/BasCrnErrorController.java b/src/main/java/com/zy/asrs/controller/BasCrnErrorController.java
index d99ba7f..2a3d596 100644
--- a/src/main/java/com/zy/asrs/controller/BasCrnErrorController.java
+++ b/src/main/java/com/zy/asrs/controller/BasCrnErrorController.java
@@ -41,7 +41,12 @@
EntityWrapper<BasCrnError> wrapper = new EntityWrapper<>();
convert(param, wrapper);
if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
- return R.ok(basCrnErrorService.selectPage(new Page<>(curr, limit), wrapper));
+// return R.ok(basCrnErrorService.selectPage(new Page<>(curr, limit), wrapper));
+
+ List<BasCrnError> basCrnErrorList = basCrnErrorService.selectList(wrapper);
+ Page<BasCrnError> page = new Page<BasCrnError>(0, 100).setRecords(basCrnErrorList);
+ page.setTotal(basCrnErrorList.size());
+ return R.ok(page);
}
private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
diff --git a/src/main/java/com/zy/asrs/controller/BasPlcerrorController.java b/src/main/java/com/zy/asrs/controller/BasPlcerrorController.java
index 998ff6e..c12c320 100644
--- a/src/main/java/com/zy/asrs/controller/BasPlcerrorController.java
+++ b/src/main/java/com/zy/asrs/controller/BasPlcerrorController.java
@@ -7,6 +7,7 @@
import com.baomidou.mybatisplus.plugins.Page;
import com.core.common.DateUtils;
import com.zy.asrs.entity.BasPlcerror;
+import com.zy.asrs.entity.BasWrkIotype;
import com.zy.asrs.service.BasPlcerrorService;
import com.core.annotations.ManagerAuth;
import com.core.common.BaseRes;
@@ -41,7 +42,12 @@
excludeTrash(param);
convert(param, wrapper);
if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
- return R.ok(basPlcerrorService.selectPage(new Page<>(curr, limit), wrapper));
+// return R.ok(basPlcerrorService.selectPage(new Page<>(curr, limit), wrapper));
+
+ List<BasPlcerror> basPlcerrorList = basPlcerrorService.selectList(wrapper);
+ Page<BasPlcerror> page = new Page<BasPlcerror>(0, 100).setRecords(basPlcerrorList);
+ page.setTotal(basPlcerrorList.size());
+ return R.ok(page);
}
private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
diff --git a/src/main/java/com/zy/asrs/controller/BasWrkIotypeController.java b/src/main/java/com/zy/asrs/controller/BasWrkIotypeController.java
index b06ff19..068c751 100644
--- a/src/main/java/com/zy/asrs/controller/BasWrkIotypeController.java
+++ b/src/main/java/com/zy/asrs/controller/BasWrkIotypeController.java
@@ -41,7 +41,13 @@
EntityWrapper<BasWrkIotype> wrapper = new EntityWrapper<>();
convert(param, wrapper);
if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
- return R.ok(basWrkIotypeService.selectPage(new Page<>(curr, limit), wrapper));
+// return R.ok(basWrkIotypeService.selectPage(new Page<>(curr, limit), wrapper));
+ List<BasWrkIotype> basWrkIotypeList = basWrkIotypeService.selectList(wrapper);
+ Page<BasWrkIotype> page = new Page<BasWrkIotype>(0, 10).setRecords(basWrkIotypeList);
+ page.setTotal(basWrkIotypeList.size());
+ return R.ok(page);
+
+
}
private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
--
Gitblit v1.9.1