[统计分析]修改了自查统计返回数量为Null的Bug

dev-statistical/src/main/java/com/tykj/dev/statistical/service/impl/StatisticalServiceImpl.java

@@ -29,10 +29,7 @@ import org.springframework.stereotype.Service;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.time.ZoneId;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -211,18 +208,10 @@ public class StatisticalServiceImpl implements StatisticalService {
             List<Area> undoAreas4 = getSelfCheckUndoAreas(area.getId(),quarter4,selfCheckBills);
             //获取当前区域所有区县
             List<Area> sonAreas = areaDao.findAllByFatherId(area.getId());
-            if (!undoAreas.isEmpty()) {
-                setPerQuarter(firstQuarter, sonAreas, undoAreas);
-            }
-            if (!undoAreas2.isEmpty()) {
-                setPerQuarter(secondQuarter, sonAreas, undoAreas2);
-            }
-            if (!undoAreas3.isEmpty()) {
-                setPerQuarter(thirdQuarter, sonAreas, undoAreas3);
-            }
-            if (!undoAreas4.isEmpty()) {
-                setPerQuarter(fourthQuarter, sonAreas, undoAreas4);
-            }
+            setPerQuarter(firstQuarter, sonAreas, undoAreas);
+            setPerQuarter(secondQuarter, sonAreas, undoAreas2);
+            setPerQuarter(thirdQuarter, sonAreas, undoAreas3);
+            setPerQuarter(fourthQuarter, sonAreas, undoAreas4);
             yearSelfInspection.setFirstQuarter(firstQuarter);
             yearSelfInspection.setSecondQuarter(secondQuarter);
             yearSelfInspection.setThirdQuarter(thirdQuarter);
@@ -444,7 +433,12 @@ public class StatisticalServiceImpl implements StatisticalService {
      * @param undoAreas 未完成自查区县
      */
     private void setPerQuarter(PerQuarter perQuarter,List<Area> sonAreas,List<Area> undoAreas){
-        perQuarter.setNoCompleteUnits(undoAreas.stream().map(Area::getName).collect(Collectors.toList()));
+        if (!undoAreas.isEmpty()) {
+            perQuarter.setNoCompleteUnits(undoAreas.stream().map(Area::getName).collect(Collectors.toList()));
+        }
+        else {
+            perQuarter.setNoCompleteUnits(new ArrayList<>());
+        }
         perQuarter.setNoCompleteCount(undoAreas.size());
         perQuarter.setCompleteCount(sonAreas.size()-undoAreas.size());
     }