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
f1f053aa
Commit
f1f053aa
authored
Oct 28, 2022
by
suhuiguang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1.经7日启停报错
parent
a0e9e0a3
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
1 deletion
+2
-1
ConfigureController.java
...m/yeejoin/equipmanage/controller/ConfigureController.java
+2
-1
No files found.
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/ConfigureController.java
View file @
f1f053aa
...
...
@@ -183,6 +183,7 @@ public class ConfigureController extends AbstractBaseController {
if
(
StringUtils
.
isEmpty
(
bizOrgCode
))
{
return
CommonResponseUtil
.
success
(
null
);
}
Page
page
=
new
Page
<>(
commonPageable
.
getPageNumber
(),
commonPageable
.
getPageSize
());
Page
<
Map
<
String
,
Object
>>
fireCarInfoByWL
=
fireFightingSystemMapper
.
getFireCarInfoByWL
(
page
,
bizOrgCode
);
if
(!
CollectionUtils
.
isEmpty
(
fireCarInfoByWL
.
getRecords
()))
{
...
...
@@ -215,7 +216,7 @@ public class ConfigureController extends AbstractBaseController {
}
if
(
item
.
containsKey
(
"carStateDate"
)
&&
!
ObjectUtils
.
isEmpty
(
item
.
get
(
"carStateDate"
)))
{
try
{
Date
carStateDate
=
DateUtils
.
dateParse
(
item
.
get
(
"carStateDate"
).
toString
(),
"yyyy-MM-dd
'T'
HH:mm:ss"
);
Date
carStateDate
=
DateUtils
.
dateParse
(
item
.
get
(
"carStateDate"
).
toString
(),
"yyyy-MM-dd
HH:mm:ss"
);
String
s
=
DateUtils
.
dateFormat
(
carStateDate
,
DateUtils
.
DATE_TIME_PATTERN
);
item
.
put
(
"carStateDate"
,
s
);
}
catch
(
ParseException
e
)
{
...
...
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