|
|
@@ -96,7 +96,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
a.area_id,
|
|
|
a.building_id,
|
|
|
a.unit_id ,
|
|
|
- c.name AS unitName,
|
|
|
+ <if test="buildingId != null and buildingId != ''">
|
|
|
+ CONCAT(bd.name,'栋',c.name,'单元') AS unitName,
|
|
|
+ </if>
|
|
|
+ <if test="unitId != null and unitId != ''">
|
|
|
+ CONCAT(c.name,'单元') AS unitName,
|
|
|
+ </if>
|
|
|
+ CONCAT(bd.name,c.name) AS unitName,
|
|
|
a.NAME AS roomName,
|
|
|
a.id AS roomId,
|
|
|
b.engin_type AS enginCycle,
|
|
|
@@ -106,6 +112,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
z_house a
|
|
|
LEFT JOIN z_engineering_civil b ON a.id = b.house_id AND b.engin_cycle=#{enginCycle}
|
|
|
LEFT JOIN z_unit c ON c.id=a.unit_id
|
|
|
+ LEFT JOIN z_building bd ON bd.id=a.building_id
|
|
|
WHERE
|
|
|
a.del_flag=0
|
|
|
<if test="areaId != null and areaId != ''">
|
