孔广洋 / synthesize_energy_project · 提交

转到一个项目

作者 kgy
提交 7212bea37bf07d885778e4f38825a02cf524c1c5 1 个父辈 6d06aeff

删除 0.00

内嵌 并排对比
正在显示 1 个修改的文件 包含 26 行增加 和 13 行删除
... ... @@ -2666,7 +2666,8 @@ public class ProjectServiceImpl implements ProjectService {
} else {
equipmentCapacityVo1.setTotal(format.apply(new BigDecimal(date)) + "kW");
}
equipmentCapacityVo1.setList(list2);
List<EquipmentCapacityDto> collect = list2.stream().filter(item -> !item.getData().equals("0.00")).collect(Collectors.toList());
equipmentCapacityVo1.setList(collect);
equipmentCapacityVo1.setAnnotation(annotation);
equipmentCapacityDto.setEquipmentCapacityDto2(equipmentCapacityVo1);
list.add(equipmentCapacityDto);
... ... @@ -2757,7 +2758,8 @@ public class ProjectServiceImpl implements ProjectService {
}
EquipmentCapacityDto2 equipmentCapacityVo1 = new EquipmentCapacityDto2();
equipmentCapacityVo1.setTotal(format.apply(new BigDecimal(date)) + "kW");
equipmentCapacityVo1.setList(list2);
List<EquipmentCapacityDto> collect = list2.stream().filter(item -> !item.getData().equals("0.00")).collect(Collectors.toList());
equipmentCapacityVo1.setList(collect);
equipmentCapacityVo1.setAnnotation(annotation);
equipmentCapacityDto.setEquipmentCapacityDto2(equipmentCapacityVo1);
list.add(equipmentCapacityDto);
... ... @@ -2842,7 +2844,8 @@ public class ProjectServiceImpl implements ProjectService {
}
EquipmentCapacityDto2 equipmentCapacityVo1 = new EquipmentCapacityDto2();
equipmentCapacityVo1.setTotal(format.apply(new BigDecimal(date)) + "kW");
equipmentCapacityVo1.setList(list2);
List<EquipmentCapacityDto> collect = list2.stream().filter(item -> !item.getData().equals("0.00")).collect(Collectors.toList());
equipmentCapacityVo1.setList(collect);
equipmentCapacityVo1.setAnnotation(annotation);
equipmentCapacityDto.setEquipmentCapacityDto2(equipmentCapacityVo1);
list.add(equipmentCapacityDto);
... ... @@ -2893,7 +2896,8 @@ public class ProjectServiceImpl implements ProjectService {
}
EquipmentCapacityDto2 equipmentCapacityVo1 = new EquipmentCapacityDto2();
equipmentCapacityVo1.setTotal(format.apply(new BigDecimal(date)) + "kW");
equipmentCapacityVo1.setList(list2);
List<EquipmentCapacityDto> collect = list2.stream().filter(item -> !item.getData().equals("0.00")).collect(Collectors.toList());
equipmentCapacityVo1.setList(collect);
equipmentCapacityVo1.setAnnotation(annotation);
equipmentCapacityDto.setEquipmentCapacityDto2(equipmentCapacityVo1);
list.add(equipmentCapacityDto);
... ... @@ -2978,7 +2982,8 @@ public class ProjectServiceImpl implements ProjectService {
}
EquipmentCapacityDto2 equipmentCapacityVo1 = new EquipmentCapacityDto2();
equipmentCapacityVo1.setTotal(format.apply(new BigDecimal(date)) + "万元");
equipmentCapacityVo1.setList(list2);
List<EquipmentCapacityDto> collect = list2.stream().filter(item -> !item.getData().equals("0.00")).collect(Collectors.toList());
equipmentCapacityVo1.setList(collect);
equipmentCapacityDto.setEquipmentCapacityDto2(equipmentCapacityVo1);
list.add(equipmentCapacityDto);
} else if ("2".equals(s)) {
... ... @@ -3042,7 +3047,8 @@ public class ProjectServiceImpl implements ProjectService {
}
EquipmentCapacityDto2 equipmentCapacityVo1 = new EquipmentCapacityDto2();
equipmentCapacityVo1.setTotal(format.apply(new BigDecimal(date)) + "万元");
equipmentCapacityVo1.setList(list2);
List<EquipmentCapacityDto> collect = list2.stream().filter(item -> !item.getData().equals("0.00")).collect(Collectors.toList());
equipmentCapacityVo1.setList(collect);
equipmentCapacityDto.setEquipmentCapacityDto2(equipmentCapacityVo1);
list.add(equipmentCapacityDto);
} else if ("3".equals(s)) {
... ... @@ -3100,7 +3106,8 @@ public class ProjectServiceImpl implements ProjectService {
}
EquipmentCapacityDto2 equipmentCapacityVo1 = new EquipmentCapacityDto2();
equipmentCapacityVo1.setTotal(format.apply(new BigDecimal(date)) + "万元");
equipmentCapacityVo1.setList(list2);
List<EquipmentCapacityDto> collect = list2.stream().filter(item -> !item.getData().equals("0.00")).collect(Collectors.toList());
equipmentCapacityVo1.setList(collect);
equipmentCapacityDto.setEquipmentCapacityDto2(equipmentCapacityVo1);
list.add(equipmentCapacityDto);
} else if ("4".equals(s)) {
... ... @@ -3146,7 +3153,8 @@ public class ProjectServiceImpl implements ProjectService {
}
EquipmentCapacityDto2 equipmentCapacityVo1 = new EquipmentCapacityDto2();
equipmentCapacityVo1.setTotal(format.apply(new BigDecimal(date)) + "万元");
equipmentCapacityVo1.setList(list2);
List<EquipmentCapacityDto> collect = list2.stream().filter(item -> !item.getData().equals("0.00")).collect(Collectors.toList());
equipmentCapacityVo1.setList(collect);
equipmentCapacityDto.setEquipmentCapacityDto2(equipmentCapacityVo1);
list.add(equipmentCapacityDto);
}
... ... @@ -3178,7 +3186,8 @@ public class ProjectServiceImpl implements ProjectService {
equipmentCapacityDto.setType("5");
EquipmentCapacityDto2 equipmentCapacityVo1 = new EquipmentCapacityDto2();
equipmentCapacityVo1.setTotal(format.apply(new BigDecimal(data)) + "万元");
equipmentCapacityVo1.setList(list2);
List<EquipmentCapacityDto> collect = list2.stream().filter(item -> !item.getData().equals("0.00")).collect(Collectors.toList());
equipmentCapacityVo1.setList(collect);
equipmentCapacityDto.setEquipmentCapacityDto2(equipmentCapacityVo1);
list.add(equipmentCapacityDto);
Double date = 0.0;
... ... @@ -3735,7 +3744,8 @@ public class ProjectServiceImpl implements ProjectService {
}
EquipmentCapacityDto2 equipmentCapacityVo1 = new EquipmentCapacityDto2();
equipmentCapacityVo1.setTotal(format.apply(new BigDecimal(date)) + "kWh");
equipmentCapacityVo1.setList(list2);
List<EquipmentCapacityDto> collect = list2.stream().filter(item -> !item.getData().equals("0.00")).collect(Collectors.toList());
equipmentCapacityVo1.setList(collect);
equipmentCapacityDto.setEquipmentCapacityDto2(equipmentCapacityVo1);
list.add(equipmentCapacityDto);
} else if ("2".equals(s)) {
... ... @@ -3800,7 +3810,8 @@ public class ProjectServiceImpl implements ProjectService {
}
EquipmentCapacityDto2 equipmentCapacityVo1 = new EquipmentCapacityDto2();
equipmentCapacityVo1.setTotal(format.apply(new BigDecimal(date)) + "kWh");
equipmentCapacityVo1.setList(list2);
List<EquipmentCapacityDto> collect = list2.stream().filter(item -> !item.getData().equals("0.00")).collect(Collectors.toList());
equipmentCapacityVo1.setList(collect);
equipmentCapacityDto.setEquipmentCapacityDto2(equipmentCapacityVo1);
list.add(equipmentCapacityDto);
} else if ("3".equals(s)) {
... ... @@ -3858,7 +3869,8 @@ public class ProjectServiceImpl implements ProjectService {
}
EquipmentCapacityDto2 equipmentCapacityVo1 = new EquipmentCapacityDto2();
equipmentCapacityVo1.setTotal(format.apply(new BigDecimal(date)) + "kWh");
equipmentCapacityVo1.setList(list2);
List<EquipmentCapacityDto> collect = list2.stream().filter(item -> !item.getData().equals("0.00")).collect(Collectors.toList());
equipmentCapacityVo1.setList(collect);
equipmentCapacityDto.setEquipmentCapacityDto2(equipmentCapacityVo1);
list.add(equipmentCapacityDto);
} else if ("4".equals(s)) {
... ... @@ -3904,7 +3916,8 @@ public class ProjectServiceImpl implements ProjectService {
}
EquipmentCapacityDto2 equipmentCapacityVo1 = new EquipmentCapacityDto2();
equipmentCapacityVo1.setTotal(format.apply(new BigDecimal(date)) + "kWh");
equipmentCapacityVo1.setList(list2);
List<EquipmentCapacityDto> collect = list2.stream().filter(item -> !item.getData().equals("0.00")).collect(Collectors.toList());
equipmentCapacityVo1.setList(collect);
equipmentCapacityDto.setEquipmentCapacityDto2(equipmentCapacityVo1);
list.add(equipmentCapacityDto);
}
... ...