2 Commits

1 changed files with 105 additions and 22 deletions
Unified View
  1. +105
    -22
      inspect-main/inspect-main-task/src/main/resources/mapper/task/PatrolResultMapper.xml

+ 105
- 22
inspect-main/inspect-main-task/src/main/resources/mapper/task/PatrolResultMapper.xml View File

@ -874,45 +874,127 @@
<result property="lineId" column="line_id"/> <result property="lineId" column="line_id"/>
<result property="createTime" column="create_time"/> <result property="createTime" column="create_time"/>
</resultMap> </resultMap>
<select id="selectOilResultValue" parameterType="PatrolResult" resultMap="ResultValue">
<!-- <select id="selectOilResultValue" parameterType="PatrolResult" resultMap="ResultValue">-->
<!-- SELECT-->
<!-- a.patrol_point_id,-->
<!-- d.area_name,-->
<!-- d.patrol_device_name,-->
<!-- f.patrol_point_name,-->
<!-- CASE-->
<!-- WHEN e.`value` = 'check image' THEN-->
<!-- '0' ELSE e.`value`-->
<!-- END `value`,-->
<!-- h.dict_value line_id,-->
<!-- e.create_time,-->
<!-- a.channel_code-->
<!-- FROM-->
<!-- patrol_preset_pos a-->
<!-- LEFT JOIN patrol_result e ON a.patrol_point_id = e.device_id-->
<!-- RIGHT JOIN (-->
<!-- SELECT-->
<!-- MAX( h.line_id ) line_id-->
<!-- FROM-->
<!-- patrol_result h-->
<!-- <where>-->
<!-- <if test="createTime != null ">-->
<!-- DATE_FORMAT( h.create_time, '%y%m%d' ) = DATE_FORMAT( #{createTime}, '%y%m%d' )-->
<!-- </if>-->
<!-- </where>-->
<!-- GROUP BY-->
<!-- h.device_id-->
<!-- ) i ON e.line_id = i.line_id-->
<!-- RIGHT JOIN ( SELECT g.dict_value, g.dict_label FROM sys_dict_data g WHERE g.dict_type = 'oil_api' ) h ON-->
<!-- h.dict_label = a.patrol_point_id-->
<!-- LEFT JOIN basedata_eqpbook d ON a.eqp_book_id = d.eqp_book_id-->
<!-- LEFT JOIN basedata_patrolpoint f ON a.patrol_point_id = f.patrol_point_id-->
<!-- ORDER BY-->
<!-- d.area_name,-->
<!-- d.patrol_device_name-->
<!-- </select>-->
<select id="selectOilResultValue" parameterType="PatrolResult" resultMap="ResultValue">
SELECT SELECT
a.patrol_point_id, a.patrol_point_id,
d.area_name, d.area_name,
d.patrol_device_name, d.patrol_device_name,
f.patrol_point_name, f.patrol_point_name,
CASE CASE
WHEN e.`value` = 'check image' THEN
'0' ELSE e.`value`
END `value`,
h.dict_value line_id,
WHEN e.`value` = 'check image' THEN '0'
ELSE e.`value`
END AS `value`,
h.dict_value AS line_id,
e.create_time, e.create_time,
a.channel_code a.channel_code
FROM
patrol_preset_pos a
LEFT JOIN patrol_result e ON a.patrol_point_id = e.device_id
FROM patrol_preset_pos a
LEFT JOIN patrol_result e
ON a.patrol_point_id = e.device_id
RIGHT JOIN ( RIGHT JOIN (
SELECT SELECT
MAX( h.line_id ) line_id
FROM
patrol_result h
MAX(h.line_id) AS line_id
FROM patrol_result h
<where> <where>
<if test="createTime != null ">
DATE_FORMAT( h.create_time, '%y%m%d' ) = DATE_FORMAT( #{createTime}, '%y%m%d' )
<if test="createTime != null">
h.create_time <![CDATA[>=]]> DATE(#{createTime})
AND h.create_time <![CDATA[<]]> DATE_ADD(DATE(#{createTime}), INTERVAL 1 DAY)
</if> </if>
</where> </where>
GROUP BY
h.device_id
GROUP BY h.device_id
) i ON e.line_id = i.line_id ) i ON e.line_id = i.line_id
RIGHT JOIN ( SELECT g.dict_value, g.dict_label FROM sys_dict_data g WHERE g.dict_type = 'oil_api' ) h ON
h.dict_label = a.patrol_point_id
LEFT JOIN basedata_eqpbook d ON a.eqp_book_id = d.eqp_book_id
LEFT JOIN basedata_patrolpoint f ON a.patrol_point_id = f.patrol_point_id
RIGHT JOIN (
SELECT g.dict_value, g.dict_label
FROM sys_dict_data g
WHERE g.dict_type = 'oil_api'
) h ON h.dict_label = a.patrol_point_id
LEFT JOIN basedata_eqpbook d
ON a.eqp_book_id = d.eqp_book_id
LEFT JOIN basedata_patrolpoint f
ON a.patrol_point_id = f.patrol_point_id
ORDER BY ORDER BY
d.area_name, d.area_name,
d.patrol_device_name d.patrol_device_name
</select> </select>
<!-- <select id="select6FsResultValue" parameterType="PatrolResult" resultMap="ResultValue">-->
<!-- SELECT-->
<!-- a.patrol_point_id,-->
<!-- d.area_name,-->
<!-- d.patrol_device_name,-->
<!-- f.patrol_point_name,-->
<!-- CASE-->
<!-- WHEN e.`value` = 'check image' THEN-->
<!-- '0' ELSE e.`value`-->
<!-- END `value`,-->
<!-- h.dict_value line_id,-->
<!-- e.create_time,-->
<!-- a.channel_code-->
<!-- FROM-->
<!-- patrol_preset_pos a-->
<!-- LEFT JOIN patrol_result e ON a.patrol_point_id = e.device_id-->
<!-- RIGHT JOIN (-->
<!-- SELECT-->
<!-- MAX( h.line_id ) line_id-->
<!-- FROM-->
<!-- patrol_result h-->
<!-- <where>-->
<!-- <if test="createTime != null ">-->
<!-- DATE_FORMAT( h.create_time, '%y%m%d' ) = DATE_FORMAT( #{createTime}, '%y%m%d' )-->
<!-- </if>-->
<!-- </where>-->
<!-- GROUP BY-->
<!-- h.device_id-->
<!-- ) i ON e.line_id = i.line_id-->
<!-- RIGHT JOIN ( SELECT g.dict_value, g.dict_label FROM sys_dict_data g WHERE g.dict_type = 'sf6_api' ) h ON-->
<!-- h.dict_label = a.patrol_point_id-->
<!-- LEFT JOIN basedata_eqpbook d ON a.eqp_book_id = d.eqp_book_id-->
<!-- LEFT JOIN basedata_patrolpoint f ON a.patrol_point_id = f.patrol_point_id-->
<!-- ORDER BY-->
<!-- d.area_name,-->
<!-- d.patrol_device_name-->
<!-- </select>-->
<select id="select6FsResultValue" parameterType="PatrolResult" resultMap="ResultValue"> <select id="select6FsResultValue" parameterType="PatrolResult" resultMap="ResultValue">
SELECT SELECT
@ -936,8 +1018,9 @@
FROM FROM
patrol_result h patrol_result h
<where> <where>
<if test="createTime != null ">
DATE_FORMAT( h.create_time, '%y%m%d' ) = DATE_FORMAT( #{createTime}, '%y%m%d' )
<if test="createTime != null">
h.create_time <![CDATA[>=]]> DATE(#{createTime})
AND h.create_time <![CDATA[<]]> DATE_ADD(DATE(#{createTime}), INTERVAL 1 DAY)
</if> </if>
</where> </where>
GROUP BY GROUP BY


Loading…
Cancel
Save