bug修复

This commit is contained in:
guo 2024-04-01 16:34:12 +08:00
parent 78ad91b63a
commit 8fbb195db7
3 changed files with 0 additions and 12 deletions

View File

@ -50,17 +50,13 @@
INNER JOIN deep_excavation_measure_point t2 INNER JOIN deep_excavation_measure_point t2
ON des.measure_point_number = t2.measure_point_number ON des.measure_point_number = t2.measure_point_number
<where> <where>
<if test="deepExcavationId != null and deepExcavationId != ''">
t2.deep_excavation_id = #{deepExcavationId} t2.deep_excavation_id = #{deepExcavationId}
</if>
</where> </where>
AND decd.receive_time >= AND decd.receive_time >=
CONCAT(DATE_FORMAT(DATE_ADD(NOW(), INTERVAL -6 DAY), '%Y-%m-%d'), ' 00:00:00') CONCAT(DATE_FORMAT(DATE_ADD(NOW(), INTERVAL -6 DAY), '%Y-%m-%d'), ' 00:00:00')
GROUP BY t2.rela_id) c ON demtr.id = c.rela_id GROUP BY t2.rela_id) c ON demtr.id = c.rela_id
<where> <where>
<if test="deepExcavationId != null and deepExcavationId != ''">
demtr.deep_excavation_id = #{deepExcavationId} demtr.deep_excavation_id = #{deepExcavationId}
</if>
</where> </where>
</select> </select>
<select id="selectMonitorTypeAlarmCountList" <select id="selectMonitorTypeAlarmCountList"

View File

@ -51,18 +51,14 @@
INNER JOIN high_slope_measure_point t2 INNER JOIN high_slope_measure_point t2
ON des.measure_point_number = t2.measure_point_number ON des.measure_point_number = t2.measure_point_number
<where> <where>
<if test="highSlopeEngineeringId != null and highSlopeEngineeringId != ''">
t2.high_slope_engineering_id = #{highSlopeEngineeringId} t2.high_slope_engineering_id = #{highSlopeEngineeringId}
</if>
</where> </where>
AND decd.receive_time >= AND decd.receive_time >=
CONCAT(DATE_FORMAT(DATE_ADD(NOW(), INTERVAL -6 DAY), '%Y-%m-%d'), ' 00:00:00') CONCAT(DATE_FORMAT(DATE_ADD(NOW(), INTERVAL -6 DAY), '%Y-%m-%d'), ' 00:00:00')
GROUP BY t2.high_slope_engineering_to_monitor_type_id) c ON demtr.id = GROUP BY t2.high_slope_engineering_to_monitor_type_id) c ON demtr.id =
c.high_slope_engineering_to_monitor_type_id c.high_slope_engineering_to_monitor_type_id
<where> <where>
<if test="highSlopeEngineeringId != null and highSlopeEngineeringId != ''">
demtr.high_slope_engineering_id = #{highSlopeEngineeringId} demtr.high_slope_engineering_id = #{highSlopeEngineeringId}
</if>
</where> </where>
</select> </select>
<select id="selectMonitorTypeAlarmCountList" resultType="java.util.Map"> <select id="selectMonitorTypeAlarmCountList" resultType="java.util.Map">

View File

@ -52,18 +52,14 @@
INNER JOIN steel_structure_measure_point t2 INNER JOIN steel_structure_measure_point t2
ON des.measure_point_number = t2.measure_point_number ON des.measure_point_number = t2.measure_point_number
<where> <where>
<if test="steelStructureEngineeringId != null and steelStructureEngineeringId != ''">
t2.steel_structure_engineering_id = #{steelStructureEngineeringId} t2.steel_structure_engineering_id = #{steelStructureEngineeringId}
</if>
</where> </where>
AND decd.receive_time >= AND decd.receive_time >=
CONCAT(DATE_FORMAT(DATE_ADD(NOW(), INTERVAL -6 DAY), '%Y-%m-%d'), ' 00:00:00') CONCAT(DATE_FORMAT(DATE_ADD(NOW(), INTERVAL -6 DAY), '%Y-%m-%d'), ' 00:00:00')
GROUP BY t2.steel_structure_engineering_to_monitor_type_id) c ON demtr.id = GROUP BY t2.steel_structure_engineering_to_monitor_type_id) c ON demtr.id =
c.steel_structure_engineering_to_monitor_type_id c.steel_structure_engineering_to_monitor_type_id
<where> <where>
<if test="steelStructureEngineeringId != null and steelStructureEngineeringId != ''">
demtr.steel_structure_engineering_id = #{steelStructureEngineeringId} demtr.steel_structure_engineering_id = #{steelStructureEngineeringId}
</if>
</where> </where>
</select> </select>
<select id="selectMonitorTypeAlarmCountList" resultType="java.util.Map"> <select id="selectMonitorTypeAlarmCountList" resultType="java.util.Map">