Merge branch 'master' of http://124.70.43.205:3000/xieshengjie/sis

web/runeconomy-jjyx/src/main/java/com/gyee/runeconomy/service/bmk/BenchmarkingService.java

@@ -127,11 +127,7 @@ public class BenchmarkingService {
 
         qw.ge("record_date", DateUtils.parseDate(beginDate)).le("record_date", DateUtils.parseDate(endDate));
 
-        if (companyid.endsWith("ZGS")) {
-            qw.eq("company_id", companyid);
-        } else if (companyid.endsWith("RGN")) {
-            qw.eq("region_id", companyid);
-        }
+
 
         if (getype.equals("-1")) {
             qw.like("windturbine_id", "_F_WT_");
@@ -148,6 +144,20 @@ public class BenchmarkingService {
         } else if (StringUtils.isNotEmpty(wpids)) {
             List<String> wpList = Arrays.asList(wpids.split(","));
             qw.in("windpowerstation_id", wpList);
+        } else if (StringUtils.isNotEmpty(companyid)) {
+
+            String[] split = companyid.split(",");
+
+            if (companyid.contains("RGN")) {
+                for (String s : split) {
+                    if(s.endsWith("RGN")){
+                        companyid = s;
+                    }
+                }
+                qw.eq("region_id", companyid);
+            } else {
+                qw.in("company_id", Arrays.asList(split));
+            }
         }
 
         List<ProEconEquipmentInfoDay1> list = proEconEquipmentInfoDay1Service.list(qw);