浙江无线报表调整

pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/CustomReportServiceImpl.java

@@ -1360,7 +1360,11 @@ public class CustomReportServiceImpl implements CustomReportService {
                                 String key = entry.getKey();
                                 double val = (double) entry.getValue();
                                 String zi = key.substring(0, key.indexOf("#"));
+                                String[] temStrArr = zi.split("_");
+                                boolean flag = isInteger(temStrArr[temStrArr.length-1]);
+                                if(flag){
                                     zi = zi.substring(0,zi.lastIndexOf("_"));
+                                }
                                 if (pqdMap.containsKey(zi)) {
                                     EleEpdPqd eleEpdPqd = pqdMap.get(zi).get(0);
                                     if(!eleEpdPqd.getPrimaryFormula().equals("*CT")){
@@ -1667,6 +1671,14 @@ public class CustomReportServiceImpl implements CustomReportService {
         }
     }
 
+    public static boolean isInteger(String str) {
+        try {
+            Integer.parseInt(str);
+            return true;
+        } catch (NumberFormatException e) {
+            return false;
+        }
+    }
 
 }