|
|
@@ -351,16 +351,16 @@ public class ChartServiceImpl implements IChartService {
|
|
|
private List<SeriesDTO> getChartQuarterTotal(List<String> xAxis, QuarterTotalVO total,
|
|
|
String name1, String name2){
|
|
|
List<Integer> jhData = new ArrayList<>();
|
|
|
- jhData.add(total.getPlan1());
|
|
|
- jhData.add(total.getPlan2());
|
|
|
- jhData.add(total.getPlan3());
|
|
|
- jhData.add(total.getPlan4());
|
|
|
+ jhData.add(null == total ? 0 : total.getPlan1());
|
|
|
+ jhData.add(null == total ? 0 : total.getPlan2());
|
|
|
+ jhData.add(null == total ? 0 : total.getPlan3());
|
|
|
+ jhData.add(null == total ? 0 : total.getPlan4());
|
|
|
|
|
|
List<Integer> wcData = new ArrayList<>();
|
|
|
- wcData.add(total.getActual1());
|
|
|
- wcData.add(total.getActual2());
|
|
|
- wcData.add(total.getActual3());
|
|
|
- wcData.add(total.getActual4());
|
|
|
+ wcData.add(null == total ? 0 : total.getActual1());
|
|
|
+ wcData.add(null == total ? 0 : total.getActual2());
|
|
|
+ wcData.add(null == total ? 0 : total.getActual3());
|
|
|
+ wcData.add(null == total ? 0 : total.getActual4());
|
|
|
|
|
|
List<SeriesDTO> series = new ArrayList<>();
|
|
|
SeriesDTO jh = createSeriesDTO(xAxis, jhData, name1);
|