Browse Source

宣和上网电量表底修改

wangchangsheng 3 years ago
parent
commit
7148f5dc62

+ 3 - 1
src/main/java/cn/gyee/tamplate/service/analysis/AnalysisNewService.java

@@ -820,7 +820,9 @@ public class AnalysisNewService {
                     double jszbgyc = currentDayBdz1.stream().filter(i -> i.getMeterid().equals(SHZBGYC)).findFirst().get().getDayvaluemodify();
                     //(sfwyx*fcswfdl/(jszbgyc+fcswfdl))/10000
                     can.setSwdl((jszbgyc+fcswfdl)!=0?(sfwyx*fcswfdl/(jszbgyc+fcswfdl))/10000:0);
-                }else {
+                }else if (project.getWindpowerstationid().equals("XH_GDC")){
+                    can.setSwdl(can.getFdl()*0.988);//和场站协调 上网电量=发电量*0.988
+                } else {
                     can.setSwdl(fcfdl != 0.0 ? (generatingcapacity / fcfdl * fcswfdl) / 10000 : 0.0);
                 }