From 3df4f24049c8b3e4c36fde16a67a436ce37f00ad Mon Sep 17 00:00:00 2001
From: JinPengYong <812110275@qq.com>
Date: Sun, 26 Apr 2020 16:18:30 +0800
Subject: [PATCH] Merge branch 'master' of F:\moral\moral\screen_api_v2 with conflicts.
---
src/main/java/com/moral/mapper/MonitorPointMapper.java | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/moral/mapper/MonitorPointMapper.java b/src/main/java/com/moral/mapper/MonitorPointMapper.java
index b0addba..815c197 100644
--- a/src/main/java/com/moral/mapper/MonitorPointMapper.java
+++ b/src/main/java/com/moral/mapper/MonitorPointMapper.java
@@ -3,6 +3,8 @@
import java.util.List;
import java.util.Map;
+import org.apache.ibatis.annotations.Param;
+
import com.moral.common.mapper.BaseMapper;
import com.moral.entity.MonitorPoint;
import tk.mybatis.mapper.entity.Example;
@@ -10,6 +12,9 @@
public interface MonitorPointMapper extends BaseMapper<MonitorPoint>{
List<MonitorPoint> selectWithAreaNameByExample(Example example);
List<MonitorPoint> getMonitorPointsByAreaName(Map<String, Object> parameters);
-
- List<MonitorPoint> selectWithStateByMap(Map<String, Object> params);
+ List<MonitorPoint> selectByMap(Map<String, Object> params);
+ List<Integer> selectOrganizationIds(int id);
+ List<Integer> selectVersionsById(int id);
+ Map<String, Object> selectAllById(int id);
+ List<Map<String, Object>> getIdByOrganizationId(@Param("organizationIdList") List<Object> organizationIdList);
}
\ No newline at end of file
--
Gitblit v1.8.0