Commit 483b905b authored by chenzhao's avatar chenzhao

使用登记表 管道设备数量修改为管道长度

parent 40f05770
......@@ -2317,8 +2317,18 @@ public class CommonServiceImpl implements ICommonService {
.filter(obj -> obj instanceof Map)
.map(obj -> (Map<String, Object>) obj).collect(Collectors.toList());
if (manageType.equals(UNIT) && !CollectionUtils.isEmpty(equips)){
//设备数量
formData.put("equNum",equipmentLists.size());
//管道计算的是管道长度
if (formData.containsKey("equListCode") && formData.getString("equListCode").equals("8000")){
double pipeLength = equips.stream().filter(Objects::nonNull)
.filter(map -> map.containsKey("pipeLength") && map.get("pipeLength") instanceof Number)
.mapToDouble(map -> ((Number) map.get("pipeLength")).doubleValue())
.sum();
formData.put("equNum",String.valueOf(pipeLength)+"m");
}else {
//设备数量
formData.put("equNum",equipmentLists.size());
}
//设备品种
formData.put("equDefine",equips.get(0).get("equDefineName"));
......
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