|
@@ -19,10 +19,12 @@ import com.qmth.distributed.print.business.service.TCPaperStructService;
|
|
|
import com.qmth.distributed.print.business.service.TRBasicInfoService;
|
|
|
import com.qmth.teachcloud.common.annotation.OperationLogDetail;
|
|
|
import com.qmth.teachcloud.common.contant.SystemConstant;
|
|
|
+import com.qmth.teachcloud.common.entity.BasicCourse;
|
|
|
import com.qmth.teachcloud.common.entity.MarkQuestion;
|
|
|
import com.qmth.teachcloud.common.entity.SysUser;
|
|
|
import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
|
|
|
import com.qmth.teachcloud.common.enums.log.OperationTypeEnum;
|
|
|
+import com.qmth.teachcloud.common.service.BasicCourseService;
|
|
|
import com.qmth.teachcloud.common.util.*;
|
|
|
import com.qmth.teachcloud.mark.entity.MarkPaper;
|
|
|
import com.qmth.teachcloud.mark.service.MarkPaperService;
|
|
@@ -79,6 +81,9 @@ public class TCFinalScoreController {
|
|
|
@Resource
|
|
|
MarkPaperService markPaperService;
|
|
|
|
|
|
+ @Resource
|
|
|
+ BasicCourseService basicCourseService;
|
|
|
+
|
|
|
@ApiOperation(value = "导入期末成绩-模板下载")
|
|
|
@RequestMapping(value = "/final_score/template_download", method = RequestMethod.POST)
|
|
|
@ApiResponses({@ApiResponse(code = 200, message = "下载成功", response = Object.class)})
|
|
@@ -149,8 +154,12 @@ public class TCFinalScoreController {
|
|
|
@ApiResponses({@ApiResponse(code = 200, message = "同步成功", response = EditResult.class)})
|
|
|
@OperationLogDetail(operationType = OperationTypeEnum.SYNC)
|
|
|
public Result finalScoreSyncChoosePaper(@ApiParam(value = "考试id") @RequestParam(required = false) Long examId,
|
|
|
- @ApiParam(value = "科目编码") @RequestParam(required = false) String courseCode) {
|
|
|
- return ResultUtil.ok(markPaperService.list(new QueryWrapper<MarkPaper>().lambda().eq(MarkPaper::getExamId, examId).eq(MarkPaper::getCourseCode, courseCode)));
|
|
|
+ @ApiParam(value = "科目编码") @RequestParam(required = false) Long courseId) {
|
|
|
+ BasicCourse basicCourse = basicCourseService.getById(courseId);
|
|
|
+ if (Objects.isNull(basicCourse)){
|
|
|
+ throw ExceptionResultEnum.ERROR.exception("未找到课程");
|
|
|
+ }
|
|
|
+ return ResultUtil.ok(markPaperService.list(new QueryWrapper<MarkPaper>().lambda().eq(MarkPaper::getExamId, examId).eq(MarkPaper::getCourseCode, basicCourse.getCode())));
|
|
|
}
|
|
|
|
|
|
@ApiOperation(value = "同步期末成绩")
|