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

word报表bug修改

Browse Source
This commit is contained in:
hzj
2026-01-19 13:36:36 +08:00
parent ca7f1010b0
commit fd6ec7bdf2
1 changed files with 41 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
pqs-harmonic/harmonic-common/src/main/java/com/njcn/harmonic/common/service/impl/MonitorHarmonicReportServiceImpl.java
View File

@@ -582,7 +582,6 @@ public class MonitorHarmonicReportServiceImpl implements MonitorHarmonicReportSe
// 获取电压偏差 // 获取电压偏差
// 值错误判断 // 值错误判断
try {
for (int i = 0; i < 3; i++) { for (int i = 0; i < 3; i++) {
switch (i) { switch (i) {
case 0: case 0:
@@ -596,18 +595,45 @@ public class MonitorHarmonicReportServiceImpl implements MonitorHarmonicReportSe
break; break;
} }
ReportValue vdeviation = this.listVdeviation.get(0).getList().get(i); ReportValue vdeviation = this.listVdeviation.get(0).getList().get(i);
if(Objects.equals("C",tmpstrMap)&&pttype == 2){ if (Objects.equals("C", tmpstrMap) && pttype == 2) {
reportmap.put("$VDTX_C$", "-"); reportmap.put("$VDTX_C$", "-");
reportmap.put("$VDTN_C$", "-"); reportmap.put("$VDTN_C$", "-");
reportmap.put("$VDTE_C$", "-"); reportmap.put("$VDTE_C$", "-");
reportmap.put("$VDT%_C$", "-"); reportmap.put("$VDT%_C$", "-");
continue; continue;
}else { } else {
reportmap.put("$VDTX_" + tmpstrMap + "$", judgeNull(vdeviation.getFmaxValue())); reportmap.put("$VDTX_" + tmpstrMap + "$", judgeNull(vdeviation.getFmaxValue()));
reportmap.put("$VDTN_" + tmpstrMap + "$", judgeNull(vdeviation.getMinValue())); reportmap.put("$VDTN_" + tmpstrMap + "$", judgeNull(vdeviation.getMinValue()));
reportmap.put("$VDTE_" + tmpstrMap + "$", judgeNull(vdeviation.getMeanValue())); reportmap.put("$VDTE_" + tmpstrMap + "$", judgeNull(vdeviation.getMeanValue()));
reportmap.put("$VDT%_" + tmpstrMap + "$", judgeNull(vdeviation.getCp95Value())); reportmap.put("$VDT%_" + tmpstrMap + "$", judgeNull(vdeviation.getCp95Value()));
} }
}
try {
for (int i = 0; i < 3; i++) {
switch (i) {
case 0:
tmpstrMap = "A";
break;
case 1:
tmpstrMap = "B";
break;
default:
tmpstrMap = "C";
break;
}
// ReportValue vdeviation = this.listVdeviation.get(0).getList().get(i);
// if(Objects.equals("C",tmpstrMap)&&pttype == 2){
// reportmap.put("$VDTX_C$", "-");
// reportmap.put("$VDTN_C$", "-");
// reportmap.put("$VDTE_C$", "-");
// reportmap.put("$VDT%_C$", "-");
// continue;
// }else {
// reportmap.put("$VDTX_" + tmpstrMap + "$", judgeNull(vdeviation.getFmaxValue()));
// reportmap.put("$VDTN_" + tmpstrMap + "$", judgeNull(vdeviation.getMinValue()));
// reportmap.put("$VDTE_" + tmpstrMap + "$", judgeNull(vdeviation.getMeanValue()));
// reportmap.put("$VDT%_" + tmpstrMap + "$", judgeNull(vdeviation.getCp95Value()));
// }
// 电压偏差 // 电压偏差
@@ -684,7 +710,7 @@ public class MonitorHarmonicReportServiceImpl implements MonitorHarmonicReportSe
// } // }
// 假如为空则所有的都满足 // 假如为空则所有的都满足
if ("".equals(tmpstrResultVdeviationdata)) { if ("".equals(tmpstrResultVdeviationdata)&&"".equals(strResultVdeviationdataValue)) {
strResultVdeviationdata += "从上表中可以看出" + strLineBaseName + "A、B、C三相电压偏差满足国标限值（"+ldeviationLimit+"%至"+vdeviationLimit+"%）的要求。"; strResultVdeviationdata += "从上表中可以看出" + strLineBaseName + "A、B、C三相电压偏差满足国标限值（"+ldeviationLimit+"%至"+vdeviationLimit+"%）的要求。";
} else { } else {
strAnalysis += tmpstrResultVdeviationdata + "电压偏差不满足国标限值（"+vdeviationLimit+"）的要求。"; strAnalysis += tmpstrResultVdeviationdata + "电压偏差不满足国标限值（"+vdeviationLimit+"）的要求。";