|
|
@@ -32,7 +32,6 @@ import com.qmth.teachcloud.common.util.JacksonUtil;
|
|
|
import com.qmth.teachcloud.common.util.ServletUtil;
|
|
|
import com.qmth.teachcloud.mark.bean.archivescore.ScoreRangeVo;
|
|
|
import com.qmth.teachcloud.mark.entity.MarkPaper;
|
|
|
-import com.qmth.teachcloud.mark.utils.Calculator;
|
|
|
import org.apache.poi.xwpf.usermodel.ParagraphAlignment;
|
|
|
import org.apache.poi.xwpf.usermodel.XWPFTableCell;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
@@ -415,6 +414,8 @@ public class TRBasicInfoServiceImpl extends ServiceImpl<TRBasicInfoMapper, TRBas
|
|
|
jsonObject.put("targetWebMap", courseTargetWebDtoList);
|
|
|
trBasicInfo.setCourseEvaluationResultDetail(jsonObject.toJSONString());
|
|
|
}
|
|
|
+ reportCourseBasicInfoDto.setParticipantCount(examStudentNewList.size() - 3);
|
|
|
+ trBasicInfo.setParticipantCount(examStudentNewList.size() - 3);
|
|
|
trBasicInfo.getReportResult().setCommonInfo(new ReportCommonDto(markPaper.getExamId(), markPaper.getCourseCode(), markPaper.getCourseName(), markPaper.getPaperNumber()));
|
|
|
return trBasicInfo;
|
|
|
}
|
|
|
@@ -1042,7 +1043,7 @@ public class TRBasicInfoServiceImpl extends ServiceImpl<TRBasicInfoMapper, TRBas
|
|
|
int count = tcFinalScoreService.getCountByScoreRange(examId, courseCode, paperNumber, start, end);
|
|
|
Double rate = null;
|
|
|
if (toltal != 0) {
|
|
|
- rate = Calculator.multiply(count, toltal, 2);
|
|
|
+ rate = new BigDecimal(count).divide(new BigDecimal(toltal), 2, BigDecimal.ROUND_HALF_UP).setScale(2, BigDecimal.ROUND_HALF_UP).multiply(SystemConstant.PERCENT).doubleValue();
|
|
|
}
|
|
|
return new ScoreRangeVo(count, start, end, rate);
|
|
|
}
|
wangliang