|
|
@@ -24,6 +24,9 @@
|
|
|
<result column="update_time" property="updateTime"/>
|
|
|
<result column="merc_name" property="mercName"/>
|
|
|
<result column="create_time" property="createTime"/>
|
|
|
+ <association property="deviceStatus" javaType="com.xy.dto.DeviceStatusDto$Vo">
|
|
|
+ <result column="net_type" property="netType"/>
|
|
|
+ </association>
|
|
|
</association>
|
|
|
<association property="deviceCharging" javaType="com.xy.dto.DeviceChargingDto$Vo">
|
|
|
<result column="charging_sum_money" property="chargingSumMoney" />
|
|
|
@@ -36,8 +39,10 @@
|
|
|
|
|
|
<select id="page" resultMap="queryPageMap">
|
|
|
select di.*,
|
|
|
+ ds.net_state,
|
|
|
dc.charging_sum_money, dc.charging_x, dc.timeout, dc.last_charging_time, dc.create_time as charging_create_time
|
|
|
from device_info di
|
|
|
+ join device_status ds on (di.device_id = ds.device_id)
|
|
|
join device_charging dc on(di.device_id = dc.device_id)
|
|
|
where
|
|
|
1 = 1
|
