3 Commits

Author SHA1 Message Date
04fe9bdbbd Merge pull request 'liaoning' (#1) from liaoning into main
Reviewed-on: #1
2025-10-15 10:39:21 +08:00
hzj
b41347c596 Merge remote-tracking branch 'origin/main' into liaoning 2025-10-15 10:38:02 +08:00
hzj
4f75deac43 报表bug修改 2025-10-15 10:33:51 +08:00

View File

@@ -719,25 +719,25 @@ public class ExportModelController extends BaseController {
reportmap.put("$FV0%$", judgeNull(valueOfFreValue.getCp95Value()));
try {
maxValue = Math.abs(Double.parseDouble(valueOfFreValue.getFmaxValue().toString()));
minValue = Math.abs(Double.parseDouble(valueOfFreValue.getMinValue().toString()));
aveValue = Math.abs(Double.parseDouble(valueOfFreValue.getMeanValue().toString()));
cp95Value = Math.abs(Double.parseDouble(valueOfFreValue.getCp95Value().toString()));
maxValue = Double.parseDouble(valueOfFreValue.getFmaxValue().toString());
minValue = Double.parseDouble(valueOfFreValue.getMinValue().toString());
aveValue = Double.parseDouble(valueOfFreValue.getMeanValue().toString());
cp95Value = Double.parseDouble(valueOfFreValue.getCp95Value().toString());
limit = Math.abs(Double.parseDouble(valueOfFreLimit));
} catch (Exception e) {
strResultFreValue += "注意:从上表中可以看出" + strLineBaseName + "频率偏差数据存在异常(不是数值类型)。";
}
if (maxValue > limit) {
if (Math.abs(maxValue) > limit) {
tmpstrResultFre += "最大值为:" + valueOfFreValue.getFmaxValue().toString() + deviceUnit.getUnitFrequencyDev();
}
if (minValue > limit) {
if (Math.abs(minValue) > limit) {
tmpstrResultFre += "最小值为:" + valueOfFreValue.getMinValue().toString() + deviceUnit.getUnitFrequencyDev();
}
if (aveValue > limit) {
if (Math.abs(aveValue) > limit) {
tmpstrResultFre += "平均值为:" + valueOfFreValue.getMeanValue().toString() + deviceUnit.getUnitFrequencyDev();
}
if (cp95Value > limit) {
if (Math.abs(cp95Value) > limit) {
tmpstrResultFre += "95%概率值为:" + valueOfFreValue.getCp95Value().toString() + deviceUnit.getUnitFrequencyDev();
}