From 9b33e93fccddea356c3d686684fc58ceb176ff39 Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Fri, 30 Mar 2018 15:01:26 +0800
Subject: [PATCH] 增加 省市区 查询条件

---
 src/main/java/com/moral/service/impl/MonitorPointServiceImpl.java |   27 ++++++++++++++++++++++++++-
 1 files changed, 26 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/moral/service/impl/MonitorPointServiceImpl.java b/src/main/java/com/moral/service/impl/MonitorPointServiceImpl.java
index baa1462..5ae279f 100644
--- a/src/main/java/com/moral/service/impl/MonitorPointServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/MonitorPointServiceImpl.java
@@ -1,5 +1,6 @@
 package com.moral.service.impl;
 
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
@@ -153,10 +154,25 @@
 		Criteria criteria = example.createCriteria();
 
 		criteria.andEqualTo("isDelete", Constants.IS_DELETE_FALSE).andLike("name", "%" + name + "%");
-		example.or().andEqualTo("isDelete", Constants.IS_DELETE_FALSE).andCondition("getPY(REPLACE (REPLACE (name,'���',''),'���','')) like ", "%" + name + "%");
+		example.or().andEqualTo("isDelete", Constants.IS_DELETE_FALSE)
+				.andCondition("getPY(" + getReplaceStr("name") + ") like ", "%" + name + "%");
 
 		List<MonitorPoint> monitorPoints = monitorPointMapper.selectByExample(example);
 		return monitorPoints;
+	}
+
+	private String getReplaceStr(String name){
+        List<String[]> list = new ArrayList<String[]>();
+        list.add(new String[]{"���",""});
+        list.add(new String[]{"���",""});
+        for (String[] string : list) {
+        	name = replace(name,string[0],string[1]);
+		}
+		return name;
+	}
+	
+	private  String replace(String name,String fromStr,String toStr){
+		return "REPLACE (" + name + ",'" + fromStr + "','" + toStr + "')";
 	}
 
     /**
@@ -188,4 +204,13 @@
 		example.orderBy("name").asc();
 		return monitorPointMapper.selectByExample(example);
 	}
+	@Override
+	public List<MonitorPoint> getMonitorPointsByRegion(Map<String, Object> parameters) {
+		Example example = new Example(MonitorPoint.class);
+		Criteria criteria = example.createCriteria();
+		
+		criteria.andEqualTo("isDelete", Constants.IS_DELETE_FALSE);
+		criteria.andEqualTo(parameters.get("name").toString(), parameters.get("value"));
+		return monitorPointMapper.selectByExample(example);
+	}
 }

--
Gitblit v1.8.0