|
|
@@ -40,6 +40,9 @@ public class PVExcelExportReportServer extends ExcelExportServer {
|
|
|
sheet.addMergedRegion(new CellRangeAddress(row.getRowNum(), row.getRowNum(), index,
|
|
|
index + 1));
|
|
|
entity.setKey(getCellStyle(func));
|
|
|
+ if (func.equals(FunctionEnum.TARGET)) {
|
|
|
+ recordCalcVO.setTargetValue(item.getConfig().getTargetValue()[i]);
|
|
|
+ }
|
|
|
createStringCell(row, index++, getCalcValue(func, recordCalcVO), getStyles(false, entity), null);
|
|
|
createStringCell(row, index++, "0", getStyles(false, entity), null);
|
|
|
|
|
|
@@ -55,7 +58,7 @@ public class PVExcelExportReportServer extends ExcelExportServer {
|
|
|
for (int i = 0; i < 3; i++) {
|
|
|
row = sheet.createRow(sheet.getLastRowNum() + 1);
|
|
|
row.setHeight((short) (entity.getHeight() * 50));
|
|
|
- createStringCell(row, 0, "结论", getStyles(false, entity), null);
|
|
|
+ createStringCell(row, 0, "结果分析", getStyles(false, entity), null);
|
|
|
createStringCell(row, 1, "", getStyles(false, entity), null);
|
|
|
createStringCell(row, 2, "PASS", getStyles(false, entity), null);
|
|
|
for (int j = 3; j < index; j++) createStringCell(row, j, "", getStyles(false, entity), null);
|
|
|
@@ -73,6 +76,10 @@ public class PVExcelExportReportServer extends ExcelExportServer {
|
|
|
return recordCalcVO.getSd().getStr();
|
|
|
case AVERAGE:
|
|
|
return recordCalcVO.getAverage().getStr();
|
|
|
+ case TARGET:
|
|
|
+ return recordCalcVO.getTargetValue().toString();
|
|
|
+ case ABSDEV:
|
|
|
+ return Double.toString(recordCalcVO.calcAbsoluteDeviation());
|
|
|
default:
|
|
|
return "";
|
|
|
}
|
|
|
@@ -82,12 +89,8 @@ public class PVExcelExportReportServer extends ExcelExportServer {
|
|
|
switch (func) {
|
|
|
case CV:
|
|
|
return "statistic-percent";
|
|
|
- case SD:
|
|
|
- return "statistic-double";
|
|
|
- case AVERAGE:
|
|
|
- return "statistic-double";
|
|
|
default:
|
|
|
- return "";
|
|
|
+ return "statistic-double";
|
|
|
}
|
|
|
}
|
|
|
|