Commit 9f0957e9 authored by zhangsen's avatar zhangsen

【web端】消防资源>消防设施>消防装备,物联趋势按周查看时数据部分数据无法显示(附图)(偶现) 来源Bug-10012

parent f81fa6be
...@@ -1211,7 +1211,7 @@ public class TopographyController extends AbstractBaseController { ...@@ -1211,7 +1211,7 @@ public class TopographyController extends AbstractBaseController {
if(Integer.parseInt(arr[0]) < 10 ) { if(Integer.parseInt(arr[0]) < 10 ) {
sStr = "0" + arr[0]; sStr = "0" + arr[0];
} else { } else {
sStr = arr[1]; sStr = arr[0];
} }
if(Integer.parseInt(arr[1]) < 10 ) { if(Integer.parseInt(arr[1]) < 10 ) {
eStr = "0" + arr[1]; eStr = "0" + arr[1];
...@@ -1222,11 +1222,11 @@ public class TopographyController extends AbstractBaseController { ...@@ -1222,11 +1222,11 @@ public class TopographyController extends AbstractBaseController {
bDate = DateUtils.dateParse(DateUtils.dateToStringMonth(beginDate) + "-" + sStr + " 00:00:00" ,DateUtils.DATE_TIME_PATTERN); bDate = DateUtils.dateParse(DateUtils.dateToStringMonth(beginDate) + "-" + sStr + " 00:00:00" ,DateUtils.DATE_TIME_PATTERN);
dDate = DateUtils.dateParse(DateUtils.dateToStringMonth(beginDate) + "-" + eStr + " 23:59:59" dDate = DateUtils.dateParse(DateUtils.dateToStringMonth(beginDate) + "-" + eStr + " 23:59:59"
,DateUtils.DATE_PATTERN); ,DateUtils.DATE_TIME_PATTERN);
} else { } else {
bDate = DateUtils.dateParse(DateUtils.dateToStringMonth(beginDate) + "-" + sStr + " 00:00:00",DateUtils.DATE_TIME_PATTERN); bDate = DateUtils.dateParse(DateUtils.dateToStringMonth(beginDate) + "-" + sStr + " 00:00:00",DateUtils.DATE_TIME_PATTERN);
dDate = DateUtils.dateParse(DateUtils.dateToStringMonth(beginDate) + "-" + eStr + " 00:00:00",DateUtils.DATE_TIME_PATTERN); dDate = DateUtils.dateParse(DateUtils.dateToStringMonth(beginDate) + "-" + eStr + " 23:59:59",DateUtils.DATE_TIME_PATTERN);
} }
......
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