|
@@ -742,6 +742,8 @@ public class TRBasicInfoServiceImpl extends ServiceImpl<TRBasicInfoMapper, TRBas
|
|
}
|
|
}
|
|
examStudent_cells_1.add(Cells.of("综合成绩").center().create());
|
|
examStudent_cells_1.add(Cells.of("综合成绩").center().create());
|
|
examStudent_cells_2.add(Cells.of("综合成绩").center().create());
|
|
examStudent_cells_2.add(Cells.of("综合成绩").center().create());
|
|
|
|
+ examStudent_cells_1.add(Cells.of("达成系数").center().create());
|
|
|
|
+ examStudent_cells_2.add(Cells.of("达成系数").center().create());
|
|
}
|
|
}
|
|
|
|
|
|
List<BigDecimal> scoreList = new ArrayList<>();
|
|
List<BigDecimal> scoreList = new ArrayList<>();
|
|
@@ -842,6 +844,12 @@ public class TRBasicInfoServiceImpl extends ServiceImpl<TRBasicInfoMapper, TRBas
|
|
examStudent_cells.add(Cells.of(SystemConstant.df.format(trExamStudent.getScore())).create());
|
|
examStudent_cells.add(Cells.of(SystemConstant.df.format(trExamStudent.getScore())).create());
|
|
break;
|
|
break;
|
|
}
|
|
}
|
|
|
|
+ String key = examStudent_cells.get(examStudent_cells.size() - 1).getParagraphs().get(0).getContents().get(0).toString();
|
|
|
|
+ if (!Objects.equals(key.trim(), "") && !Objects.equals(key.trim(), "null")) {
|
|
|
|
+ examStudent_cells.add(Cells.of(SystemConstant.df.format(new BigDecimal(key).divide(SystemConstant.PERCENT, 2, BigDecimal.ROUND_HALF_UP))).create());
|
|
|
|
+ } else {
|
|
|
|
+ examStudent_cells.add(Cells.of("").create());
|
|
|
|
+ }
|
|
examStudent_row.setCells(examStudent_cells);
|
|
examStudent_row.setCells(examStudent_cells);
|
|
examStudent_row.setRowStyle(this.getRowStyle());
|
|
examStudent_row.setRowStyle(this.getRowStyle());
|
|
rowRenderDataExamStudent[i + 2] = examStudent_row;
|
|
rowRenderDataExamStudent[i + 2] = examStudent_row;
|
|
@@ -886,6 +894,7 @@ public class TRBasicInfoServiceImpl extends ServiceImpl<TRBasicInfoMapper, TRBas
|
|
}
|
|
}
|
|
}
|
|
}
|
|
mergeCellRuleExamStudent.getMapping().add(new MergeCellRule.GridRule(MergeCellRule.Grid.of(rowRenderDataExamStudent.length - 1, 4), MergeCellRule.Grid.of(rowRenderDataExamStudent.length - 1, cellSize - 1)));
|
|
mergeCellRuleExamStudent.getMapping().add(new MergeCellRule.GridRule(MergeCellRule.Grid.of(rowRenderDataExamStudent.length - 1, 4), MergeCellRule.Grid.of(rowRenderDataExamStudent.length - 1, cellSize - 1)));
|
|
|
|
+ mergeCellRuleExamStudent.getMapping().add(new MergeCellRule.GridRule(MergeCellRule.Grid.of(0, rowRenderDataExamStudent[rowRenderDataExamStudent.length - 1].getCells().size() - 2), MergeCellRule.Grid.of(1, rowRenderDataExamStudent[rowRenderDataExamStudent.length - 1].getCells().size() - 2)));
|
|
mergeCellRuleExamStudent.getMapping().add(new MergeCellRule.GridRule(MergeCellRule.Grid.of(0, rowRenderDataExamStudent[rowRenderDataExamStudent.length - 1].getCells().size() - 1), MergeCellRule.Grid.of(1, rowRenderDataExamStudent[rowRenderDataExamStudent.length - 1].getCells().size() - 1)));
|
|
mergeCellRuleExamStudent.getMapping().add(new MergeCellRule.GridRule(MergeCellRule.Grid.of(0, rowRenderDataExamStudent[rowRenderDataExamStudent.length - 1].getCells().size() - 1), MergeCellRule.Grid.of(1, rowRenderDataExamStudent[rowRenderDataExamStudent.length - 1].getCells().size() - 1)));
|
|
|
|
|
|
Tables.TableBuilder tableBuilderExamStudent = Tables.ofPercentWidth(tbPercentWidth);
|
|
Tables.TableBuilder tableBuilderExamStudent = Tables.ofPercentWidth(tbPercentWidth);
|