From 30d2366d51e7d3f3bfdb4652f9d3a07a531d907b Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Sat, 23 Jun 2018 11:10:16 +0800
Subject: [PATCH] api 更新
---
src/main/resources/mapper/DeviceMapper.xml | 29 ++++++++++++++++++++++-------
1 files changed, 22 insertions(+), 7 deletions(-)
diff --git a/src/main/resources/mapper/DeviceMapper.xml b/src/main/resources/mapper/DeviceMapper.xml
index 35c4788..dec7671 100644
--- a/src/main/resources/mapper/DeviceMapper.xml
+++ b/src/main/resources/mapper/DeviceMapper.xml
@@ -175,17 +175,17 @@
mpt.organization_id = #{orgId}
</if>
and dev.is_delete = 0
- and (
- <![CDATA[
- 1 <> 1
- ]]>
+ <if test="devState!=null">
+ and dev.state = #{devState}
+ </if>
<if test="name!=null and ''!=name">
- or dev.name like CONCAT('%',#{name},'%')
+ and
+ (
+ dev.name like CONCAT('%',#{name},'%')
or dev.mac like CONCAT('%',#{name},'%')
or mpt.name like CONCAT('%',#{name},'%')
+ )
</if>
- )
-
</where>
</select>
<select id="selectByOrgIdAndMpId" resultMap="BaseResultMap">
@@ -259,6 +259,12 @@
<if test="areaCode != null">
AND mp.area_code = #{areaCode}
</if>
+ <if test="townCode != null">
+ AND mp.town_code = #{townCode}
+ </if>
+ <if test="villageCode != null">
+ AND mp.village_code = #{villageCode}
+ </if>
)
<if test="professionId != null">
AND d.profession_id = #{professionId}
@@ -288,6 +294,15 @@
<if test="areaCode != null">
AND mp.area_code = #{areaCode}
</if>
+ <if test="monitorPointId != null">
+ AND mp.id = #{monitorPointId}
+ </if>
+ <if test="townCode != null">
+ AND mp.town_code = #{townCode}
+ </if>
+ <if test="villageCode != null">
+ AND mp.village_code = #{villageCode}
+ </if>
)
<if test="professionId != null">
AND d.profession_id = #{professionId}
--
Gitblit v1.8.0