|
|
|
@ -41,7 +41,6 @@ import javax.servlet.http.HttpServletResponse;
|
|
|
|
|
import java.io.File;
|
|
|
|
|
import java.io.IOException;
|
|
|
|
|
import java.math.BigDecimal;
|
|
|
|
|
import java.text.SimpleDateFormat;
|
|
|
|
|
import java.util.*;
|
|
|
|
|
import java.util.function.Function;
|
|
|
|
|
import java.util.stream.Collectors;
|
|
|
|
@ -78,9 +77,10 @@ public class TeaGradeManageController {
|
|
|
|
|
@ApiOperation("考试模式--页面展示(学生端实战考核复用)")
|
|
|
|
|
public ResultEntity<PageInfo<TeaExamManageCountDto>> getExamInfo(@RequestParam Integer index,
|
|
|
|
|
@RequestParam Integer size,
|
|
|
|
|
@ApiParam("ManyAnswer为考试时间,JudgeAnswer为发布人") @RequestParam String schoolId) {
|
|
|
|
|
@ApiParam("ManyAnswer为考试时间,JudgeAnswer为发布人") @RequestParam String schoolId,
|
|
|
|
|
@ApiParam("系统名称")@RequestParam String systemOwner) {
|
|
|
|
|
|
|
|
|
|
List<TeaExamManage> teaExamManages = teaExamManageMapper.selectBySchoolId(schoolId);
|
|
|
|
|
List<TeaExamManage> teaExamManages = teaExamManageMapper.selectBySchoolIdAndSystemOwner(schoolId,systemOwner);
|
|
|
|
|
if (teaExamManages.isEmpty()) {
|
|
|
|
|
return null;
|
|
|
|
|
}
|
|
|
|
@ -149,7 +149,7 @@ public class TeaGradeManageController {
|
|
|
|
|
@RequestParam(required = false) String classId,
|
|
|
|
|
@RequestParam(required = false) String examManageId) {
|
|
|
|
|
List<TeaExamAndUserDto> list = getTeaExamAndUserDtos(schoolId, keyWord, classId, examManageId);
|
|
|
|
|
if (list == null||list.isEmpty()) {
|
|
|
|
|
if (list == null || list.isEmpty()) {
|
|
|
|
|
return new ResultEntity<PageInfo<TeaExamAndUserDto>>(new PageInfo<>());
|
|
|
|
|
}
|
|
|
|
|
// 先对列表按照 totalScore 进行降序排序
|
|
|
|
@ -416,7 +416,7 @@ public class TeaGradeManageController {
|
|
|
|
|
@ApiParam("学号或姓名搜索框") @RequestParam(required = false) String keyWord,
|
|
|
|
|
@RequestParam(required = false) String classId,
|
|
|
|
|
@RequestParam String systemOwner) {
|
|
|
|
|
return new ResultEntity<PageInfo<TeaTrainingInfoDTO>>(iTeaGradeManageService.getTrainingInfo(index, size, schoolId, keyWord, classId,systemOwner));
|
|
|
|
|
return new ResultEntity<PageInfo<TeaTrainingInfoDTO>>(iTeaGradeManageService.getTrainingInfo(index, size, schoolId, keyWord, classId, systemOwner));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@AnonymousAccess
|
|
|
|
@ -427,7 +427,7 @@ public class TeaGradeManageController {
|
|
|
|
|
@ApiParam("学号或姓名搜索框") @RequestParam(required = false) String keyWord,
|
|
|
|
|
@RequestParam(required = false) String classId,
|
|
|
|
|
@RequestParam String systemOwner) {
|
|
|
|
|
iTeaGradeManageService.exportTrainingInfo(response, schoolId, keyWord, classId,systemOwner);
|
|
|
|
|
iTeaGradeManageService.exportTrainingInfo(response, schoolId, keyWord, classId, systemOwner);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@AnonymousAccess
|
|
|
|
@ -496,7 +496,7 @@ public class TeaGradeManageController {
|
|
|
|
|
@AnonymousAccess
|
|
|
|
|
@PostMapping("/getChapterName")
|
|
|
|
|
@ApiOperation("***评阅-章节下拉框")
|
|
|
|
|
public ResultEntity<List<String>> getReportCorrect(String schoolId,String systemOwner) {
|
|
|
|
|
public ResultEntity<List<String>> getReportCorrect(String schoolId, String systemOwner) {
|
|
|
|
|
List<String> list = null;
|
|
|
|
|
try {
|
|
|
|
|
list = CourseAPI.selectNameByCourseID(schoolId, systemOwner);
|
|
|
|
@ -566,14 +566,14 @@ public class TeaGradeManageController {
|
|
|
|
|
@AnonymousAccess
|
|
|
|
|
@PostMapping("/getModuleBySchoolId")
|
|
|
|
|
@ApiOperation("***练习模式--权重页面下拉选择模块框")
|
|
|
|
|
public ResultEntity<List<Map<String, String>>> getModuleBySchoolId(@RequestParam String schoolId,@RequestParam String systemOwner) {
|
|
|
|
|
List<Map<String,String>> list= null;
|
|
|
|
|
public ResultEntity<List<Map<String, String>>> getModuleBySchoolId(@RequestParam String schoolId, @RequestParam String systemOwner) {
|
|
|
|
|
List<Map<String, String>> list = null;
|
|
|
|
|
try {
|
|
|
|
|
List<SysTwoCatalog> twoCatalogs = CourseAPI.selectCourseList(systemOwner, schoolId);
|
|
|
|
|
for (int i = 0; i < twoCatalogs.size(); i++) {
|
|
|
|
|
HashMap<String, String> hashMap = new HashMap<>();
|
|
|
|
|
SysTwoCatalog sysTwoCatalog = twoCatalogs.get(i);
|
|
|
|
|
hashMap.put(sysTwoCatalog.getTwoId(),sysTwoCatalog.getTwoName());
|
|
|
|
|
hashMap.put(sysTwoCatalog.getTwoId(), sysTwoCatalog.getTwoName());
|
|
|
|
|
list.add(hashMap);
|
|
|
|
|
}
|
|
|
|
|
} catch (IOException e) {
|
|
|
|
|