From 8d2b573ced32e6ca6fab7c1dc45e1fa108030ba1 Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期三, 28 八月 2024 17:21:23 +0800 Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV --- pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/divide/DivideSv.java | 65 ++++++++++++++++++++++++++++++++ 1 files changed, 65 insertions(+), 0 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 9633b5f..69d6b32 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; @@ -9,6 +10,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -24,6 +26,9 @@ public class DivideSv { @Autowired private PrDivideMapper prDivideMapper; + + @Autowired + private BaDistrictMapper baDistrictMapper; /** * 娣诲姞鍒嗘按鎴� @@ -42,13 +47,73 @@ 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 ; + rsVo.calculateAndSet(itemTotal, params); rsVo.obj = prDivideMapper.getDivides(params); return rsVo ; } + + /** + * 鏍规嵁鎸囧畾鏉′欢瀵煎嚭鍒嗘按鎴垮垪琛� + * @param queryVo + * @return + */ + public List<VoDivide> exportDivides(QueryVo queryVo) { + Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(queryVo); + List<VoDivide> rsVo = new ArrayList<>(); + 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); + return prDivideMapper.updateByPrimaryKeySelective(po); + } + + /** + * 鏍规嵁鍒嗘按鎴跨紪鍙疯幏鍙栨墍灞炵墖鍖虹紪鍙� + * @param divideId 鍒嗘按鎴縄D + * @return 鎵�灞炵墖鍖篒D + */ + public Long getBlockIdById(Long divideId) { + return prDivideMapper.getBlockIdById(divideId); + } } -- Gitblit v1.8.0