统计图结构

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

@@ -1068,7 +1068,7 @@ public class PmDemandServiceImpl extends ServiceImpl<PmDemandMapper, PmDemand> i
             }
             if (!ObjectUtils.isEmpty(baseExpert.getVarietyPurchase()) && !baseExpert.getVarietyPurchase().contains(pmDemand.getProjectType())) {
                 throw new Exception("该专家(身份证号：" + baseExpert.getIdNumber() + "）所属采购品种和项目类型不匹配");
-            } else{
+            } else {
                 baseExpert.setVarietyPurchase(pmDemand.getProjectType());
             }
 
@@ -2560,6 +2560,8 @@ public class PmDemandServiceImpl extends ServiceImpl<PmDemandMapper, PmDemand> i
                 for (Map<String, Integer> map : listMap) {
                     if (i == Integer.parseInt(String.valueOf(map.get("yy")))) {
                         isYear = true;
+                        map.put("yy", i);
+                        map.put("countNum", 0);
                     }
                 }
                 if (!isYear) {