添加数据的添加顺序

purchase-system/src/main/java/com/ozs/pm/service/impl/PmDemandServiceImpl.java

@@ -2801,13 +2801,14 @@ public class PmDemandServiceImpl extends ServiceImpl<PmDemandMapper, PmDemand> i
             int year = calendar.get(Calendar.YEAR);
             // 获取统计数据
             List<Map<String, Integer>> listMap = pmDemandMapper.selectPurchaseTaskFinishYear(pmDemandReqVo);
-            mapReturn.addAll(listMap);
+            //mapReturn.addAll(listMap);
             for (int i = minYear; i <= year; i++) {
                 boolean isYear = false;
                 for (Map<String, Integer> map : listMap) {
                     if (i == Integer.parseInt(String.valueOf(map.get("yy")))) {
                         isYear = true;
                         map.put("yy", i);
+                        mapReturn.add(map);
                     }
                 }
                 if (!isYear) {
@@ -2823,12 +2824,14 @@ public class PmDemandServiceImpl extends ServiceImpl<PmDemandMapper, PmDemand> i
             // 当前年份季度统计
             // 获取统计数据
             List<Map<String, Integer>> listMap = pmDemandMapper.selectPurchaseTaskFinishQuarter(pmDemandReqVo);
-            mapReturn.addAll(listMap);
+            //mapReturn.addAll(listMap);
             for (int i = 1; i <= 4; i++) {
                 boolean isYear = false;
                 for (Map<String, Integer> map : listMap) {
                     if (i == Integer.parseInt(String.valueOf(map.get("yy")))) {
                         isYear = true;
+                        map.put("yy", i);
+                        mapReturn.add(map);
                     }
                 }
                 if (!isYear) {
@@ -2844,7 +2847,7 @@ public class PmDemandServiceImpl extends ServiceImpl<PmDemandMapper, PmDemand> i
             // 当前年份月份统计
             // 获取统计数据
             List<Map<String, Integer>> listMap = pmDemandMapper.selectPurchaseTaskFinishMonth(pmDemandReqVo);
-            mapReturn.addAll(listMap);
+            //mapReturn.addAll(listMap);
             for (int i = 1; i <= 12; i++) {
                 boolean isYear = false;
                 for (Map<String, Integer> map : listMap) {
@@ -2852,6 +2855,7 @@ public class PmDemandServiceImpl extends ServiceImpl<PmDemandMapper, PmDemand> i
                         isYear = true;
                         map.put("yy", i);
                         map.put("countNum", 0);
+                        mapReturn.add(map);
                     }
                 }
                 if (!isYear) {