Merge remote-tracking branch 'origin/master'

aijinhui

2023-09-21 2aa0ffa6eea188f44eabc50617ddf97c804fc89f

 ard-work/src/main/resources/mapper/alarm/ArdAlarmRadarMoveMapper.xml

@@ -70,6 +70,7 @@
            <if test="viewTime != null">view_time,</if>
            <if test="createBy != null">create_by,</if>
            <if test="createTime != null">create_time,</if>
            <if test="updateTime != null">update_time,</if>
            <if test="userId != null">user_id,</if>
            <if test="deptId != null">dept_id,</if>
            <if test="guideFlag != null">guide_flag,</if>
@@ -87,6 +88,7 @@
            <if test="viewTime != null">#{viewTime},</if>
            <if test="createBy != null">#{createBy},</if>
            <if test="createTime != null">#{createTime},</if>
            <if test="updateTime != null">#{updateTime},</if>
            <if test="userId != null">#{userId},</if>
            <if test="deptId != null">#{deptId},</if>
            <if test="guideFlag != null">#{guideFlag},</if>
@@ -107,6 +109,7 @@
            <if test="viewTime != null">view_time = #{viewTime},</if>
            <if test="createBy != null">create_by = #{createBy},</if>
            <if test="createTime != null">create_time = #{createTime},</if>
            <if test="updateTime != null">update_time = #{updateTime},</if>
            <if test="userId != null">user_id = #{userId},</if>
            <if test="deptId != null">dept_id = #{deptId},</if>
            <if test="guideFlag != null">guide_flag = #{guideFlag},</if>
@@ -152,6 +155,7 @@
             GROUP BY aar.NAME
            ) r
                INNER JOIN ard_alarm_radar_move aaar ON r.create_time1 = aaar.create_time
        ORDER BY aaar.create_time desc
    </select>
    <update id="updateViewTimeByCondition" parameterType="String">
        update ard_alarm_radar_move
@@ -160,4 +164,7 @@
          and alarm_time&lt;=#{alarmTime}
          and view_time is null
    </update>
    <select id="selectArdAlarmRadarLastData" parameterType="String" resultMap="ArdAlarmRadarMoveResult">
        select * from ard_alarm_radar_move where name=#{name} order by update_time desc LIMIT 1
    </select>
</mapper>