From f5a35b86d6d66bcc7961626f1de1940c775d0bd9 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期五, 18 四月 2025 14:06:39 +0800
Subject: [PATCH] 小程序获取轮灌组取消分页功能
---
pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/irrigation/IrrigationSv.java | 13 +++++++------
pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/irrigation/IrrigationCtrl.java | 6 +++---
2 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/irrigation/IrrigationCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/irrigation/IrrigationCtrl.java
index 86c6104..6962e05 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/irrigation/IrrigationCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/irrigation/IrrigationCtrl.java
@@ -46,14 +46,14 @@
}
@GetMapping(path = "/getSimpleGroups")
- public BaseResponse<QueryResultVo<List<VoGroupSimple>>> getSimpleGroups(QoGroup qo) {
+ public BaseResponse<List<VoGroupSimple>> getSimpleGroups(QoGroup qo) {
if(qo.getProjectId() == null) {
return BaseResponseUtils.buildErrorMsg("璇烽�夋嫨椤圭洰");
}
try {
- QueryResultVo<List<VoGroupSimple>> res = irrigationSv.getSimpleGroups(qo);
- return BaseResponseUtils.buildSuccess(res);
+ //QueryResultVo<List<VoGroupSimple>> res = irrigationSv.getSimpleGroups(qo);
+ return BaseResponseUtils.buildSuccess(irrigationSv.getSimpleGroups(qo));
} catch (Exception e) {
log.error("鑾峰彇杞亴缁勮褰曞紓甯�", e);
return BaseResponseUtils.buildException(e.getMessage());
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/irrigation/IrrigationSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/irrigation/IrrigationSv.java
index a5499ef..53d5b19 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/irrigation/IrrigationSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/irrigation/IrrigationSv.java
@@ -46,15 +46,16 @@
* @param queryVo
* @return
*/
- public QueryResultVo<List<VoGroupSimple>> getSimpleGroups(QoGroup queryVo) {
+ public List<VoGroupSimple> getSimpleGroups(QoGroup queryVo) {
Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(queryVo);
- Long itemTotal = irIrrigateGroupMapper.getSimpleGroupCount(params);
+ //Long itemTotal = irIrrigateGroupMapper.getSimpleGroupCount(params);
- QueryResultVo<List<VoGroupSimple>> rsVo = new QueryResultVo<>();
+ //QueryResultVo<List<VoGroupSimple>> rsVo = new QueryResultVo<>();
- rsVo.calculateAndSet(itemTotal, params);
- rsVo.obj = irIrrigateGroupMapper.getSimpleGroups(params);
- return rsVo;
+ //rsVo.calculateAndSet(itemTotal, params);
+ //rsVo.obj = irIrrigateGroupMapper.getSimpleGroups(params);
+ //return rsVo;
+ return irIrrigateGroupMapper.getSimpleGroups(params);
}
}
--
Gitblit v1.8.0