This commit is contained in:
caozehui
2025-04-21 11:38:56 +08:00
parent 496cff6c11
commit 257df0a511
2 changed files with 10 additions and 10 deletions

View File

@@ -1218,7 +1218,7 @@ public class PqReportServiceImpl extends ServiceImpl<PqReportMapper, PqReport> i
fillHarm(dataModelMap, adHarmonicResult, index, key, 57.74, 100); fillHarm(dataModelMap, adHarmonicResult, index, key, 57.74, 100);
} }
if (DetectionCodeEnum.I2_50.getCode().equals(key) || DetectionCodeEnum.SI_1_49.getCode().equals(key)) { if (DetectionCodeEnum.I2_50.getCode().equals(key) || DetectionCodeEnum.SI_1_49.getCode().equals(key)) {
fillHarm(dataModelMap, adHarmonicResult, index, key, 1, 1); fillHarm(dataModelMap, adHarmonicResult, index, key, 1, 100);
} }
} }
} }
@@ -1249,15 +1249,15 @@ public class PqReportServiceImpl extends ServiceImpl<PqReportMapper, PqReport> i
double bBaseValue = baseValue; double bBaseValue = baseValue;
double cBaseValue = baseValue; double cBaseValue = baseValue;
if (!aBase.equals(StrPool.SLASH)) { // if (!aBase.equals(StrPool.SLASH)) {
aBaseValue = Double.parseDouble(aBase); // aBaseValue = Double.parseDouble(aBase);
} // }
if (!bBase.equals(StrPool.SLASH)) { // if (!bBase.equals(StrPool.SLASH)) {
bBaseValue = Double.parseDouble(bBase); // bBaseValue = Double.parseDouble(bBase);
} // }
if (!cBase.equals(StrPool.SLASH)) { // if (!cBase.equals(StrPool.SLASH)) {
cBaseValue = Double.parseDouble(cBase); // cBaseValue = Double.parseDouble(cBase);
} // }
dataModelMap.put("${" + index + "#" + key + "#A#2}", devValue(adHarmonicResult.getAValue2(), aBaseValue, percent)); dataModelMap.put("${" + index + "#" + key + "#A#2}", devValue(adHarmonicResult.getAValue2(), aBaseValue, percent));
dataModelMap.put("${" + index + "#" + key + "#B#2}", devValue(adHarmonicResult.getBValue2(), bBaseValue, percent)); dataModelMap.put("${" + index + "#" + key + "#B#2}", devValue(adHarmonicResult.getBValue2(), bBaseValue, percent));