年度，季度，月份 优化

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

@@ -2009,16 +2009,20 @@ public class PmDemandServiceImpl extends ServiceImpl<PmDemandMapper, PmDemand> i
             List<Map<String, Integer>> listMap = pmDemandMapper.selectPurchaseTaskFinishYear(pmDemandReqVo);
             mapReturn.addAll(listMap);
             for (int i = minYear; i <= year; i++) {
+                boolean isYear = false;
                 for (Map<String, Integer> map : listMap) {
-                    if (i != Integer.valueOf(map.get("yy"))) {
-                        Map<String, Integer> map1 = new HashMap<>();
-                        map1.put("yy", i);
-                        map1.put("evaluation", 0);
-                        map1.put("contractAmount", 0);
-                        map1.put("countNum", 0);
-                        mapReturn.add(map1);
+                    if (i == Integer.valueOf(map.get("yy"))) {
+                        isYear = true;
                     }
                 }
+                if (!isYear) {
+                    Map<String, Integer> map1 = new HashMap<>();
+                    map1.put("yy", i);
+                    map1.put("evaluation", 0);
+                    map1.put("contractAmount", 0);
+                    map1.put("countNum", 0);
+                    mapReturn.add(map1);
+                }
             }
         } else if ("2".equals(pmDemandReqVo.getTimeType())) {
             // 当前年份季度统计
@@ -2026,16 +2030,20 @@ public class PmDemandServiceImpl extends ServiceImpl<PmDemandMapper, PmDemand> i
             List<Map<String, Integer>> listMap = pmDemandMapper.selectPurchaseTaskFinishQuarter(pmDemandReqVo);
             mapReturn.addAll(listMap);
             for (int i = 1; i <= 4; i++) {
+                boolean isYear = false;
                 for (Map<String, Integer> map : listMap) {
-                    if (i != map.get("yy")) {
-                        Map<String, Integer> map1 = new HashMap<>();
-                        map1.put("yy", i);
-                        map1.put("evaluation", 0);
-                        map1.put("contractAmount", 0);
-                        map1.put("countNum", 0);
-                        mapReturn.add(map1);
+                    if (i == map.get("yy")) {
+                        isYear = true;
                     }
                 }
+                if (!isYear) {
+                    Map<String, Integer> map1 = new HashMap<>();
+                    map1.put("yy", i);
+                    map1.put("evaluation", 0);
+                    map1.put("contractAmount", 0);
+                    map1.put("countNum", 0);
+                    mapReturn.add(map1);
+                }
             }
         } else if ("3".equals(pmDemandReqVo.getTimeType())) {
             // 当前年份月份统计
@@ -2043,18 +2051,20 @@ public class PmDemandServiceImpl extends ServiceImpl<PmDemandMapper, PmDemand> i
             List<Map<String, Integer>> listMap = pmDemandMapper.selectPurchaseTaskFinishMonth(pmDemandReqVo);
             mapReturn.addAll(listMap);
             for (int i = 1; i <= 12; i++) {
+                boolean isYear = false;
                 for (Map<String, Integer> map : listMap) {
-                    int ii = Integer.parseInt(String.valueOf(map.get("yy")));
-                    map.put("yy", ii);
-                    if (i != ii) {
-                        Map<String, Integer> map1 = new HashMap<>();
-                        map1.put("yy", i);
-                        map1.put("evaluation", 0);
-                        map1.put("contractAmount", 0);
-                        map1.put("countNum", 0);
-                        mapReturn.add(map1);
+                    if (i == Integer.parseInt(String.valueOf(map.get("yy")))) {
+                        isYear = true;
                     }
                 }
+                if (!isYear) {
+                    Map<String, Integer> map1 = new HashMap<>();
+                    map1.put("yy", i);
+                    map1.put("evaluation", 0);
+                    map1.put("contractAmount", 0);
+                    map1.put("countNum", 0);
+                    mapReturn.add(map1);
+                }
             }
         }
         return mapReturn;
@@ -2145,14 +2155,18 @@ public class PmDemandServiceImpl extends ServiceImpl<PmDemandMapper, PmDemand> i
             List<Map<String, String>> listMap = pmDemandMapper.purchaseProjectNumberAnalysisYear(pmDemandReqVo);
             mapReturn.addAll(listMap);
             for (int i = minYear; i <= year; i++) {
+                boolean isYear = false;
                 for (Map<String, String> map : listMap) {
-                    if (i != Integer.valueOf(map.get("yy"))) {
-                        Map<String, String> map1 = new HashMap<>();
-                        map1.put("yy", i + "");
-                        map1.put("countNum", 0 + "");
-                        mapReturn.add(map1);
+                    if (i == Integer.valueOf(map.get("yy"))) {
+                        isYear = true;
                     }
                 }
+                if (!isYear) {
+                    Map<String, String> map1 = new HashMap<>();
+                    map1.put("yy", i + "");
+                    map1.put("countNum", 0 + "");
+                    mapReturn.add(map1);
+                }
             }
         } else if ("2".equals(pmDemandReqVo.getTimeType())) {
             // 当前年份季度统计
@@ -2160,16 +2174,18 @@ public class PmDemandServiceImpl extends ServiceImpl<PmDemandMapper, PmDemand> i
             List<Map<String, String>> listMap = pmDemandMapper.purchaseProjectNumberAnalysisQuarter(pmDemandReqVo);
             mapReturn.addAll(listMap);
             for (int i = 1; i <= 4; i++) {
+                boolean isYear = false;
                 for (Map<String, String> map : listMap) {
-                    int ii = Integer.parseInt(String.valueOf(map.get("yy")));
-                    map.put("yy", ii + "");
-                    if (i != ii) {
-                        Map<String, String> map1 = new HashMap<>();
-                        map1.put("yy", i + "");
-                        map1.put("countNum", 0 + "");
-                        mapReturn.add(map1);
+                    if (i == Integer.parseInt(String.valueOf(map.get("yy")))) {
+                        isYear = true;
                     }
                 }
+                if (!isYear) {
+                    Map<String, String> map1 = new HashMap<>();
+                    map1.put("yy", i + "");
+                    map1.put("countNum", 0 + "");
+                    mapReturn.add(map1);
+                }
             }
         } else if ("3".equals(pmDemandReqVo.getTimeType())) {
             // 当前年份月份统计
@@ -2177,16 +2193,18 @@ public class PmDemandServiceImpl extends ServiceImpl<PmDemandMapper, PmDemand> i
             List<Map<String, String>> listMap = pmDemandMapper.purchaseProjectNumberAnalysisMonth(pmDemandReqVo);
             mapReturn.addAll(listMap);
             for (int i = 1; i <= 12; i++) {
+                boolean isYear = false;
                 for (Map<String, String> map : listMap) {
-                    int ii = Integer.parseInt(String.valueOf(map.get("yy")));
-                    map.put("yy", ii + "");
-                    if (i != ii) {
-                        Map<String, String> map1 = new HashMap<>();
-                        map1.put("yy", i + "");
-                        map1.put("countNum", 0 + "");
-                        mapReturn.add(map1);
+                    if (i == Integer.parseInt(String.valueOf(map.get("yy")))) {
+                        isYear = true;
                     }
                 }
+                if (!isYear) {
+                    Map<String, String> map1 = new HashMap<>();
+                    map1.put("yy", i + "");
+                    map1.put("countNum", 0 + "");
+                    mapReturn.add(map1);
+                }
             }
         }
         return mapReturn;