Commit d88eacdf authored by 韩桐桐's avatar 韩桐桐

bug:27551

parent 7274379b
...@@ -4287,7 +4287,14 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD ...@@ -4287,7 +4287,14 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
equList.stream().filter(e-> e.get("inspectReport") != null).forEach(item->{ equList.stream().filter(e-> e.get("inspectReport") != null).forEach(item->{
item.put("inspectReport", JSON.parse(item.get("inspectReport").toString())); item.put("inspectReport", JSON.parse(item.get("inspectReport").toString()));
}); });
// 根据设备判断工程装置安装位置是否西咸
String isXixian = Optional.ofNullable(equList.get(0))
.map(equ -> equ.get("record"))
.map(String::valueOf)
.flatMap(recordStr -> Optional.ofNullable(idxBizJgUseInfoService.getOneData(recordStr)))
.flatMap(data -> Optional.ofNullable(data.getIsNotXiXian()))
.map(String::valueOf)
.orElse("0");
// 计算管道长度总和 // 计算管道长度总和
double totalPipelineLength = BigDecimal.valueOf(equList.stream() double totalPipelineLength = BigDecimal.valueOf(equList.stream()
.map(map -> map.get("pipeLength")) .map(map -> map.get("pipeLength"))
...@@ -4297,6 +4304,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD ...@@ -4297,6 +4304,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
MapBuilder<String, Object> resultBuilder = MapBuilder.<String, Object>create() MapBuilder<String, Object> resultBuilder = MapBuilder.<String, Object>create()
.put("equipmentLists", equList) .put("equipmentLists", equList)
.put("isXixian", isXixian)
.put("projectContraption", projectContraption.getProjectContraption()) .put("projectContraption", projectContraption.getProjectContraption())
.put("projectContraptionId", projectContraptionSeq) .put("projectContraptionId", projectContraptionSeq)
.put("projectContraptionNo", projectContraption.getProjectContraptionNo()) .put("projectContraptionNo", projectContraption.getProjectContraptionNo())
......
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