xieshengjie 1 year ago
parent
commit
3d4374d282

+ 1 - 1
web/runeconomy-jjyx/src/main/java/com/gyee/runeconomy/service/fitting/EconomyAnalysisService.java

@@ -6,7 +6,6 @@ import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.NumberUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.gyee.runeconomy.dto.response.StationAnalysis;
 import com.gyee.runeconomy.init.CacheContext;
 import com.gyee.runeconomy.model.auto.ProBasicOrganizeTree;
 import com.gyee.runeconomy.model.auto.ProBasicProjectPlan;
@@ -84,6 +83,7 @@ public class EconomyAnalysisService {
 
         for (ProEconPowerstationInfoDay1 day1 : pepidList) {
             String wpid = day1.getWindpowerstationId();
+            if(wpid==null) continue;
             monthMap.get(wpid).put("实际电量", MathUtil.plain(pepidMap.get(wpid),2));
             monthMap.get(wpid).put("去年同期实际电量", MathUtil.plain(pepidMapTq.get(wpid),2));
             monthMap.get(wpid).put("上期实际电量", MathUtil.plain(pepidMapSq.get(wpid),2));