Merge branch 'master' of http://124.70.58.209:3000/ytrd-project-management/purchase

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

@@ -1938,16 +1938,20 @@ public class PmDemandServiceImpl extends ServiceImpl<PmDemandMapper, PmDemand> i
             List<Map<String, Integer>> listMap = pmDemandMapper.selectpurchaseProjectCompleteNumberYear(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())) {
             // 当前年份季度统计
@@ -1955,16 +1959,20 @@ public class PmDemandServiceImpl extends ServiceImpl<PmDemandMapper, PmDemand> i
             List<Map<String, Integer>> listMap = pmDemandMapper.selectpurchaseProjectCompleteNumberQuarter(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())) {
             // 当前年份月份统计
@@ -1972,18 +1980,20 @@ public class PmDemandServiceImpl extends ServiceImpl<PmDemandMapper, PmDemand> i
             List<Map<String, Integer>> listMap = pmDemandMapper.selectpurchaseProjectCompleteNumberMonth(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;