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
1e4e0772
Commit
1e4e0772
authored
Aug 08, 2022
by
chenzhao
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改巡检记录现场图片查询
parent
b3874b5f
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
3 deletions
+4
-3
LatentDangerServiceImpl.java
...patrol/business/service/impl/LatentDangerServiceImpl.java
+4
-3
No files found.
amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/service/impl/LatentDangerServiceImpl.java
View file @
1e4e0772
...
@@ -301,7 +301,7 @@ public class LatentDangerServiceImpl implements ILatentDangerService {
...
@@ -301,7 +301,7 @@ public class LatentDangerServiceImpl implements ILatentDangerService {
String
remark
=
param
.
getRemark
();
String
remark
=
param
.
getRemark
();
String
photoUrls
=
""
;
String
photoUrls
=
""
;
List
<
CheckShot
>
checkShots
=
iCheckShotDao
.
findAllByCheckIdAndCheckInputId
(
inputCheckDto
.
getCheckId
(),
List
<
CheckShot
>
checkShots
=
iCheckShotDao
.
findAllByCheckIdAndCheckInputId
(
inputCheckDto
.
getCheckId
(),
inputCheckDto
.
getCheckInputId
()
);
0L
);
if
(!
CollectionUtils
.
isEmpty
(
checkShots
))
{
if
(!
CollectionUtils
.
isEmpty
(
checkShots
))
{
List
<
String
>
photos
=
checkShots
.
stream
().
map
(
e
->
{
List
<
String
>
photos
=
checkShots
.
stream
().
map
(
e
->
{
if
(
e
!=
null
)
{
if
(
e
!=
null
)
{
...
@@ -776,6 +776,7 @@ public class LatentDangerServiceImpl implements ILatentDangerService {
...
@@ -776,6 +776,7 @@ public class LatentDangerServiceImpl implements ILatentDangerService {
}
}
JSONObject
task
=
jsonObject
.
getJSONObject
(
"data"
);
JSONObject
task
=
jsonObject
.
getJSONObject
(
"data"
);
LatentDangerBo
latentDangerBo
=
latentDangerMapper
.
getbyBusinessKey
(
task
.
getString
(
"businessKey"
));
LatentDangerBo
latentDangerBo
=
latentDangerMapper
.
getbyBusinessKey
(
task
.
getString
(
"businessKey"
));
// LinkedHashMap<String,Object> positionAll = equipFeign.getBuildingAbsolutePosition();
// LinkedHashMap<String,Object> positionAll = equipFeign.getBuildingAbsolutePosition();
...
@@ -883,9 +884,9 @@ public class LatentDangerServiceImpl implements ILatentDangerService {
...
@@ -883,9 +884,9 @@ public class LatentDangerServiceImpl implements ILatentDangerService {
// }
// }
// List<CheckShot> checkShots = iCheckShotDao.findAllByCheckIdAndCheckInputId(patrolBo.getCheckId(),
// List<CheckShot> checkShots = iCheckShotDao.findAllByCheckIdAndCheckInputId(patrolBo.getCheckId(),
// latentDangerBo.getBizId());
// latentDangerBo.getBizId());
//现场图片存的checkInputId 原有保存逻辑里写死为0 避免影响沿用以前逻辑 查询也写死为0
List
<
CheckShot
>
checkShots
=
iCheckShotDao
.
findAllByCheckIdAndCheckInputId
(
patrolBo
.
getCheckId
(),
List
<
CheckShot
>
checkShots
=
iCheckShotDao
.
findAllByCheckIdAndCheckInputId
(
patrolBo
.
getCheckId
(),
patrolBo
.
getInputId
()
);
0L
);
if
(!
CollectionUtils
.
isEmpty
(
checkShots
))
{
if
(!
CollectionUtils
.
isEmpty
(
checkShots
))
{
List
<
String
>
photos
=
Lists
.
transform
(
checkShots
,
e
->
{
List
<
String
>
photos
=
Lists
.
transform
(
checkShots
,
e
->
{
if
(
e
!=
null
)
{
if
(
e
!=
null
)
{
...
...
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