|
|
@@ -1,6 +1,5 @@
|
|
|
package com.xjrsoft.module.xycxedu.service.impl;
|
|
|
|
|
|
-import camundajar.impl.scala.Array;
|
|
|
import cn.dev33.satoken.stp.StpUtil;
|
|
|
import cn.hutool.core.bean.BeanUtil;
|
|
|
import cn.hutool.core.util.StrUtil;
|
|
|
@@ -210,6 +209,14 @@ public class ExamSubjectScoreServiceImpl extends MPJBaseServiceImpl<ExamSubjectS
|
|
|
rowData.add(studentVo.getTeacherName());
|
|
|
|
|
|
List<ClassStudentScoreTitleVo> scoreList = studentVo.getScoreList();
|
|
|
+ if(scoreList == null){
|
|
|
+ for (ClassStudentScoreTitleVo scoreTitleVo : titleList) {
|
|
|
+ rowData.add("");
|
|
|
+ }
|
|
|
+ excelDataList.add(rowData);
|
|
|
+ sortCode ++;
|
|
|
+ continue;
|
|
|
+ }
|
|
|
double totalSocre = scoreList.stream().filter(x -> StrUtil.isNotEmpty(x.getScore())).mapToDouble(x -> Float.parseFloat(x.getScore())).sum();
|
|
|
BigDecimal bd = new BigDecimal(totalSocre);
|
|
|
if (bd.scale() <= 0) { // 如果是整数
|