From 33ac7b93dfff9410aa0699e135a5811d8b96ccb9 Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期四, 28 十二月 2023 11:23:27 +0800
Subject: [PATCH] 2023-12-28 朱宝民 农户查询返回值增加农户ID，字符串形式返回，区划返回ID转字符串
---
pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/divide/DivideSv.java | 26 ++++++++++++++++++++++----
1 files changed, 22 insertions(+), 4 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/divide/DivideSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/divide/DivideSv.java
index 26a5dc4..ed8e8be 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/divide/DivideSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/divide/DivideSv.java
@@ -47,14 +47,23 @@
public QueryResultVo<List<VoDivide>> getDivides(QueryVo queryVo) {
Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(queryVo);
+ // 璁＄畻绗﹀悎鏉′欢鐨勮褰曟暟
Long itemTotal = prDivideMapper.getRecordCount(params);
QueryResultVo<List<VoDivide>> rsVo = new QueryResultVo<>() ;
- rsVo.pageSize = queryVo.pageSize ;
- //rsVo.pageCurr = queryVo.pageCurr ;
- Integer pageCurr = (Integer.parseInt(params.get("pageCurr").toString()) - 1) * Integer.parseInt(params.get("pageSize").toString());
+
+ Integer pageCurr = 0;
+ Integer pageSize = 10000;
+ rsVo.pageCurr = 1;
+ rsVo.pageSize = 10000;
+ if(queryVo.pageSize != null && queryVo.pageCurr != null) {
+ rsVo.pageSize = queryVo.pageSize ;
+ rsVo.pageCurr = queryVo.pageCurr;
+ pageSize = queryVo.pageSize ;
+ pageCurr = (Integer.parseInt(params.get("pageCurr").toString()) - 1) * Integer.parseInt(params.get("pageSize").toString());
+ }
params.put("pageCurr", pageCurr);
- rsVo.pageCurr = pageCurr;
+ params.put("pageSize", pageSize);
rsVo.calculateAndSet(itemTotal, params);
rsVo.obj = prDivideMapper.getDivides(params);
@@ -108,4 +117,13 @@
public Integer updateByPrimaryKey(PrDivide po) {
return prDivideMapper.updateByPrimaryKey(po);
}
+
+ /**
+ * 鏍规嵁鍒嗘按鎴跨紪鍙疯幏鍙栨墍灞炵墖鍖虹紪鍙�
+ * @param divideId 鍒嗘按鎴縄D
+ * @return 鎵�灞炵墖鍖篒D
+ */
+ public Long getBlockIdById(Long divideId) {
+ return prDivideMapper.getBlockIdById(divideId);
+ }
}
--
Gitblit v1.8.0