|
@@ -68,11 +68,10 @@
|
|
|
CONCAT(CONCAT(CONCAT( threshold_lo, '~', threshold_up ),'(',CONCAT( threshold_los, '~', threshold_ups )),')') AS upperLimit,
|
|
|
CONCAT( ppt.threshold_los, '~', ppt.threshold_ups ) AS upperUpperLimit,
|
|
|
ppt.status AS status
|
|
|
- FROM
|
|
|
- perception_monitor_info pmi
|
|
|
+ FROM process_parameters_tag ppt
|
|
|
+ LEFT JOIN perception_monitor_info pmi ON ppt.tag_code = pmi.tag_code
|
|
|
LEFT JOIN platform_info pi ON pmi.platform_code = pi.platform_code
|
|
|
- LEFT JOIN app_info ai ON ai.id = pmi.app_id
|
|
|
- LEFT JOIN process_parameters_tag ppt ON pmi.tag_code = ppt.tag_code
|
|
|
+ LEFT JOIN app_info ai ON pmi.app_id = ai.id
|
|
|
<where>
|
|
|
pi.delete_flag = '0' and ppt.del_flag = '0'
|
|
|
<if test="param.platformId != null and param.platformId != ''">
|
|
@@ -85,7 +84,7 @@
|
|
|
and pmi.tag_type = #{param.paramType}
|
|
|
</if>
|
|
|
<if test="param.tagCode != null and param.tagCode != ''">
|
|
|
- and pmi.tag_code = #{param.tagCode}
|
|
|
+ and ppt.tag_code = #{param.tagCode}
|
|
|
</if>
|
|
|
<if test="param.startDate != null">
|
|
|
and DATE(pmi.collect_time) >= #{param.startDate}
|