|
@@ -1634,20 +1634,20 @@ public class TRBasicInfoServiceImpl extends ServiceImpl<TRBasicInfoMapper, TRBas
|
|
|
}
|
|
|
switch (trExamStudent.getName()) {
|
|
|
case "平均分":
|
|
|
- if (Objects.isNull(sysConfig) || Objects.nonNull(sysConfig) && Objects.nonNull(sysConfig.getConfigValue()) && Objects.equals(sysConfig.getConfigValue(), "true")) {
|
|
|
- examStudent_cells.add(Cells.of(SystemConstant.df.format(targetAvgScore.setScale(2, BigDecimal.ROUND_HALF_UP))).create());
|
|
|
- }
|
|
|
+// if (Objects.isNull(sysConfig) || Objects.nonNull(sysConfig) && Objects.nonNull(sysConfig.getConfigValue()) && Objects.equals(sysConfig.getConfigValue(), "true")) {
|
|
|
+ examStudent_cells.add(Cells.of(SystemConstant.df.format(targetAvgScore.setScale(2, BigDecimal.ROUND_HALF_UP))).create());
|
|
|
+// }
|
|
|
break;
|
|
|
case "各课程目标平均分":
|
|
|
- if (Objects.isNull(sysConfig) || Objects.nonNull(sysConfig) && Objects.nonNull(sysConfig.getConfigValue()) && Objects.equals(sysConfig.getConfigValue(), "true")) {
|
|
|
- examStudent_cells.add(Cells.of("").create());
|
|
|
- }
|
|
|
+// if (Objects.isNull(sysConfig) || Objects.nonNull(sysConfig) && Objects.nonNull(sysConfig.getConfigValue()) && Objects.equals(sysConfig.getConfigValue(), "true")) {
|
|
|
+ examStudent_cells.add(Cells.of("").create());
|
|
|
+// }
|
|
|
break;
|
|
|
default:
|
|
|
scoreList.add(trExamStudent.getScore());
|
|
|
- if (Objects.isNull(sysConfig) || Objects.nonNull(sysConfig) && Objects.nonNull(sysConfig.getConfigValue()) && Objects.equals(sysConfig.getConfigValue(), "true")) {
|
|
|
- examStudent_cells.add(Cells.of(SystemConstant.df.format(trExamStudent.getScore())).create());
|
|
|
- }
|
|
|
+// if (Objects.isNull(sysConfig) || Objects.nonNull(sysConfig) && Objects.nonNull(sysConfig.getConfigValue()) && Objects.equals(sysConfig.getConfigValue(), "true")) {
|
|
|
+ examStudent_cells.add(Cells.of(SystemConstant.df.format(trExamStudent.getScore())).create());
|
|
|
+// }
|
|
|
break;
|
|
|
}
|
|
|
String key = examStudent_cells.get(examStudent_cells.size() - 1).getParagraphs().get(0).getContents().get(0).toString();
|
|
@@ -1656,6 +1656,9 @@ public class TRBasicInfoServiceImpl extends ServiceImpl<TRBasicInfoMapper, TRBas
|
|
|
} else {
|
|
|
examStudent_cells.add(Cells.of("").create());
|
|
|
}
|
|
|
+ if (Objects.isNull(sysConfig) || Objects.nonNull(sysConfig) && Objects.nonNull(sysConfig.getConfigValue()) && Objects.equals(sysConfig.getConfigValue(), "false")) {
|
|
|
+ examStudent_cells.remove(examStudent_cells.size() - 2);
|
|
|
+ }
|
|
|
examStudent_row.setCells(examStudent_cells);
|
|
|
examStudent_row.setRowStyle(this.getRowStyle());
|
|
|
rowRenderDataExamStudent[i + 2] = examStudent_row;
|