|
@@ -514,7 +514,7 @@ public class TRBasicInfoServiceImpl extends ServiceImpl<TRBasicInfoMapper, TRBas
|
|
|
|
|
|
for (int i = 0; i < courseTargetWordDtoList.size(); i++) {
|
|
|
CourseTargetWordDto courseTargetWordDto = courseTargetWordDtoList.get(i);
|
|
|
- RowRenderData row = Rows.of(courseTargetWordDto.getTargetName(), courseTargetWordDto.getParentRequirementName(), courseTargetWordDto.getObeCultureProgramRequirementName()).rowStyle(this.getRowStyle()).create();
|
|
|
+ RowRenderData row = Rows.of(courseTargetWordDto.getTargetName(), courseTargetWordDto.getObeCultureProgramRequirementName(), courseTargetWordDto.getParentRequirementName()).rowStyle(this.getRowStyle()).create();
|
|
|
tableBuilder1.addRow(row);
|
|
|
}
|
|
|
return tableBuilder1.left().create();
|
|
@@ -621,12 +621,12 @@ public class TRBasicInfoServiceImpl extends ServiceImpl<TRBasicInfoMapper, TRBas
|
|
|
}
|
|
|
for (String s : list) {
|
|
|
if (map.containsKey(s)) {
|
|
|
- cell.add(Cells.of(map.get(s) + "").create());
|
|
|
+ cell.add(Cells.of(SystemConstant.dfS.format(map.get(s))).create());
|
|
|
} else {
|
|
|
cell.add(Cells.of("").create());
|
|
|
}
|
|
|
}
|
|
|
- cell.add(Cells.of(courseTargetWordDto.getTargetSumWeight() + "").create());
|
|
|
+ cell.add(Cells.of(SystemConstant.dfS.format(courseTargetWordDto.getTargetSumWeight())).create());
|
|
|
row.setCells(cell);
|
|
|
row.setRowStyle(this.getRowStyle());
|
|
|
rowRenderData2[i + 2] = row;
|
|
@@ -636,12 +636,12 @@ public class TRBasicInfoServiceImpl extends ServiceImpl<TRBasicInfoMapper, TRBas
|
|
|
|
|
|
for (String s : list) {
|
|
|
if (totalMap.containsKey(s)) {
|
|
|
- totalCell.add(Cells.of(totalMap.get(s) + "").create());
|
|
|
+ totalCell.add(Cells.of(SystemConstant.dfS.format(totalMap.get(s))).create());
|
|
|
} else {
|
|
|
totalCell.add(Cells.of("").create());
|
|
|
}
|
|
|
}
|
|
|
- totalCell.add(Cells.of(weight + "").create());
|
|
|
+ totalCell.add(Cells.of(SystemConstant.dfS.format(weight)).create());
|
|
|
totalRow.setCells(totalCell);
|
|
|
totalRow.setRowStyle(this.getRowStyle());
|
|
|
rowRenderData2[rowRenderData2.length - 1] = totalRow;
|
|
@@ -939,13 +939,13 @@ public class TRBasicInfoServiceImpl extends ServiceImpl<TRBasicInfoMapper, TRBas
|
|
|
cells_1.add(Cells.of("最高分").center().create());
|
|
|
cells_1.add(Cells.of("最低分").center().create());
|
|
|
|
|
|
- cells_2.add(Cells.of(SystemConstant.df.format(avgScore) + "").create());
|
|
|
- cells_2.add(Cells.of(SystemConstant.df.format(maxScore) + "").create());
|
|
|
- cells_2.add(Cells.of(SystemConstant.df.format(minScore) + "").create());
|
|
|
+ cells_2.add(Cells.of(SystemConstant.df.format(avgScore)).create());
|
|
|
+ cells_2.add(Cells.of(SystemConstant.df.format(maxScore)).create());
|
|
|
+ cells_2.add(Cells.of(SystemConstant.df.format(minScore)).create());
|
|
|
|
|
|
- cells_3.add(Cells.of(SystemConstant.df.format(avgScore) + "").create());
|
|
|
- cells_3.add(Cells.of(SystemConstant.df.format(maxScore) + "").create());
|
|
|
- cells_3.add(Cells.of(SystemConstant.df.format(minScore) + "").create());
|
|
|
+ cells_3.add(Cells.of(SystemConstant.df.format(avgScore)).create());
|
|
|
+ cells_3.add(Cells.of(SystemConstant.df.format(maxScore)).create());
|
|
|
+ cells_3.add(Cells.of(SystemConstant.df.format(minScore)).create());
|
|
|
|
|
|
RowRenderData row_1 = new RowRenderData();
|
|
|
row_1.setCells(cells_1);
|