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 |   66 ++++++++++++++++++++++++++++++++-
 1 files changed, 64 insertions(+), 2 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 5180d7a..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
@@ -1,6 +1,7 @@
 package com.dy.pipIrrProject.divide;
 
 import com.dy.common.webUtil.QueryResultVo;
+import com.dy.pipIrrGlobal.daoBa.BaDistrictMapper;
 import com.dy.pipIrrGlobal.daoPr.PrDivideMapper;
 import com.dy.pipIrrGlobal.pojoPr.PrDivide;
 import com.dy.pipIrrGlobal.voPr.VoDivide;
@@ -26,6 +27,9 @@
     @Autowired
     private PrDivideMapper prDivideMapper;
 
+    @Autowired
+    private BaDistrictMapper baDistrictMapper;
+
     /**
      * 娣诲姞鍒嗘按鎴�
      * @param po
@@ -43,11 +47,24 @@
     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 = 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);
+        params.put("pageSize", pageSize);
+
         rsVo.calculateAndSet(itemTotal, params);
         rsVo.obj = prDivideMapper.getDivides(params);
         return rsVo ;
@@ -64,4 +81,49 @@
         rsVo = prDivideMapper.getDivides(params);
         return rsVo ;
     }
+
+    /**
+     * 鏍规嵁鍒嗘按鎴夸富閿幏鍙栧垎姘存埧瀵硅薄
+     * @param id
+     * @return
+     */
+    public PrDivide getOneDivide(Long id) {
+        return prDivideMapper.selectByPrimaryKey(id);
+    }
+
+    /**
+     * 鏍规嵁涓婚敭閫昏緫鍒犻櫎涓�涓垎姘存埧
+     * @param id
+     * @return
+     */
+    public Integer deleteDivideById(Long id) {
+        return prDivideMapper.deleteDivideById(id);
+    }
+
+    /**
+     * 鏍规嵁鏉戠紪鍙疯幏鍙�5绾у尯鍒掍俊鎭�
+     * @param villageId 鏉戠紪鍙凤紙涓婚敭锛�
+     * @return 5绾ц鏀垮尯鍒掍俊鎭�
+     */
+    public Map getDistrictsByVillageId(Long villageId) {
+        return baDistrictMapper.getDistrictsByVillageId(villageId);
+    }
+
+    /**
+     * 淇敼鍒嗘按鎴垮璞�
+     * @param po 鍐滄埛瀵硅薄
+     * @return 淇敼璁板綍鏉℃暟
+     */
+    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