利用小时分析补充提交

web/runeconomy-jjyx/src/main/java/com/gyee/runeconomy/service/specific/SpecificService.java

@@ -3049,6 +3049,7 @@ public class SpecificService {
     public List<SpecificTarget> Utilization(String companys, String type, String year) {
 
         List<ProBasicOrganizeTree> wpls = CacheContext.wpls;
+        List<ProBasicOrganizeTree> rgls = CacheContext.rgls;
 
         //获取年份所有当月的数据
         QueryWrapper<ProEconPowerstationInfoDay1> currentqw = new QueryWrapper<>();
@@ -3115,8 +3116,14 @@ public class SpecificService {
             vo.setYear(DateUtils.getYear(i.getRecordDate()));
             vo.setMonth(DateUtils.getMonth(i.getRecordDate()));
             for (ProBasicOrganizeTree wp : wpls) {
-                if (i.getForeignKeyId().equals(wp.getId())) {
-                    vo.setCurrent(DoubleUtils.keepPrecision((i.getYfdl().doubleValue() / 10000)/wp.getJrCapacity(), 2));
+                if (i.getForeignKeyId().equals(wp.getId()) && wp.getJrCapacity() !=null) {
+                    vo.setCurrent(DoubleUtils.keepPrecision((i.getYfdl().doubleValue() / 10000) / wp.getJrCapacity(), 2));
+                }else if (wpid.contains("JS_RGN")){
+                    for (ProBasicOrganizeTree cp : rgls) {
+                        vo.setCurrent(DoubleUtils.keepPrecision((i.getYfdl().doubleValue() / 10000) / cp.getJrCapacity(), 2));
+                    }
+                }else {
+                    vo.setCurrent(DoubleUtils.keepPrecision(i.getYfdl().doubleValue() / 10000, 2));
                 }
             }
             resultList.add(vo);
@@ -3129,8 +3136,14 @@ public class SpecificService {
             if (optional.isPresent()){
                 ProEconPowerstationInfoDay1 tqinfoday = optional.get();
                 for (ProBasicOrganizeTree wp : wpls) {
-                    if (i.getWpid().equals(wp.getId())) {
+                    if (i.getWpid().equals(wp.getId())&& wp.getJrCapacity() !=null) {
                         i.setSameperiod(DoubleUtils.keepPrecision((tqinfoday.getYfdl().doubleValue() / 10000) /wp.getJrCapacity(), 2));
+                    }else if (i.getWpid().contains("JS_RGN")) {
+                        for (ProBasicOrganizeTree cp : rgls){
+                            i.setSameperiod(DoubleUtils.keepPrecision((tqinfoday.getYfdl().doubleValue() / 10000) / cp.getJrCapacity(), 2));
+                         }
+                    }else {
+                        i.setSameperiod(DoubleUtils.keepPrecision(tqinfoday.getYfdl().doubleValue() / 10000, 2));
                     }
                 }
                 if (i.getSameperiod()==null) {