From b4cabe178f1a36433270c79048beecfab0edc487 Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Tue, 30 Jan 2018 17:20:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/moral/service/impl/MonitorPointServiceImpl.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/moral/service/impl/MonitorPointServiceImpl.java b/src/main/java/com/moral/service/impl/MonitorPointServiceImpl.java
index 3f2533b..fc0db0d 100644
--- a/src/main/java/com/moral/service/impl/MonitorPointServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/MonitorPointServiceImpl.java
@@ -30,7 +30,10 @@
ValidateUtil.notNull(parameters.get("areaName"), "param.is.null");
return monitorPointMapper.getMonitorPointsByAreaName(parameters);
}
-
+ @Override
+ public List<MonitorPoint> queryWithStateByMap(Map<String, Object> params){
+ return monitorPointMapper.selectWithStateByMap(params);
+ }
@Override
public PageBean queryByPageBean(PageBean pageBean) {
Example example = ExampleUtil.generateExample(ENTITY_CLASS,pageBean);
@@ -47,7 +50,7 @@
return new PageBean(monitorPointList);
}
@Override
- public MonitorPoint selectWithRelationById(Integer id){
+ public MonitorPoint queryWithRelationById(Integer id){
Example example = new Example(ENTITY_CLASS);
example.or().andEqualTo("id",id);
List<MonitorPoint> monitorPointList = monitorPointMapper.selectWithAreaNameByExample(example);
@@ -57,6 +60,7 @@
public void addOrModify(MonitorPoint monitorPoint) {
try{
if(monitorPoint.getId()==null){
+ monitorPoint.setIsDelete(Constants.IS_DELETE_FALSE);
monitorPointMapper.insertSelective(monitorPoint);
}else{
monitorPointMapper.updateByPrimaryKeySelective(monitorPoint);
--
Gitblit v1.8.0