From e125b445697a6b8c2b5cc5c57f31249c5088c1c9 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Fri, 26 Jan 2018 14:44:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

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

diff --git a/src/main/java/com/moral/service/impl/MonitorPointServiceImpl.java b/src/main/java/com/moral/service/impl/MonitorPointServiceImpl.java
index f366b38..fc0db0d 100644
--- a/src/main/java/com/moral/service/impl/MonitorPointServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/MonitorPointServiceImpl.java
@@ -18,6 +18,7 @@
 import com.moral.mapper.MonitorPointMapper;
 import com.moral.service.MonitorPointService;
 import tk.mybatis.mapper.entity.Example;
+import tk.mybatis.mapper.entity.Example.Criteria;
 
 @Service
 public class MonitorPointServiceImpl implements MonitorPointService {
@@ -87,4 +88,15 @@
         }
     }
 
+	@Override
+	public List<MonitorPoint> getMonitorPointsByName(String name) {
+		Example example = new Example(MonitorPoint.class);
+		Criteria criteria = example.createCriteria();
+
+		criteria.andEqualTo("isDelete", Constants.IS_DELETE_FALSE).andLike("name", "%" + name + "%");
+		example.or().andEqualTo("isDelete", Constants.IS_DELETE_FALSE).andCondition("getPY(name) like ", "%" + name + "%");
+
+		List<MonitorPoint> monitorPoints = monitorPointMapper.selectByExample(example);
+		return monitorPoints;
+	}
 }

--
Gitblit v1.8.0