Merge remote-tracking branch 'origin/master'

blade-service/blade-control/src/main/java/org/springblade/control/service/impl/ProjectCostBudgetServiceImpl.java

@@ -1296,6 +1296,8 @@ public class ProjectCostBudgetServiceImpl extends BaseServiceImpl<ProjectCostBud
                 }else {
                     //不是今年
                     if (startTime.getYear() > year){
+                        continue;
+                    }else if (startTime.getYear() < year) {
                         startMonth = 1;
                     }else {
                         //如果合同开始月比1月要大，则用开始日期
@@ -1491,6 +1493,8 @@ public class ProjectCostBudgetServiceImpl extends BaseServiceImpl<ProjectCostBud
                 }else {
                     //不是今年
                     if (startTime.getYear() > year){
+                        continue;
+                    }else if (startTime.getYear() < year) {
                         startMonth = 1;
                     }else {
                         //如果合同开始月比1月要大，则用开始日期
@@ -1615,6 +1619,8 @@ public class ProjectCostBudgetServiceImpl extends BaseServiceImpl<ProjectCostBud
                 }else {
                     //不是今年
                     if (startTime.getYear() > year){
+                        map.put(info.getId(),new BigDecimal(0));
+                    }else if (startTime.getYear() < year) {
                         startMonth = 1;
                     }else {
                         //如果合同开始月比1月要大，则用开始日期