diff --git a/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/dal/dataobject/student/StuPaperScoreDO.java b/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/dal/dataobject/student/StuPaperScoreDO.java index 808f9dad..d03891a6 100644 --- a/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/dal/dataobject/student/StuPaperScoreDO.java +++ b/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/dal/dataobject/student/StuPaperScoreDO.java @@ -59,4 +59,13 @@ public class StuPaperScoreDO extends TenantBaseDO { */ private int sort; + /** + * 判分详情,富文本格式 + */ + private String content; + /** + * 试题编码 + */ + private String quNum; + } \ No newline at end of file diff --git a/exam-module-judgement/exam-module-judgement-biz/src/main/java/pc/exam/pp/module/judgement/controller/admin/autoTools/AutoToolsController.java b/exam-module-judgement/exam-module-judgement-biz/src/main/java/pc/exam/pp/module/judgement/controller/admin/autoTools/AutoToolsController.java index f841e5b3..c5611323 100644 --- a/exam-module-judgement/exam-module-judgement-biz/src/main/java/pc/exam/pp/module/judgement/controller/admin/autoTools/AutoToolsController.java +++ b/exam-module-judgement/exam-module-judgement-biz/src/main/java/pc/exam/pp/module/judgement/controller/admin/autoTools/AutoToolsController.java @@ -12,6 +12,7 @@ import pc.exam.pp.framework.common.pojo.CommonResult; import pc.exam.pp.module.exam.dal.dataobject.ExamQuestion; import pc.exam.pp.module.exam.dal.dataobject.student.StuPaperFileDO; import pc.exam.pp.module.exam.dal.dataobject.student.StuPaperInfoDO; +import pc.exam.pp.module.exam.dal.dataobject.student.StuPaperScoreDO; import pc.exam.pp.module.exam.dal.mysql.paper.EducationPaperQuMapper; import pc.exam.pp.module.exam.dal.mysql.question.ExamQuestionMapper; import pc.exam.pp.module.exam.dal.mysql.student.StuScoreVo; @@ -38,51 +39,18 @@ import java.util.List; @Tag( name = "测试判分") @Validated public class AutoToolsController { - @Resource - private AutoToolsService autoToolsService; @Resource StuPaperScoreService stuPaperScoreService; @Resource EducationPaperQuMapper educationPaperQuMapper; @Resource ExamQuestionMapper examQuestionMapper; - @Resource - private JudgementWpsWordService judgementWpsWordService; - @Resource - private JudgementWpsPptxService judgementWpsPptxService; - @Resource - private JudgementWpsExcelService judgementWpsExcelService; - @Resource - private JudgementService judgementService; - @Resource - IExamQuestionService examQuestionService; - @Resource - StuPaperInfoService stuPaperInfoService; - @GetMapping("/get") - public CommonResult get(StuPaperReqVo stuPaperReqVo) throws Exception { - return autoToolsService.judgementScore(stuPaperReqVo.getStuId(),stuPaperReqVo.getPaperId()); - } -// @GetMapping("/getTest") -// public double gets(StuPaperReqVo stuPaperReqVo) throws Exception { -// ExamQuestion examQuestion = examQuestionService.selectExamQuestionByQuId(stuPaperReqVo.getPaperId()); -// return judgementWpsWordService.judgementWpsWord(15.0, "D:\\", "D:\\stu\\wps_word\\1\\47effcb38c696564bef41e3927ff1f5535e068b580c6726f13296ae3230f4271.docx", examQuestion); -// } -// @GetMapping("/getTests") -// public double getss(StuPaperReqVo stuPaperReqVo) throws Exception { -// ExamQuestion examQuestion = examQuestionService.selectExamQuestionByQuId(stuPaperReqVo.getPaperId()); -// return judgementWpsPptxService.judgementWpsPptx(15.0, "D:\\", "D:\\文档.pptx", examQuestion); -// } -// @GetMapping("/getTestss") -// public double getsss(StuPaperReqVo stuPaperReqVo) throws Exception { -// ExamQuestion examQuestion = examQuestionService.selectExamQuestionByQuId(stuPaperReqVo.getPaperId()); -// return judgementWpsExcelService.judgementWpsXlsx(15.0, "D:\\", "D:\\文档.xlsx", examQuestion); -// } -// @GetMapping("/getTest") -// public double gets(StuPaperReqVo stuPaperReqVo) throws Exception { -// ExamQuestion examQuestion = examQuestionService.selectExamQuestionByQuId(stuPaperReqVo.getPaperId()); -// return judgementService.ProgrammingC(15.0, "D:\\", "C语言编程题.c", examQuestion); +// @GetMapping("/get") +// public CommonResult get(StuPaperReqVo stuPaperReqVo) throws Exception { +// return autoToolsService.judgementScore(stuPaperReqVo.getStuId(),stuPaperReqVo.getPaperId()); // } + @GetMapping("/getStuScoreInfo") @Operation(summary = "通过学生ID、试卷ID获取") public CommonResult getStuScore(StuPaperReqVo stuPaperReqVo){ @@ -98,11 +66,11 @@ public class AutoToolsController { List examQuestionList = examQuestionMapper.selectExamQuestionListByQuIds(quIds); stuPaperScoreInfoVos.setExamQuestionList(examQuestionList); // 5、查询学生试卷分析 - List stuPaperInfoDOList = stuPaperInfoService.findByStuIDAndPaperId(stuPaperReqVo.getStuId(), stuPaperReqVo.getPaperId()); + List scoreDOS = stuPaperScoreService.findByStuIDAndPaperId(stuPaperReqVo.getStuId(),stuPaperReqVo.getPaperId()); String judgementStr = "

试卷分析

"; - for (StuPaperInfoDO stuPaperInfoDO : stuPaperInfoDOList) { - judgementStr += "

"; - judgementStr += stuPaperInfoDO.getContent(); + for (StuPaperScoreDO scoreDO : scoreDOS) { + judgementStr += "

---------------------------------------

"; + judgementStr += scoreDO.getContent(); } stuPaperScoreInfoVos.setPaperAnalysis(judgementStr); return CommonResult.success(stuPaperScoreInfoVos); diff --git a/exam-module-judgement/exam-module-judgement-biz/src/main/java/pc/exam/pp/module/judgement/service/auto_tools/AutoToolsServiceImpl.java b/exam-module-judgement/exam-module-judgement-biz/src/main/java/pc/exam/pp/module/judgement/service/auto_tools/AutoToolsServiceImpl.java index 9a7c773c..f8952a22 100644 --- a/exam-module-judgement/exam-module-judgement-biz/src/main/java/pc/exam/pp/module/judgement/service/auto_tools/AutoToolsServiceImpl.java +++ b/exam-module-judgement/exam-module-judgement-biz/src/main/java/pc/exam/pp/module/judgement/service/auto_tools/AutoToolsServiceImpl.java @@ -180,7 +180,7 @@ public class AutoToolsServiceImpl implements AutoToolsService{ } /** - * 试卷得整体判分 + * 试卷得整体判分 2025-06-24 暂不使用,期限,无限 * @param stuId 学号 * @param paperId 试卷ID * @return 分数