Merge remote-tracking branch 'origin/master'

aijinhui

2023-11-09 b5ae703a499b97fd83dd9a7b67a10a7b8157df5f

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

@@ -150,4 +150,14 @@
          and alarm_time <= #{alarmTime}
          and view_time is null
    </update>
    <select id="digitizationYear" resultType="com.ruoyi.statistical.vo.CountVo">
        select to_char(alarm_time::DATE, 'MM') as date,count(id)
        from ard_alarm_digitization3
        where alarm_time &gt;= #{start} and  alarm_time &lt;= #{end}  group by date order by date
    </select>
    <select id="digitizationMonth" resultType="com.ruoyi.statistical.vo.CountVo">
        select to_char(alarm_time::DATE, 'dd') as date,count(id)
        from ard_alarm_digitization3
        where alarm_time &gt;= #{start} and  alarm_time &lt;= #{end}  group by date order by date
    </select>
</mapper>