经济运行报告数据调整

runeconomy-xk/src/main/java/com/gyee/runeconomy/service/EarlyWarning/NewGetWindReportService.java

@@ -7,11 +7,9 @@ import com.gyee.runeconomy.entity.StationInfoMonth;
 import com.gyee.runeconomy.init.CacheContext;
 import com.gyee.runeconomy.model.auto.ProBasicEquipment;
 import com.gyee.runeconomy.model.auto.ProBasicPowerstation;
-import com.gyee.runeconomy.model.auto.ProEconPowerstationInfoDay4;
 import com.gyee.runeconomy.model.auto.TurbineInfoDay;
 import com.gyee.runeconomy.service.IStationInfoMonthService;
 import com.gyee.runeconomy.service.auto.IProEconBrownoutsEvent2Service;
-import com.gyee.runeconomy.service.auto.IProEconPowerstationInfoDay4Service;
 import com.gyee.runeconomy.service.auto.ITurbineInfoDayService;
 import com.gyee.runeconomy.util.StringUtils;
 import lombok.var;
@@ -94,13 +92,13 @@ public class NewGetWindReportService {
         List<TurbineInfoDay> linedlList = turbineInfoDayService.lineList(time);
 
         List<FwjslDTO> fwjsllist = event2Service.getResetTimelyRateInfo(null,null , beginDate, endDate);
-        List<FwjslDTO> syfwjsllist = event2Service.getResetTimelyRateInfo(null,null , sybeginDate, syendDate);
+//        List<FwjslDTO> syfwjsllist = event2Service.getResetTimelyRateInfo(null,null , sybeginDate, syendDate);
         List<FwjslDTO> qndyfwjsllist = event2Service.getResetTimelyRateInfo(null,null , qndybeginDate, qndyendDate);
         List<FwjslDTO> yearfwjsllist = event2Service.getResetTimelyRateInfo(null,null , yearbegin, yearend);
         List<FwjslDTO> qnyearfwjsllist = event2Service.getResetTimelyRateInfo(null,null , qnyearbegin, qnyearend);
 
         List<QxjslDTO> xqjsllist = event2Service.getDefectsEliminatRateList(null, null, beginDate, endDate);
-        List<QxjslDTO> syxqjsllist = event2Service.getDefectsEliminatRateList(null, null, sybeginDate, syendDate);
+//        List<QxjslDTO> syxqjsllist = event2Service.getDefectsEliminatRateList(null, null, sybeginDate, syendDate);
         List<QxjslDTO> qndyxqjsllist = event2Service.getDefectsEliminatRateList(null, null, qndybeginDate, qndyendDate);
         List<QxjslDTO> yearxqjsllist = event2Service.getDefectsEliminatRateList(null, null, yearbegin, yearend);
         List<QxjslDTO> qnyearxqjsllist = event2Service.getDefectsEliminatRateList(null, null, qnyearbegin, qnyearend);
@@ -111,12 +109,10 @@ public class NewGetWindReportService {
 
         //当年数据
         List<TurbineInfoDay> yearList = turbineInfoDayService.yearList(time);
-//        List<ProEconPowerstationInfoDay4> yearmttrList = proEconPowerstationInfoDay4Service.yearmttrList(time);
         List<StationInfoMonth> yearlist = stationInfoMonthService.yearlist(time);
 
         // 查询上一年度相同时间段
         List<TurbineInfoDay> qyearList = turbineInfoDayService.qyearList(time);
-//        List<ProEconPowerstationInfoDay4> qnmttList = proEconPowerstationInfoDay4Service.qnmttList(time);
         List<StationInfoMonth> qnmttlist = stationInfoMonthService.qnmttlist(time);
 
         setTurbineIdFromNemCode(wtls, top3list);