Commit 1e4e0772 authored by chenzhao's avatar chenzhao

修改巡检记录现场图片查询

parent b3874b5f
...@@ -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) {
......
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