非空

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectQuantityOrgMonthlyServiceImpl.java

@@ -188,19 +188,19 @@ public class ScreenProjectQuantityOrgMonthlyServiceImpl extends BaseServiceImpl<
             if (!CollectionUtils.isEmpty(projectOrg)){
                 projectOrg.forEach(p -> {
                     if (a.getAreaCode().equals(p.getAreaCode())){
-                        a.setClosedIncr(p.getClosedIncr());
-                        a.setProjectIncr(p.getProjectIncr());
-                        a.setProjectIncr(p.getProjectIncr());
+                        a.setClosedIncr(null == p.getClosedIncr() ? NumConstant.ZERO : p.getClosedIncr());
+                        a.setProjectIncr(null == p.getProjectIncr() ? NumConstant.ZERO : p.getProjectIncr());
+                        a.setProjectIncr(null == p.getProjectIncr() ? NumConstant.ZERO : p.getProjectIncr());
                     }
                 });
             }
             if (!CollectionUtils.isEmpty(projectGrandOrg)){
                 projectGrandOrg.forEach(p -> {
                     if (a.getAreaCode().equals(p.getAreaCode())){
-                        a.setClosedTotal(p.getClosedTotal());
-                        a.setProjectTotal(p.getProjectTotal());
-                        a.setUnClosedTotal(p.getUnClosedTotal());
-                        a.setProjectIncr(p.getProjectIncr());
+                        a.setClosedTotal(null == p.getClosedTotal() ? NumConstant.ZERO : p.getClosedTotal());
+                        a.setProjectTotal(null == p.getProjectTotal() ? NumConstant.ZERO : p.getProjectTotal());
+                        a.setUnClosedTotal(null == p.getUnClosedTotal() ? NumConstant.ZERO : p.getUnClosedTotal());
+                        a.setProjectIncr(null == p.getProjectIncr() ? NumConstant.ZERO : p.getProjectIncr());
                     }
                 });
             }