Microservice/pqs
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

浙江无线报表调整

Browse Source
This commit is contained in:
chendaofei
2024-12-24 15:27:26 +08:00
parent 43af977942
commit 1acba83ff2
1 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1360,7 +1360,11 @@ public class CustomReportServiceImpl implements CustomReportService {
String key = entry.getKey(); String key = entry.getKey();
double val = (double) entry.getValue(); double val = (double) entry.getValue();
String zi = key.substring(0, key.indexOf("#")); String zi = key.substring(0, key.indexOf("#"));
zi = zi.substring(0,zi.lastIndexOf("_")); String[] temStrArr = zi.split("_");
boolean flag = isInteger(temStrArr[temStrArr.length-1]);
if(flag){
zi = zi.substring(0,zi.lastIndexOf("_"));
}
if (pqdMap.containsKey(zi)) { if (pqdMap.containsKey(zi)) {
EleEpdPqd eleEpdPqd = pqdMap.get(zi).get(0); EleEpdPqd eleEpdPqd = pqdMap.get(zi).get(0);
if(!eleEpdPqd.getPrimaryFormula().equals("*CT")){ 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;
}
}
} }