装机容量调整

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/service/auto/impl/ProBasicCompanyServiceImpl.java

@@ -42,7 +42,7 @@ public class ProBasicCompanyServiceImpl extends ServiceImpl<ProBasicCompanyMappe
         Double sumall = new Double(0.00);
         List<ProBasicCompany>  list = getBaseMapper().selectList(qw);
        for (ProBasicCompany i : list){
-            sumall = sumall + i.getWindCapacity()+i.getCapacity();
+            sumall = sumall + i.getJrwindCapacity()+i.getJrCapacity();
         }
 
         return sumall;

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/service/homepage/EconomyPointHomePageService.java

@@ -236,7 +236,7 @@ public class EconomyPointHomePageService {
             info.put("aname", p.getAname());
             info.put("name", p.getName());
             info.put("nemCode", p.getNemCode());
-            info.put("capacity", (p.getWindCapacity() + p.getCapacity()) / 10000);
+            info.put("capacity", (p.getJrwindCapacity() + p.getJrCapacity()) / 10000);
             info.put("xPoint",p.getXEmPoint());
             info.put("yPoint",p.getYEmPoint());
             if (null != day1) {