Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
amos-boot-biz
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
项目统一框架
amos-boot-biz
Commits
9f0957e9
Commit
9f0957e9
authored
Dec 12, 2022
by
zhangsen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
【web端】消防资源>消防设施>消防装备,物联趋势按周查看时数据部分数据无法显示(附图)(偶现) 来源Bug-10012
parent
f81fa6be
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
3 deletions
+3
-3
TopographyController.java
.../yeejoin/equipmanage/controller/TopographyController.java
+3
-3
No files found.
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/TopographyController.java
View file @
9f0957e9
...
@@ -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
);
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment