|
@@ -39,7 +39,6 @@ import com.qmth.teachcloud.common.util.Result;
|
|
|
import com.qmth.teachcloud.common.util.ResultUtil;
|
|
|
import com.qmth.teachcloud.common.util.ServletUtil;
|
|
|
import com.qmth.teachcloud.mark.entity.MarkPaper;
|
|
|
-import com.qmth.teachcloud.mark.service.MarkPaperService;
|
|
|
import io.swagger.annotations.*;
|
|
|
import org.apache.commons.collections4.CollectionUtils;
|
|
|
import org.apache.commons.io.FileUtils;
|
|
@@ -284,7 +283,7 @@ public class TRBasicInfoController {
|
|
|
courseTargetList.add(e.getCourseTargetName());
|
|
|
List<CourseWeightDetailDto> courseWeightDetailDtoList = e.getEvaluationList();
|
|
|
courseWeightDetailDtoList.stream().peek(s -> {
|
|
|
- if (!Objects.equals(s.getEvaluationName(), SystemConstant.FINAL_SCORE_STR)) {
|
|
|
+ if (Objects.nonNull(s.getEnable()) && s.getEnable() && !Objects.equals(s.getEvaluationName(), SystemConstant.FINAL_SCORE_STR)) {
|
|
|
usualScoreCourseSet.add(s.getEvaluationName());
|
|
|
}
|
|
|
}).collect(Collectors.toList());
|