Commit d479a7c7 authored by 韩桐桐's avatar 韩桐桐

fix(统计-应急-事件统计):1,bug修改,2,和列表查询条件对其,时间格式统一为年月日时分秒

parent fc63c15c
......@@ -158,7 +158,8 @@
FROM
tz_alert_called
WHERE
biz_org_code like concat(#{orgCode}, '%')
is_delete = 0
and biz_org_code like concat(#{orgCode}, '%')
and (alarm_type_code = '960' or alarm_type_code = '961' or alarm_type_code = '962')
<if test="dto.beginDate !=null and dto.beginDate !=''">
and date_ge(CAST(call_time as date),#{dto.beginDate})
......
......@@ -403,10 +403,10 @@ public class YJDPStatisticsServiceImpl {
private void setDefaultFilter(DPFilterParamDto dpFilterParamDto) {
if (StringUtils.isEmpty(dpFilterParamDto.getBeginDate())) {
dpFilterParamDto.setBeginDate(cn.hutool.core.date.DateUtil.offsetDay(new Date(), -30).toDateStr());
dpFilterParamDto.setBeginDate(cn.hutool.core.date.DateUtil.offsetDay(new Date(), -30).toString("yyyy-MM-dd HH:mm:ss"));
}
if (StringUtils.isEmpty(dpFilterParamDto.getEndDate())) {
dpFilterParamDto.setEndDate(cn.hutool.core.date.DateUtil.today());
dpFilterParamDto.setEndDate(cn.hutool.core.date.DateUtil.now());
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment