修改 数据接口
This commit is contained in:
parent
92b54c0e03
commit
aaf8c8a4e5
|
|
@ -66,7 +66,7 @@
|
|||
left join tb_device_detail tdd on tbd.device_id=tdd.device_id
|
||||
left join tb_device_value tdv on tdd.id=tdv.attribute_id
|
||||
left join tb_pro_bd tpb on tpb.id=tbd.bd_id
|
||||
WHERE tpb.bid_code = #{bidCode}
|
||||
WHERE tpb.bid_code = #{bidCode} and tbd.del_flag=0
|
||||
and tbd.devic_type = 1906
|
||||
<if test="deviceId!=null and deviceId!=''">
|
||||
AND tbd.device_id=#{deviceId}
|
||||
|
|
@ -85,7 +85,7 @@
|
|||
left join tb_his_device_value tdv on tdd.id=tdv.attribute_id
|
||||
left join tb_pro_bd tpb on tpb.id=tbd.bd_id
|
||||
WHERE
|
||||
tbd.devic_type = 1906 and tdv.val is not null and tpb.bid_code = #{bidCode}
|
||||
tbd.devic_type = 1906 and tdv.val is not null and tpb.bid_code = #{bidCode} and tbd.del_flag=0
|
||||
<if test="deviceName!=null and deviceName!=''">
|
||||
AND tbd.device_name like concat('%',#{deviceName},'%')
|
||||
</if>
|
||||
|
|
|
|||
Loading…
Reference in New Issue