|
|
|
@ -4,7 +4,10 @@ import cn.hutool.core.util.IdUtil;
|
|
|
|
|
import com.sztzjy.financial_bigdata.annotation.AnonymousAccess;
|
|
|
|
|
import com.sztzjy.financial_bigdata.entity.*;
|
|
|
|
|
import com.sztzjy.financial_bigdata.entity.stu_dto.StuTrainingDto;
|
|
|
|
|
import com.sztzjy.financial_bigdata.mapper.*;
|
|
|
|
|
import com.sztzjy.financial_bigdata.mapper.StuTrainingMapper;
|
|
|
|
|
import com.sztzjy.financial_bigdata.mapper.SysCourseChapterMapper;
|
|
|
|
|
import com.sztzjy.financial_bigdata.mapper.SysWeightMapper;
|
|
|
|
|
import com.sztzjy.financial_bigdata.mapper.TrainingReportMapper;
|
|
|
|
|
import com.sztzjy.financial_bigdata.util.ResultEntity;
|
|
|
|
|
import com.sztzjy.financial_bigdata.util.file.IFileUtil;
|
|
|
|
|
import io.swagger.annotations.Api;
|
|
|
|
@ -59,8 +62,7 @@ public class StuScoreController {
|
|
|
|
|
SysWeightExample sysWeightExample = new SysWeightExample();
|
|
|
|
|
sysWeightExample.createCriteria().andCourseIdEqualTo(sysCourseChapter.getCourseId()).andSchoolIdEqualTo(schoolId);
|
|
|
|
|
List<SysWeight> sysWeights = sysWeightMapper.selectByExample(sysWeightExample);
|
|
|
|
|
if (!sysWeights.isEmpty())
|
|
|
|
|
{
|
|
|
|
|
if (!sysWeights.isEmpty()) {
|
|
|
|
|
SysWeight sysWeight = sysWeights.get(0);
|
|
|
|
|
BeanUtils.copyProperties(sysWeight, stuTrainingDto); //五个权重
|
|
|
|
|
}
|
|
|
|
@ -69,9 +71,8 @@ public class StuScoreController {
|
|
|
|
|
|
|
|
|
|
BeanUtils.copyProperties(stuTrainingWithBLOBs, stuTrainingDto); //四个完成情况和四个得分
|
|
|
|
|
TrainingReport trainingReport = trainingReportMapper.selectByPrimaryKey(stuTrainingWithBLOBs.getReportId());
|
|
|
|
|
|
|
|
|
|
//设置报告相关数据
|
|
|
|
|
if (trainingReport.getTeacherScore()==null){
|
|
|
|
|
if (trainingReport == null || trainingReport.getTeacherScore() == null) {
|
|
|
|
|
stuTrainingDto.setReportCompleteStatus("未提交");
|
|
|
|
|
stuTrainingDto.setReportScore(null);
|
|
|
|
|
} else {
|
|
|
|
|