From 7e2007c0cc602047823c003e8a4276b00fc58f4b Mon Sep 17 00:00:00 2001
From: aix <vip_xiaobin810@163.com>
Date: Thu, 04 Jul 2024 16:03:24 +0800
Subject: [PATCH] 行政区划筛选

---
 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbResDykeServiceImpl.java |   38 +++++++++++++++++++++++++++++---------
 1 files changed, 29 insertions(+), 9 deletions(-)

diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbResDykeServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbResDykeServiceImpl.java
index 016e577..9ad74c3 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbResDykeServiceImpl.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbResDykeServiceImpl.java
@@ -4,6 +4,7 @@
 import cn.gistack.sm.sjztmd.mapper.TbResDykeMapper;
 import cn.gistack.sm.sjztmd.service.ITbResDykeService;
 import cn.gistack.sm.sjztmd.vo.TbResDykeVO;
+import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -15,6 +16,7 @@
 
 @Data
 @Service
+@DS("zt")
 public class TbResDykeServiceImpl extends ServiceImpl<TbResDykeMapper, TbResDyke> implements ITbResDykeService {
 	@Override
 	public TbResDykeVO getDetail(TbResDyke resDyke) {
@@ -23,15 +25,6 @@
 
 	@Override
 	public Object getList(IPage<TbResDykeVO> page, TbResDykeVO tbResDykeVO) {
-		if (tbResDykeVO.getIsPage()){
-			return page.setRecords(baseMapper.getPage(page,tbResDykeVO));
-		}else {
-			return baseMapper.getPage(null,tbResDykeVO);
-		}
-	}
-
-	@Override
-	public IPage<TbResDykeVO> findTbResDykePcBy(IPage<TbResDykeVO> page, TbResDykeVO tbResDykeVO) {
 
 		if (StringUtil.isNotBlank(tbResDykeVO.getAdCode())){
 			//若行政区划不为空
@@ -52,7 +45,34 @@
 			tbResDykeVO.setAdCode(adCode);
 		}
 
+		if (tbResDykeVO.getIsPage()){
+			return page.setRecords(baseMapper.getPage(page,tbResDykeVO));
+		}else {
+			return baseMapper.getPage(null,tbResDykeVO);
+		}
+	}
 
+	@Override
+	public IPage<TbResDykeVO> findTbResDykePcBy(IPage<TbResDykeVO> page, TbResDykeVO tbResDykeVO) {
+
+//		if (StringUtil.isNotBlank(tbResDykeVO.getAdCode())){
+//			//若行政区划不为空
+//			String adCode =tbResDykeVO.getAdCode();
+//
+//			if (adCode.substring(0,4).indexOf("00") > -1) {
+//				//前四位包含00说明是湖北省      4200/00000000
+//				adCode =StringUtil.format("%{}%",adCode.substring(0,2));
+//			} else if (adCode.substring(0,6).indexOf("00") > -1) {
+//				//前六位包含00说明是市级    420100/000000
+////				adCode = paramAd.substring(0,4);
+//				adCode =StringUtil.format("%{}%",adCode.substring(0,4));
+//			}else if (adCode.substring(0,8).indexOf("00") > -1){
+//				//前8位包含00 说明是区级     42011700/0000
+////				adCode = paramAd.substring(0,6);
+//				adCode =StringUtil.format("%{}%",adCode.substring(0,6));
+//			}
+//			tbResDykeVO.setAdCode(adCode);
+//		}
 
 		if (tbResDykeVO.getIsPage()){
 			return page.setRecords(baseMapper.findTbResDykePcBy(page,tbResDykeVO));

--
Gitblit v1.9.3