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
f9a8e056
Commit
f9a8e056
authored
Jan 10, 2022
by
helinlin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改防火监督隐患导入失败问题
parent
80c7283c
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
5 deletions
+7
-5
HiddenDangerServiceImpl.java
...vision/business/service/impl/HiddenDangerServiceImpl.java
+7
-5
No files found.
amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/service/impl/HiddenDangerServiceImpl.java
View file @
f9a8e056
...
...
@@ -213,8 +213,8 @@ public class HiddenDangerServiceImpl implements IHiddenDangerService {
try
{
dangerDto
.
setBizInfo
(
this
.
buildBizInfo
(
hiddenDangerDto
));
}
catch
(
Exception
e
)
{
log
.
error
(
e
.
getMessage
(),
e
);
throw
new
RuntimeException
(
"组织数据失败
"
);
log
.
error
(
e
.
getMessage
(),
e
);
throw
new
RuntimeException
(
"组织数据失败
!"
+
e
.
getMessage
()
);
}
return
dangerDto
;
}).
collect
(
Collectors
.
toList
());
...
...
@@ -273,6 +273,8 @@ public class HiddenDangerServiceImpl implements IHiddenDangerService {
Point
point
=
new
Point
();
if
(!
ObjectUtils
.
isEmpty
(
hiddenDangerDto
.
getPointId
()))
{
point
=
iPointDao
.
findById
(
hiddenDangerDto
.
getPointId
()).
orElseThrow
(()
->
new
RuntimeException
(
"单位不存在"
));
}
else
{
throw
new
RuntimeException
(
"单位不存在"
);
}
//检查级别
DangerCheckTypeLevelEnum
dangerCheckTypeLevelEnum
=
DangerCheckTypeLevelEnum
.
getEumByCode
(
plan
.
getCheckLevel
());
...
...
@@ -288,8 +290,8 @@ public class HiddenDangerServiceImpl implements IHiddenDangerService {
result
.
put
(
"bizId"
,
hiddenDangerDto
.
getCheckInputId
());
result
.
put
(
"bizName"
,
hiddenDangerDto
.
getInputItemName
());
result
.
put
(
"routeId"
,
plan
.
getRouteId
());
result
.
put
(
"checkUnitId"
,
plan
.
getCheckUnitId
());
// 检查人所在单位id逗号隔开
result
.
put
(
"checkUnitName"
,
plan
.
getCheckUnitName
());
// 检查人所在单位名称逗号隔开
result
.
put
(
"checkUnitId"
,
plan
.
getCheckUnitId
());
// 检查人所在单位id逗号隔开
result
.
put
(
"checkUnitName"
,
plan
.
getCheckUnitName
());
// 检查人所在单位名称逗号隔开
result
.
put
(
"leadPeopleId"
,
plan
.
getLeadPeopleIds
());
// 牵头人id
result
.
put
(
"leadPeopleName"
,
plan
.
getLeadPeopleNames
());
// 牵头人名称
result
.
put
(
"makerUserId"
,
plan
.
getMakerUserId
());
// 计划制定人id
...
...
@@ -314,7 +316,7 @@ public class HiddenDangerServiceImpl implements IHiddenDangerService {
result
.
put
(
"checkUserId"
,
checkInput
.
getUserId
());
// 任务执行人id
result
.
put
(
"checkUserName"
,
checkInput
.
getUserName
());
// 任务执行人名称
result
.
put
(
"accompanyingUserId"
,
checkInput
.
getAccompanyUserId
());
// 检查陪同人id
result
.
put
(
"accompanyingUserName"
,
checkInput
.
getAccompanyUserName
());
// 检查陪同人名称
result
.
put
(
"accompanyingUserName"
,
checkInput
.
getAccompanyUserName
());
// 检查陪同人名称
result
.
put
(
"planExecuteTime"
,
checkInput
.
getCreateDate
());
// 计划任务执行时间
result
.
put
(
"checkPhotoUrl"
,
shotList
.
stream
().
map
(
CheckShot:
:
getPhotoData
).
collect
(
Collectors
.
joining
(
","
)));
}
...
...
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