|
@@ -408,7 +408,7 @@ public class TRBasicInfoServiceImpl extends ServiceImpl<TRBasicInfoMapper, TRBas
|
|
public TableRenderData buildWordTable1(List<CourseTargetWordDto> courseTargetWordDtoList) {
|
|
public TableRenderData buildWordTable1(List<CourseTargetWordDto> courseTargetWordDtoList) {
|
|
//table1课程目标目标与毕业要求指标点的对应关系
|
|
//table1课程目标目标与毕业要求指标点的对应关系
|
|
RowRenderData header1 = Rows.of("课程目标", "毕业要求指标点").bgColor(tbBgColor).center().create();
|
|
RowRenderData header1 = Rows.of("课程目标", "毕业要求指标点").bgColor(tbBgColor).center().create();
|
|
- Tables.TableBuilder tableBuilder1 = Tables.ofPercentWidth(tbPercentWidth);
|
|
|
|
|
|
+ Tables.TableBuilder tableBuilder1 = Tables.ofPercentWidth(tbPercentWidth, new int[]{25, 75});
|
|
tableBuilder1.addRow(header1);
|
|
tableBuilder1.addRow(header1);
|
|
|
|
|
|
for (int i = 0; i < courseTargetWordDtoList.size(); i++) {
|
|
for (int i = 0; i < courseTargetWordDtoList.size(); i++) {
|
|
@@ -454,7 +454,7 @@ public class TRBasicInfoServiceImpl extends ServiceImpl<TRBasicInfoMapper, TRBas
|
|
map(MergeCellRule.Grid.of(rowRenderData2.length - 1, 0), MergeCellRule.Grid.of(rowRenderData2.length - 1, 1)).
|
|
map(MergeCellRule.Grid.of(rowRenderData2.length - 1, 0), MergeCellRule.Grid.of(rowRenderData2.length - 1, 1)).
|
|
build();
|
|
build();
|
|
|
|
|
|
- Tables.TableBuilder tableBuilder2 = Tables.ofPercentWidth(tbPercentWidth);
|
|
|
|
|
|
+ Tables.TableBuilder tableBuilder2 = Tables.ofPercentWidth(tbPercentWidth, new int[]{25, 26, 16, 16, 17});
|
|
for (int i = 0; i < rowRenderData2.length; i++) {
|
|
for (int i = 0; i < rowRenderData2.length; i++) {
|
|
tableBuilder2.addRow(rowRenderData2[i]);
|
|
tableBuilder2.addRow(rowRenderData2[i]);
|
|
}
|
|
}
|
|
@@ -502,7 +502,7 @@ public class TRBasicInfoServiceImpl extends ServiceImpl<TRBasicInfoMapper, TRBas
|
|
MergeCellRule mergeCellRule3 = MergeCellRule.builder().map(MergeCellRule.Grid.of(rowRenderData3.length - 1, 0), MergeCellRule.Grid.of(rowRenderData3.length - 1, 4)).
|
|
MergeCellRule mergeCellRule3 = MergeCellRule.builder().map(MergeCellRule.Grid.of(rowRenderData3.length - 1, 0), MergeCellRule.Grid.of(rowRenderData3.length - 1, 4)).
|
|
build();
|
|
build();
|
|
|
|
|
|
- Tables.TableBuilder tableBuilder3 = Tables.ofPercentWidth(tbPercentWidth);
|
|
|
|
|
|
+ Tables.TableBuilder tableBuilder3 = Tables.ofPercentWidth(tbPercentWidth, new int[]{8, 20, 37, 14, 21});
|
|
for (int i = 0; i < rowRenderData3.length; i++) {
|
|
for (int i = 0; i < rowRenderData3.length; i++) {
|
|
tableBuilder3.addRow(rowRenderData3[i]);
|
|
tableBuilder3.addRow(rowRenderData3[i]);
|
|
}
|
|
}
|
|
@@ -550,7 +550,7 @@ public class TRBasicInfoServiceImpl extends ServiceImpl<TRBasicInfoMapper, TRBas
|
|
MergeCellRule mergeCellRule4 = MergeCellRule.builder().map(MergeCellRule.Grid.of(rowRenderData4.length - 1, 0), MergeCellRule.Grid.of(rowRenderData4.length - 1, 4)).
|
|
MergeCellRule mergeCellRule4 = MergeCellRule.builder().map(MergeCellRule.Grid.of(rowRenderData4.length - 1, 0), MergeCellRule.Grid.of(rowRenderData4.length - 1, 4)).
|
|
build();
|
|
build();
|
|
|
|
|
|
- Tables.TableBuilder tableBuilder4 = Tables.ofPercentWidth(tbPercentWidth);
|
|
|
|
|
|
+ Tables.TableBuilder tableBuilder4 = Tables.ofPercentWidth(tbPercentWidth, new int[]{8, 20, 37, 14, 21});
|
|
for (int i = 0; i < rowRenderData4.length; i++) {
|
|
for (int i = 0; i < rowRenderData4.length; i++) {
|
|
tableBuilder4.addRow(rowRenderData4[i]);
|
|
tableBuilder4.addRow(rowRenderData4[i]);
|
|
}
|
|
}
|
|
@@ -746,6 +746,7 @@ public class TRBasicInfoServiceImpl extends ServiceImpl<TRBasicInfoMapper, TRBas
|
|
});
|
|
});
|
|
mergeCellRuleExamStudent.getMapping().add(new MergeCellRule.GridRule(MergeCellRule.Grid.of(0, initNum.get()), MergeCellRule.Grid.of(1, initNum.get())));
|
|
mergeCellRuleExamStudent.getMapping().add(new MergeCellRule.GridRule(MergeCellRule.Grid.of(0, initNum.get()), MergeCellRule.Grid.of(1, initNum.get())));
|
|
|
|
|
|
|
|
+// Tables.TableBuilder tableBuilderExamStudent = Tables.ofPercentWidth(tbPercentWidth, new int[]{6, 6, 6, 6, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 16});
|
|
Tables.TableBuilder tableBuilderExamStudent = Tables.ofPercentWidth(tbPercentWidth);
|
|
Tables.TableBuilder tableBuilderExamStudent = Tables.ofPercentWidth(tbPercentWidth);
|
|
for (int i = 0; i < rowRenderDataExamStudent.length; i++) {
|
|
for (int i = 0; i < rowRenderDataExamStudent.length; i++) {
|
|
tableBuilderExamStudent.addRow(rowRenderDataExamStudent[i]);
|
|
tableBuilderExamStudent.addRow(rowRenderDataExamStudent[i]);
|