From c9c723f043e407711705a7031ad83625f3f0428a Mon Sep 17 00:00:00 2001 From: luluyuyu <3305167204@qq.com> Date: Wed, 4 Dec 2024 15:14:43 +0800 Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E9=A2=98=E5=BA=93=E9=A2=98?= =?UTF-8?q?=E7=9B=AE=E7=9A=84=E5=A2=9E=E5=88=A0=E6=94=B9=E6=9F=A5=EF=BC=8C?= =?UTF-8?q?=E8=AF=95=E5=8D=B7=E7=9A=84=E5=A2=9E=E5=88=A0=E6=94=B9=E6=9F=A5?= =?UTF-8?q?=EF=BC=8C=E5=8F=91=E5=B8=83=EF=BC=8C=E5=A4=8D=E5=88=B6=E8=AF=95?= =?UTF-8?q?=E5=8D=B7=EF=BC=8C=E6=98=AF=E5=90=A6=E5=8F=AF=E5=8F=82=E5=8A=A0?= =?UTF-8?q?=E8=80=83=E8=AF=95=EF=BC=8C=E6=89=8B=E5=8A=A8=E7=BB=93=E6=9D=9F?= =?UTF-8?q?=E8=AF=95=E5=8D=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Examquestion/service/QuestionService.java | 2 + .../service/impl/QuestionServiceImpl.java | 150 ++++++++++-------- .../eve/service/impl/ExamServiceImpl.java | 78 ++++----- .../service/ExamQuCheckboxService.java | 2 + .../impl/ExamQuCheckboxServiceImpl.java | 8 + .../service/ExamQuChenColumnService.java | 2 + .../impl/ExamQuChenColumnServiceImpl.java | 16 +- .../service/ExamQuChenRowService.java | 2 + .../impl/ExamQuChenRowServiceImpl.java | 24 ++- .../service/ExamQuMultiFillblankService.java | 2 + .../ExamQuMultiFillblankControllerImpl.java | 8 + .../service/ExamQuOrderbyService.java | 2 + .../impl/ExamQuOrderbyServiceImpl.java | 14 +- .../service/ExamQuRadioService.java | 2 + .../service/impl/ExamQuRadioServiceImpl.java | 9 ++ .../service/ExamQuScoreService.java | 2 + .../service/impl/ExamQuScoreServiceImpl.java | 12 +- .../service/ExamSurveyAnswerService.java | 4 + .../impl/ExamSurveyAnswerServiceImpl.java | 10 +- .../ExamSurveyDirectoryController.java | 15 ++ .../service/ExamSurveyDirectoryService.java | 4 + .../impl/ExamSurveyDirectoryServiceImpl.java | 37 ++++- .../mapper/exam/SysEveUserStaffDao.xml | 50 +++--- 23 files changed, 303 insertions(+), 152 deletions(-) diff --git a/skyeye-school/school-exam/src/main/java/com/skyeye/eve/Examquestion/service/QuestionService.java b/skyeye-school/school-exam/src/main/java/com/skyeye/eve/Examquestion/service/QuestionService.java index 4ff19ad3..dd16e646 100644 --- a/skyeye-school/school-exam/src/main/java/com/skyeye/eve/Examquestion/service/QuestionService.java +++ b/skyeye-school/school-exam/src/main/java/com/skyeye/eve/Examquestion/service/QuestionService.java @@ -22,6 +22,8 @@ public interface QuestionService extends SkyeyeBusinessService { void copyQuestionListMation(Question question); + List queryQuestionMationCopyById(String surveyCopyId); + // String saveQuestion(Question question, String id, String userId); } diff --git a/skyeye-school/school-exam/src/main/java/com/skyeye/eve/Examquestion/service/impl/QuestionServiceImpl.java b/skyeye-school/school-exam/src/main/java/com/skyeye/eve/Examquestion/service/impl/QuestionServiceImpl.java index e32e3663..76ca4ae9 100644 --- a/skyeye-school/school-exam/src/main/java/com/skyeye/eve/Examquestion/service/impl/QuestionServiceImpl.java +++ b/skyeye-school/school-exam/src/main/java/com/skyeye/eve/Examquestion/service/impl/QuestionServiceImpl.java @@ -4,9 +4,11 @@ package com.skyeye.eve.Examquestion.service.impl; +import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.skyeye.annotation.service.SkyeyeService; import com.skyeye.base.business.service.impl.SkyeyeBusinessServiceImpl; +import com.skyeye.common.constans.CommonNumConstants; import com.skyeye.common.entity.search.CommonPageInfo; import com.skyeye.common.object.InputObject; import com.skyeye.common.util.DateUtil; @@ -16,22 +18,18 @@ import com.skyeye.common.util.question.QuType; import com.skyeye.eve.Examquestion.dao.QuestionDao; import com.skyeye.eve.Examquestion.entity.Question; import com.skyeye.eve.Examquestion.service.QuestionService; -import com.skyeye.exam.examquchckbox.dao.ExamQuCheckboxDao; import com.skyeye.exam.examquchckbox.entity.ExamQuCheckbox; import com.skyeye.exam.examquchckbox.service.ExamQuCheckboxService; -import com.skyeye.exam.examquchencolumn.dao.ExamQuChenColumnDao; import com.skyeye.exam.examquchencolumn.entity.ExamQuChenColumn; import com.skyeye.exam.examquchencolumn.service.ExamQuChenColumnService; -import com.skyeye.exam.examquchenrow.dao.ExamQuChenRowDao; import com.skyeye.exam.examquchenrow.entity.ExamQuChenRow; +import com.skyeye.exam.examquchenrow.service.ExamQuChenRowService; import com.skyeye.exam.examquestionlogic.entity.ExamQuestionLogic; import com.skyeye.exam.examquestionlogic.service.ExamQuestionLogicService; -import com.skyeye.exam.examqumultfillblank.dao.ExamQuMultiFillblankDao; import com.skyeye.exam.examqumultfillblank.entity.ExamQuMultiFillblank; import com.skyeye.exam.examqumultfillblank.service.ExamQuMultiFillblankService; import com.skyeye.exam.examquorderby.entity.ExamQuOrderby; import com.skyeye.exam.examquorderby.service.ExamQuOrderbyService; -import com.skyeye.exam.examquradio.dao.ExamQuRadioDao; import com.skyeye.exam.examquradio.entity.ExamQuRadio; import com.skyeye.exam.examquradio.service.ExamQuRadioService; import com.skyeye.exam.examquscore.entity.ExamQuScore; @@ -40,7 +38,6 @@ import com.skyeye.exception.CustomException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.Collections; import java.util.List; /** @@ -73,9 +70,15 @@ public class QuestionServiceImpl extends SkyeyeBusinessServiceImpl questionLogic = entity.getQuestionLogic(); if (!questionLogic.isEmpty()) { examQuestionLogicService.setLogics(quId, questionLogic, userId); - }else { + } else { throw new CustomException("请设置问题逻辑"); } List radioTd = entity.getRadioTd(); @@ -177,9 +180,9 @@ public class QuestionServiceImpl extends SkyeyeBusinessServiceImpl examQuRadioList = examQuRadioService.selectQuRadio(question.getCopyFromId()); + for (ExamQuRadio examQuRadio : examQuRadioList) { + examQuRadio.setId(ToolUtil.getSurFaceId()); + examQuRadio.setCreateTime(DateUtil.getTimeAndToString()); + examQuRadio.setQuId(question.getId()); } - } - else if (quType.equals(QuType.CHECKBOX.getActionName()) || quType.equals(QuType.COMPCHECKBOX.getActionName())){ - ExamQuCheckbox examQuCheckbox = examQuCheckboxDao.selectById(question.getCopyFromId()); - examQuCheckbox.setId(ToolUtil.getSurFaceId()); - examQuCheckbox.setCreateTime(DateUtil.getTimeAndToString()); - examQuCheckbox.setQuId(question.getId()); - if (examQuCheckbox != null) { - examQuCheckboxDao.insert(examQuCheckbox); + if (!examQuRadioList.isEmpty()) { + examQuRadioService.createEntity(examQuRadioList, StrUtil.EMPTY); } - } - else if (quType.equals(QuType.MULTIFILLBLANK.getActionName())){ - ExamQuMultiFillblank examQuMultiFillblank = examQuMultiFillblankDao.selectById(question.getCopyFromId()); - examQuMultiFillblank.setId(ToolUtil.getSurFaceId()); - examQuMultiFillblank.setCreateTime(DateUtil.getTimeAndToString()); - examQuMultiFillblank.setQuId(question.getId()); - if (examQuMultiFillblank != null) { - examQuMultiFillblankDao.insert(examQuMultiFillblank); + } else if (quType.equals(QuType.CHECKBOX.getActionName()) || quType.equals(QuType.COMPCHECKBOX.getActionName())) { + List examQuCheckboxList = examQuCheckboxService.selectQuChenbox(question.getCopyFromId()); + for (ExamQuCheckbox examQuCheckbox : examQuCheckboxList) { + examQuCheckbox.setId(ToolUtil.getSurFaceId()); + examQuCheckbox.setCreateTime(DateUtil.getTimeAndToString()); + examQuCheckbox.setQuId(question.getId()); } - } - else if (quType.equals(QuType.BIGQU.getActionName())){ - } - else if (quType.equals(QuType.CHENRADIO.getActionName()) || quType.equals(QuType.CHENCHECKBOX.getActionName()) || quType.equals(QuType.CHENSCORE.getActionName()) - || quType.equals(QuType.CHENFBK.getActionName()) || quType.equals(QuType.COMPCHENRADIO.getActionName())){ - ExamQuChenRow examQuChenRow = examQuChenRowDao.selectById(question.getCopyFromId()); - ExamQuChenColumn examQuChenColumn = examQuChenColumnDao.selectById(question.getCopyFromId()); - examQuChenRow.setId(ToolUtil.getSurFaceId()); - examQuChenRow.setCreateTime(DateUtil.getTimeAndToString()); - examQuChenRow.setQuId(question.getId()); - examQuChenColumn.setId(ToolUtil.getSurFaceId()); - examQuChenColumn.setCreateTime(DateUtil.getTimeAndToString()); - examQuChenColumn.setQuId(question.getId()); - if (examQuChenRow != null) { - examQuChenRowDao.insert(examQuChenRow); + if (!examQuCheckboxList.isEmpty()) { + examQuCheckboxService.createEntity(examQuCheckboxList, StrUtil.EMPTY); } - if (examQuChenColumn != null) { - examQuChenColumnDao.insert(examQuChenColumn); + } else if (quType.equals(QuType.MULTIFILLBLANK.getActionName())) { + List multiFillblanksList = examQuMultiFillblankService.selectQuMultiFillblank(question.getCopyFromId()); + for (ExamQuMultiFillblank examQuMultiFillblank : multiFillblanksList) { + examQuMultiFillblank.setId(ToolUtil.getSurFaceId()); + examQuMultiFillblank.setCreateTime(DateUtil.getTimeAndToString()); + examQuMultiFillblank.setQuId(question.getId()); + } + if (!multiFillblanksList.isEmpty()) { + examQuMultiFillblankService.createEntity(multiFillblanksList, StrUtil.EMPTY); + } + } else if (quType.equals(QuType.BIGQU.getActionName())) { + } else if (quType.equals(QuType.CHENRADIO.getActionName()) || quType.equals(QuType.CHENCHECKBOX.getActionName()) || quType.equals(QuType.CHENSCORE.getActionName()) + || quType.equals(QuType.CHENFBK.getActionName()) || quType.equals(QuType.COMPCHENRADIO.getActionName())) { + List examQuChenRowList = examQuChenRowService.selectQuChenRow(question.getCopyFromId()); + List examQuChenColumnList = examQuChenColumnService.selectQuChenColumn(question.getCopyFromId()); + for (ExamQuChenRow examQuChenRow : examQuChenRowList) { + examQuChenRow.setId(ToolUtil.getSurFaceId()); + examQuChenRow.setCreateTime(DateUtil.getTimeAndToString()); + examQuChenRow.setQuId(question.getId()); + } + if (!examQuChenRowList.isEmpty()) { + examQuChenRowService.createEntity(examQuChenRowList, StrUtil.EMPTY); + } + for (ExamQuChenColumn examQuChenColumn : examQuChenColumnList) { + examQuChenColumn.setId(ToolUtil.getSurFaceId()); + examQuChenColumn.setCreateTime(DateUtil.getTimeAndToString()); + examQuChenColumn.setQuId(question.getId()); + } + if (!examQuChenColumnList.isEmpty()) { + examQuChenColumnService.createEntity(examQuChenColumnList, StrUtil.EMPTY); + } + } else if (quType.equals(QuType.SCORE.getActionName())) { + List examQuScoreList = examQuScoreService.selectQuScore(question.getCopyFromId()); + for (ExamQuScore examQuScore : examQuScoreList) { + examQuScore.setId(ToolUtil.getSurFaceId()); + examQuScore.setCreateTime(DateUtil.getTimeAndToString()); + examQuScore.setQuId(question.getId()); + } + if (!examQuScoreList.isEmpty()) { + examQuScoreService.createEntity(examQuScoreList, StrUtil.EMPTY); + } + } else if (quType.equals(QuType.ORDERQU.getActionName())) { + List examQuOrderbyList = examQuOrderbyService.selectQuOrderby(question.getCopyFromId()); + for (ExamQuOrderby examQuOrderby : examQuOrderbyList) { + examQuOrderby.setId(ToolUtil.getSurFaceId()); + examQuOrderby.setCreateTime(DateUtil.getTimeAndToString()); + examQuOrderby.setQuId(question.getId()); + } + if (!examQuOrderbyList.isEmpty()) { + examQuOrderbyService.createEntity(examQuOrderbyList, StrUtil.EMPTY); } - - } } + @Override + public List queryQuestionMationCopyById(String surveyCopyId) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq(MybatisPlusUtil.toColumns(Question::getBelongId), surveyCopyId); + queryWrapper.eq(MybatisPlusUtil.toColumns(Question::getTag), CommonNumConstants.NUM_TWO); + queryWrapper.ne(MybatisPlusUtil.toColumns(Question::getQuTag), CommonNumConstants.NUM_TWO); + queryWrapper.eq(MybatisPlusUtil.toColumns(Question::getVisibility), CommonNumConstants.NUM_ONE); + return list(queryWrapper); + } } diff --git a/skyeye-school/school-exam/src/main/java/com/skyeye/eve/service/impl/ExamServiceImpl.java b/skyeye-school/school-exam/src/main/java/com/skyeye/eve/service/impl/ExamServiceImpl.java index e00cb4e5..205e6892 100644 --- a/skyeye-school/school-exam/src/main/java/com/skyeye/eve/service/impl/ExamServiceImpl.java +++ b/skyeye-school/school-exam/src/main/java/com/skyeye/eve/service/impl/ExamServiceImpl.java @@ -46,7 +46,7 @@ public class ExamServiceImpl implements ExamService { /** * 获取所有试卷列表 * - * @param inputObject 入参以及用户信息等获取对象 + * @param inputObject 入参以及用户信息等获取对象 * @param outputObject 出参以及提示信息的返回值对象 */ @Override @@ -63,7 +63,7 @@ public class ExamServiceImpl implements ExamService { /** * 获取我的试卷列表 * - * @param inputObject 入参以及用户信息等获取对象 + * @param inputObject 入参以及用户信息等获取对象 * @param outputObject 出参以及提示信息的返回值对象 */ @Override @@ -130,10 +130,11 @@ public class ExamServiceImpl implements ExamService { } } */ + /** * 获取试卷题目信息 * - * @param inputObject 入参以及用户信息等获取对象 + * @param inputObject 入参以及用户信息等获取对象 * @param outputObject 出参以及提示信息的返回值对象 */ @Override @@ -194,7 +195,7 @@ public class ExamServiceImpl implements ExamService { } question.put("option", childQuestions); } else if (quType.equals(QuType.CHENRADIO.getActionName()) || quType.equals(QuType.CHENCHECKBOX.getActionName()) || quType.equals(QuType.CHENSCORE.getActionName()) - || quType.equals(QuType.CHENFBK.getActionName()) || quType.equals(QuType.COMPCHENRADIO.getActionName())) {// 矩阵单选，矩阵多选，矩阵填空题，复合矩阵单选 + || quType.equals(QuType.CHENFBK.getActionName()) || quType.equals(QuType.COMPCHENRADIO.getActionName())) {// 矩阵单选，矩阵多选，矩阵填空题，复合矩阵单选 List> questionChenRow = examDao.queryQuestionChenRowListByQuestionId(question);//获取行选项 List> questionChenColumn = examDao.queryQuestionChenColumnListByQuestionId(question);//获取列选项 for (Map bean : questionChenRow) { @@ -285,7 +286,7 @@ public class ExamServiceImpl implements ExamService { /** * 添加填空题 * - * @param inputObject 入参以及用户信息等获取对象 + * @param inputObject 入参以及用户信息等获取对象 * @param outputObject 出参以及提示信息的返回值对象 */ @Override @@ -312,7 +313,7 @@ public class ExamServiceImpl implements ExamService { /** * 添加评分题 * - * @param inputObject 入参以及用户信息等获取对象 + * @param inputObject 入参以及用户信息等获取对象 * @param outputObject 出参以及提示信息的返回值对象 */ @Override @@ -364,7 +365,7 @@ public class ExamServiceImpl implements ExamService { /** * 添加排序题 * - * @param inputObject 入参以及用户信息等获取对象 + * @param inputObject 入参以及用户信息等获取对象 * @param outputObject 出参以及提示信息的返回值对象 */ @Override @@ -416,7 +417,7 @@ public class ExamServiceImpl implements ExamService { /** * 添加分页标记 * - * @param inputObject 入参以及用户信息等获取对象 + * @param inputObject 入参以及用户信息等获取对象 * @param outputObject 出参以及提示信息的返回值对象 */ @Override @@ -435,7 +436,7 @@ public class ExamServiceImpl implements ExamService { /** * 添加单选题 * - * @param inputObject 入参以及用户信息等获取对象 + * @param inputObject 入参以及用户信息等获取对象 * @param outputObject 出参以及提示信息的返回值对象 */ @Override @@ -495,7 +496,7 @@ public class ExamServiceImpl implements ExamService { /** * 添加多选题 * - * @param inputObject 入参以及用户信息等获取对象 + * @param inputObject 入参以及用户信息等获取对象 * @param outputObject 出参以及提示信息的返回值对象 */ @Override @@ -555,7 +556,7 @@ public class ExamServiceImpl implements ExamService { /** * 添加多选填空题 * - * @param inputObject 入参以及用户信息等获取对象 + * @param inputObject 入参以及用户信息等获取对象 * @param outputObject 出参以及提示信息的返回值对象 */ @Override @@ -608,7 +609,7 @@ public class ExamServiceImpl implements ExamService { /** * 添加段落 * - * @param inputObject 入参以及用户信息等获取对象 + * @param inputObject 入参以及用户信息等获取对象 * @param outputObject 出参以及提示信息的返回值对象 */ @Override @@ -627,7 +628,7 @@ public class ExamServiceImpl implements ExamService { /** * 添加矩阵单选题,矩阵多选题,矩阵评分题,矩阵填空题 * - * @param inputObject 入参以及用户信息等获取对象 + * @param inputObject 入参以及用户信息等获取对象 * @param outputObject 出参以及提示信息的返回值对象 */ @Override @@ -718,7 +719,7 @@ public class ExamServiceImpl implements ExamService { /** * 删除问题 * - * @param inputObject 入参以及用户信息等获取对象 + * @param inputObject 入参以及用户信息等获取对象 * @param outputObject 出参以及提示信息的返回值对象 */ @Override @@ -752,7 +753,7 @@ public class ExamServiceImpl implements ExamService { /** * 删除矩阵单选题,矩阵多选题,矩阵评分题,矩阵填空题列选项 * - * @param inputObject 入参以及用户信息等获取对象 + * @param inputObject 入参以及用户信息等获取对象 * @param outputObject 出参以及提示信息的返回值对象 */ @Override @@ -774,7 +775,7 @@ public class ExamServiceImpl implements ExamService { /** * 删除矩阵单选题,矩阵多选题,矩阵评分题,矩阵填空题行选项 * - * @param inputObject 入参以及用户信息等获取对象 + * @param inputObject 入参以及用户信息等获取对象 * @param outputObject 出参以及提示信息的返回值对象 */ @Override @@ -796,7 +797,7 @@ public class ExamServiceImpl implements ExamService { /** * 删除单选题选项 * - * @param inputObject 入参以及用户信息等获取对象 + * @param inputObject 入参以及用户信息等获取对象 * @param outputObject 出参以及提示信息的返回值对象 */ @Override @@ -818,7 +819,7 @@ public class ExamServiceImpl implements ExamService { /** * 删除多选题选项 * - * @param inputObject 入参以及用户信息等获取对象 + * @param inputObject 入参以及用户信息等获取对象 * @param outputObject 出参以及提示信息的返回值对象 */ @Override @@ -840,7 +841,7 @@ public class ExamServiceImpl implements ExamService { /** * 删除评分题选项 * - * @param inputObject 入参以及用户信息等获取对象 + * @param inputObject 入参以及用户信息等获取对象 * @param outputObject 出参以及提示信息的返回值对象 */ @Override @@ -862,7 +863,7 @@ public class ExamServiceImpl implements ExamService { /** * 删除排序选项 * - * @param inputObject 入参以及用户信息等获取对象 + * @param inputObject 入参以及用户信息等获取对象 * @param outputObject 出参以及提示信息的返回值对象 */ @Override @@ -884,7 +885,7 @@ public class ExamServiceImpl implements ExamService { /** * 删除多项填空题选项 * - * @param inputObject 入参以及用户信息等获取对象 + * @param inputObject 入参以及用户信息等获取对象 * @param outputObject 出参以及提示信息的返回值对象 */ @Override @@ -904,7 +905,7 @@ public class ExamServiceImpl implements ExamService { /** * 发布试卷 * - * @param inputObject 入参以及用户信息等获取对象 + * @param inputObject 入参以及用户信息等获取对象 * @param outputObject 出参以及提示信息的返回值对象 */ @Override @@ -955,7 +956,7 @@ public class ExamServiceImpl implements ExamService { /** * 获取试卷题目信息用来生成html页面 * - * @param inputObject 入参以及用户信息等获取对象 + * @param inputObject 入参以及用户信息等获取对象 * @param outputObject 出参以及提示信息的返回值对象 */ @Override @@ -988,7 +989,7 @@ public class ExamServiceImpl implements ExamService { /** * 删除试卷 * - * @param inputObject 入参以及用户信息等获取对象 + * @param inputObject 入参以及用户信息等获取对象 * @param outputObject 出参以及提示信息的返回值对象 */ @Override @@ -1002,7 +1003,7 @@ public class ExamServiceImpl implements ExamService { /** * 分析报告试卷 * - * @param inputObject 入参以及用户信息等获取对象 + * @param inputObject 入参以及用户信息等获取对象 * @param outputObject 出参以及提示信息的返回值对象 */ @Override @@ -1018,7 +1019,6 @@ public class ExamServiceImpl implements ExamService { getQuestionOptionListMation(question); getQuestionOptionReportListMation(question); } - outputObject.setBean(surveyMation); outputObject.setBeans(questions); outputObject.settotal(1); @@ -1217,7 +1217,7 @@ public class ExamServiceImpl implements ExamService { /** * 复制试卷 * - * @param inputObject 入参以及用户信息等获取对象 + * @param inputObject 入参以及用户信息等获取对象 * @param outputObject 出参以及提示信息的返回值对象 */ @Override @@ -1284,7 +1284,7 @@ public class ExamServiceImpl implements ExamService { } } else if (quType.equals(QuType.BIGQU.getActionName())) { } else if (quType.equals(QuType.CHENRADIO.getActionName()) || quType.equals(QuType.CHENCHECKBOX.getActionName()) || quType.equals(QuType.CHENSCORE.getActionName()) - || quType.equals(QuType.CHENFBK.getActionName()) || quType.equals(QuType.COMPCHENRADIO.getActionName())) {// 矩阵单选，矩阵多选，矩阵填空题，复合矩阵单选 + || quType.equals(QuType.CHENFBK.getActionName()) || quType.equals(QuType.COMPCHENRADIO.getActionName())) {// 矩阵单选，矩阵多选，矩阵填空题，复合矩阵单选 List> questionChenRows = examDao.queryQuestionChenRowListByCopyId(question);//获取行选项 List> questionChenColumns = examDao.queryQuestionChenColumnListByCopyId(question);//获取列选项 for (Map questionChenRow : questionChenRows) { @@ -1337,7 +1337,7 @@ public class ExamServiceImpl implements ExamService { /** * 判断此试卷当前的状态 * - * @param inputObject 入参以及用户信息等获取对象 + * @param inputObject 入参以及用户信息等获取对象 * @param outputObject 出参以及提示信息的返回值对象 */ @Override @@ -1353,7 +1353,7 @@ public class ExamServiceImpl implements ExamService { /** * 用户回答试卷 * - * @param inputObject 入参以及用户信息等获取对象 + * @param inputObject 入参以及用户信息等获取对象 * @param outputObject 出参以及提示信息的返回值对象 */ @Override @@ -2238,7 +2238,7 @@ public class ExamServiceImpl implements ExamService { /** * 手动结束试卷 * - * @param inputObject 入参以及用户信息等获取对象 + * @param inputObject 入参以及用户信息等获取对象 * @param outputObject 出参以及提示信息的返回值对象 */ @Override @@ -2341,7 +2341,7 @@ public class ExamServiceImpl implements ExamService { /** * 获取答卷详情信息 * - * @param inputObject 入参以及用户信息等获取对象 + * @param inputObject 入参以及用户信息等获取对象 * @param outputObject 出参以及提示信息的返回值对象 */ @Override @@ -2385,7 +2385,7 @@ public class ExamServiceImpl implements ExamService { /** * 批阅试卷时获取答卷信息 * - * @param inputObject 入参以及用户信息等获取对象 + * @param inputObject 入参以及用户信息等获取对象 * @param outputObject 出参以及提示信息的返回值对象 */ @Override @@ -2421,7 +2421,7 @@ public class ExamServiceImpl implements ExamService { /** * 批阅试卷提交答卷结果 * - * @param inputObject 入参以及用户信息等获取对象 + * @param inputObject 入参以及用户信息等获取对象 * @param outputObject 出参以及提示信息的返回值对象 */ @Override @@ -2465,7 +2465,7 @@ public class ExamServiceImpl implements ExamService { /** * 获取试卷详情信息 * - * @param inputObject 入参以及用户信息等获取对象 + * @param inputObject 入参以及用户信息等获取对象 * @param outputObject 出参以及提示信息的返回值对象 */ @Override @@ -2484,7 +2484,7 @@ public class ExamServiceImpl implements ExamService { } } for (Map question : questions) { - question.put("pageNo", pageNo); + question.put("F", pageNo); getQuestionOptionListMation(question); // 知识点数量回显 String knowledgeIds = question.containsKey("knowledgeIds") ? question.get("knowledgeIds").toString() : ","; @@ -2509,7 +2509,7 @@ public class ExamServiceImpl implements ExamService { /** * 获取试卷答题情况信息 * - * @param inputObject 入参以及用户信息等获取对象 + * @param inputObject 入参以及用户信息等获取对象 * @param outputObject 出参以及提示信息的返回值对象 */ @Override @@ -2524,7 +2524,7 @@ public class ExamServiceImpl implements ExamService { /** * 获取试卷详情信息以及阅卷人信息 * - * @param inputObject 入参以及用户信息等获取对象 + * @param inputObject 入参以及用户信息等获取对象 * @param outputObject 出参以及提示信息的返回值对象 */ @Override @@ -2546,7 +2546,7 @@ public class ExamServiceImpl implements ExamService { /** * 修改阅卷人信息 * - * @param inputObject 入参以及用户信息等获取对象 + * @param inputObject 入参以及用户信息等获取对象 * @param outputObject 出参以及提示信息的返回值对象 */ @Override diff --git a/skyeye-school/school-exam/src/main/java/com/skyeye/exam/examquchckbox/service/ExamQuCheckboxService.java b/skyeye-school/school-exam/src/main/java/com/skyeye/exam/examquchckbox/service/ExamQuCheckboxService.java index 0273d63c..a6a32404 100644 --- a/skyeye-school/school-exam/src/main/java/com/skyeye/exam/examquchckbox/service/ExamQuCheckboxService.java +++ b/skyeye-school/school-exam/src/main/java/com/skyeye/exam/examquchckbox/service/ExamQuCheckboxService.java @@ -14,5 +14,7 @@ public interface ExamQuCheckboxService extends SkyeyeBusinessService selectQuChenbox(String copyFromId); + // void queryExamQuCheckboxListById(InputObject inputObject, OutputObject outputObject); } diff --git a/skyeye-school/school-exam/src/main/java/com/skyeye/exam/examquchckbox/service/impl/ExamQuCheckboxServiceImpl.java b/skyeye-school/school-exam/src/main/java/com/skyeye/exam/examquchckbox/service/impl/ExamQuCheckboxServiceImpl.java index 132da44b..f121e8a1 100644 --- a/skyeye-school/school-exam/src/main/java/com/skyeye/exam/examquchckbox/service/impl/ExamQuCheckboxServiceImpl.java +++ b/skyeye-school/school-exam/src/main/java/com/skyeye/exam/examquchckbox/service/impl/ExamQuCheckboxServiceImpl.java @@ -103,4 +103,12 @@ public class ExamQuCheckboxServiceImpl extends SkyeyeBusinessServiceImpl selectQuChenbox(String copyFromId) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq(MybatisPlusUtil.toColumns(ExamQuCheckbox::getQuId),copyFromId); + queryWrapper.eq(MybatisPlusUtil.toColumns(ExamQuCheckbox::getVisibility),CommonNumConstants.NUM_ONE); + return list(queryWrapper); + } } diff --git a/skyeye-school/school-exam/src/main/java/com/skyeye/exam/examquchencolumn/service/ExamQuChenColumnService.java b/skyeye-school/school-exam/src/main/java/com/skyeye/exam/examquchencolumn/service/ExamQuChenColumnService.java index ff371526..d6d88f63 100644 --- a/skyeye-school/school-exam/src/main/java/com/skyeye/exam/examquchencolumn/service/ExamQuChenColumnService.java +++ b/skyeye-school/school-exam/src/main/java/com/skyeye/exam/examquchencolumn/service/ExamQuChenColumnService.java @@ -15,4 +15,6 @@ public interface ExamQuChenColumnService extends SkyeyeBusinessService selectQuChenColumn(String copyFromId); } diff --git a/skyeye-school/school-exam/src/main/java/com/skyeye/exam/examquchencolumn/service/impl/ExamQuChenColumnServiceImpl.java b/skyeye-school/school-exam/src/main/java/com/skyeye/exam/examquchencolumn/service/impl/ExamQuChenColumnServiceImpl.java index 3646d64a..507adbdc 100644 --- a/skyeye-school/school-exam/src/main/java/com/skyeye/exam/examquchencolumn/service/impl/ExamQuChenColumnServiceImpl.java +++ b/skyeye-school/school-exam/src/main/java/com/skyeye/exam/examquchencolumn/service/impl/ExamQuChenColumnServiceImpl.java @@ -104,7 +104,7 @@ public class ExamQuChenColumnServiceImpl extends SkyeyeBusinessServiceImpl updateWrapper = new UpdateWrapper<>(); - updateWrapper.eq(MybatisPlusUtil.toColumns(ExamQuChenColumn::getId),id); + updateWrapper.eq(MybatisPlusUtil.toColumns(ExamQuChenColumn::getId), id); updateWrapper.set(MybatisPlusUtil.toColumns(ExamQuChenColumn::getVisibility), CommonNumConstants.NUM_ZERO); update(updateWrapper); } @@ -126,7 +126,15 @@ public class ExamQuChenColumnServiceImpl extends SkyeyeBusinessServiceImpl updateWrapper = new UpdateWrapper<>(); - updateWrapper.eq(MybatisPlusUtil.toColumns(ExamQuChenColumn::getQuId),quId); + updateWrapper.eq(MybatisPlusUtil.toColumns(ExamQuChenColumn::getQuId), quId); update(updateWrapper); } + + @Override + public List selectQuChenColumn(String copyFromId) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq(MybatisPlusUtil.toColumns(ExamQuChenColumn::getQuId), copyFromId); + queryWrapper.eq(MybatisPlusUtil.toColumns(ExamQuChenColumn::getVisibility), CommonNumConstants.NUM_ONE); + return list(queryWrapper); + } } diff --git a/skyeye-school/school-exam/src/main/java/com/skyeye/exam/examquchenrow/service/ExamQuChenRowService.java b/skyeye-school/school-exam/src/main/java/com/skyeye/exam/examquchenrow/service/ExamQuChenRowService.java index 2d78d6e9..f1745081 100644 --- a/skyeye-school/school-exam/src/main/java/com/skyeye/exam/examquchenrow/service/ExamQuChenRowService.java +++ b/skyeye-school/school-exam/src/main/java/com/skyeye/exam/examquchenrow/service/ExamQuChenRowService.java @@ -19,4 +19,6 @@ public interface ExamQuChenRowService extends SkyeyeBusinessService selectQuChenRow(String copyFromId); } diff --git a/skyeye-school/school-exam/src/main/java/com/skyeye/exam/examquchenrow/service/impl/ExamQuChenRowServiceImpl.java b/skyeye-school/school-exam/src/main/java/com/skyeye/exam/examquchenrow/service/impl/ExamQuChenRowServiceImpl.java index bac4864d..8c49b113 100644 --- a/skyeye-school/school-exam/src/main/java/com/skyeye/exam/examquchenrow/service/impl/ExamQuChenRowServiceImpl.java +++ b/skyeye-school/school-exam/src/main/java/com/skyeye/exam/examquchenrow/service/impl/ExamQuChenRowServiceImpl.java @@ -9,7 +9,6 @@ import com.skyeye.common.util.mybatisplus.MybatisPlusUtil; import com.skyeye.exam.examquchenrow.dao.ExamQuChenRowDao; import com.skyeye.exam.examquchenrow.entity.ExamQuChenRow; import com.skyeye.exam.examquchenrow.service.ExamQuChenRowService; -import org.apache.ibatis.annotations.Update; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -21,6 +20,7 @@ public class ExamQuChenRowServiceImpl extends SkyeyeBusinessServiceImpl quRow, String userId) { createEntity(quRow, userId); @@ -32,17 +32,17 @@ public class ExamQuChenRowServiceImpl extends SkyeyeBusinessServiceImpl QueryExamQuChenRowList(String quId){ + public QueryWrapper QueryExamQuChenRowList(String quId) { QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq(MybatisPlusUtil.toColumns(ExamQuChenRow::getQuId),quId); + queryWrapper.eq(MybatisPlusUtil.toColumns(ExamQuChenRow::getQuId), quId); return queryWrapper; } @Override public int QueryvisibilityInRow(String quId, String createId) { QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq(MybatisPlusUtil.toColumns(ExamQuChenRow::getQuId),quId); - queryWrapper.eq(MybatisPlusUtil.toColumns(ExamQuChenRow::getCreateId),createId); + queryWrapper.eq(MybatisPlusUtil.toColumns(ExamQuChenRow::getQuId), quId); + queryWrapper.eq(MybatisPlusUtil.toColumns(ExamQuChenRow::getCreateId), createId); ExamQuChenRow one = examQuChenRowService.getOne(queryWrapper); Integer visibility = one.getVisibility(); return visibility; @@ -51,8 +51,8 @@ public class ExamQuChenRowServiceImpl extends SkyeyeBusinessServiceImpl updateWrapper = new UpdateWrapper<>(); - updateWrapper.eq(MybatisPlusUtil.toColumns(ExamQuChenRow::getQuId),quId); - updateWrapper.eq(MybatisPlusUtil.toColumns(ExamQuChenRow::getCreateId),createId); + updateWrapper.eq(MybatisPlusUtil.toColumns(ExamQuChenRow::getQuId), quId); + updateWrapper.eq(MybatisPlusUtil.toColumns(ExamQuChenRow::getCreateId), createId); updateWrapper.set(MybatisPlusUtil.toColumns(ExamQuChenRow::getVisibility), CommonNumConstants.NUM_ZERO); update(updateWrapper); } @@ -60,7 +60,15 @@ public class ExamQuChenRowServiceImpl extends SkyeyeBusinessServiceImpl updateWrapper = new UpdateWrapper<>(); - updateWrapper.eq(MybatisPlusUtil.toColumns(ExamQuChenRow::getQuId),quId); + updateWrapper.eq(MybatisPlusUtil.toColumns(ExamQuChenRow::getQuId), quId); remove(updateWrapper); } + + @Override + public List selectQuChenRow(String copyFromId) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq(MybatisPlusUtil.toColumns(ExamQuChenRow::getQuId), copyFromId); + queryWrapper.eq(MybatisPlusUtil.toColumns(ExamQuChenRow::getVisibility), CommonNumConstants.NUM_ONE); + return list(queryWrapper); + } } diff --git a/skyeye-school/school-exam/src/main/java/com/skyeye/exam/examqumultfillblank/service/ExamQuMultiFillblankService.java b/skyeye-school/school-exam/src/main/java/com/skyeye/exam/examqumultfillblank/service/ExamQuMultiFillblankService.java index 37c71de8..e46d2ecd 100644 --- a/skyeye-school/school-exam/src/main/java/com/skyeye/exam/examqumultfillblank/service/ExamQuMultiFillblankService.java +++ b/skyeye-school/school-exam/src/main/java/com/skyeye/exam/examqumultfillblank/service/ExamQuMultiFillblankService.java @@ -14,4 +14,6 @@ public interface ExamQuMultiFillblankService extends SkyeyeBusinessService selectQuMultiFillblank(String copyFromId); } diff --git a/skyeye-school/school-exam/src/main/java/com/skyeye/exam/examqumultfillblank/service/impl/ExamQuMultiFillblankControllerImpl.java b/skyeye-school/school-exam/src/main/java/com/skyeye/exam/examqumultfillblank/service/impl/ExamQuMultiFillblankControllerImpl.java index c2fb7297..b302333f 100644 --- a/skyeye-school/school-exam/src/main/java/com/skyeye/exam/examqumultfillblank/service/impl/ExamQuMultiFillblankControllerImpl.java +++ b/skyeye-school/school-exam/src/main/java/com/skyeye/exam/examqumultfillblank/service/impl/ExamQuMultiFillblankControllerImpl.java @@ -89,4 +89,12 @@ public class ExamQuMultiFillblankControllerImpl extends SkyeyeBusinessServiceImp updateWrapper.eq(MybatisPlusUtil.toColumns(ExamQuMultiFillblank::getQuId),quId); remove(updateWrapper); } + + @Override + public List selectQuMultiFillblank(String copyFromId) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq(MybatisPlusUtil.toColumns(ExamQuMultiFillblank::getQuId),copyFromId); + queryWrapper.eq(MybatisPlusUtil.toColumns(ExamQuMultiFillblank::getVisibility),CommonNumConstants.NUM_ONE); + return list(queryWrapper); + } } diff --git a/skyeye-school/school-exam/src/main/java/com/skyeye/exam/examquorderby/service/ExamQuOrderbyService.java b/skyeye-school/school-exam/src/main/java/com/skyeye/exam/examquorderby/service/ExamQuOrderbyService.java index c8a2da1e..bb07b962 100644 --- a/skyeye-school/school-exam/src/main/java/com/skyeye/exam/examquorderby/service/ExamQuOrderbyService.java +++ b/skyeye-school/school-exam/src/main/java/com/skyeye/exam/examquorderby/service/ExamQuOrderbyService.java @@ -14,4 +14,6 @@ public interface ExamQuOrderbyService extends SkyeyeBusinessService selectQuOrderby(String copyFromId); } diff --git a/skyeye-school/school-exam/src/main/java/com/skyeye/exam/examquorderby/service/impl/ExamQuOrderbyServiceImpl.java b/skyeye-school/school-exam/src/main/java/com/skyeye/exam/examquorderby/service/impl/ExamQuOrderbyServiceImpl.java index bbe72ffc..0af087e5 100644 --- a/skyeye-school/school-exam/src/main/java/com/skyeye/exam/examquorderby/service/impl/ExamQuOrderbyServiceImpl.java +++ b/skyeye-school/school-exam/src/main/java/com/skyeye/exam/examquorderby/service/impl/ExamQuOrderbyServiceImpl.java @@ -68,7 +68,7 @@ public class ExamQuOrderbyServiceImpl extends SkyeyeBusinessServiceImpl map = inputObject.getParams(); String id = map.get("id").toString(); UpdateWrapper updateWrapper = new UpdateWrapper<>(); - updateWrapper.eq(MybatisPlusUtil.toColumns(ExamQuOrderby::getId),id); + updateWrapper.eq(MybatisPlusUtil.toColumns(ExamQuOrderby::getId), id); updateWrapper.set(MybatisPlusUtil.toColumns(ExamQuOrderby::getVisibility), CommonNumConstants.NUM_ZERO); update(updateWrapper); } @@ -86,7 +86,15 @@ public class ExamQuOrderbyServiceImpl extends SkyeyeBusinessServiceImpl updateWrapper = new UpdateWrapper<>(); - updateWrapper.eq(MybatisPlusUtil.toColumns(ExamQuOrderby::getQuId),quId); + updateWrapper.eq(MybatisPlusUtil.toColumns(ExamQuOrderby::getQuId), quId); remove(updateWrapper); } + + @Override + public List selectQuOrderby(String copyFromId) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq(MybatisPlusUtil.toColumns(ExamQuOrderby::getQuId), copyFromId); + queryWrapper.eq(MybatisPlusUtil.toColumns(ExamQuOrderby::getVisibility), CommonNumConstants.NUM_ONE); + return list(queryWrapper); + } } diff --git a/skyeye-school/school-exam/src/main/java/com/skyeye/exam/examquradio/service/ExamQuRadioService.java b/skyeye-school/school-exam/src/main/java/com/skyeye/exam/examquradio/service/ExamQuRadioService.java index d23968b4..f712ac0b 100644 --- a/skyeye-school/school-exam/src/main/java/com/skyeye/exam/examquradio/service/ExamQuRadioService.java +++ b/skyeye-school/school-exam/src/main/java/com/skyeye/exam/examquradio/service/ExamQuRadioService.java @@ -21,4 +21,6 @@ public interface ExamQuRadioService extends SkyeyeBusinessService { void changeVisibility(InputObject inputObject, OutputObject outputObject); void removeByQuId(String quId); + + List selectQuRadio(String copyFromId); } diff --git a/skyeye-school/school-exam/src/main/java/com/skyeye/exam/examquradio/service/impl/ExamQuRadioServiceImpl.java b/skyeye-school/school-exam/src/main/java/com/skyeye/exam/examquradio/service/impl/ExamQuRadioServiceImpl.java index 70df750a..3668b5f5 100644 --- a/skyeye-school/school-exam/src/main/java/com/skyeye/exam/examquradio/service/impl/ExamQuRadioServiceImpl.java +++ b/skyeye-school/school-exam/src/main/java/com/skyeye/exam/examquradio/service/impl/ExamQuRadioServiceImpl.java @@ -106,5 +106,14 @@ public class ExamQuRadioServiceImpl extends SkyeyeBusinessServiceImpl selectQuRadio(String copyFromId) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq(MybatisPlusUtil.toColumns(ExamQuRadio::getQuId),copyFromId); + queryWrapper.eq(MybatisPlusUtil.toColumns(ExamQuRadio::getVisibility),CommonNumConstants.NUM_ONE); + List examQuRadioList = list(queryWrapper); + return examQuRadioList; + } + } diff --git a/skyeye-school/school-exam/src/main/java/com/skyeye/exam/examquscore/service/ExamQuScoreService.java b/skyeye-school/school-exam/src/main/java/com/skyeye/exam/examquscore/service/ExamQuScoreService.java index e1651b5c..c4dc5a28 100644 --- a/skyeye-school/school-exam/src/main/java/com/skyeye/exam/examquscore/service/ExamQuScoreService.java +++ b/skyeye-school/school-exam/src/main/java/com/skyeye/exam/examquscore/service/ExamQuScoreService.java @@ -19,5 +19,7 @@ public interface ExamQuScoreService extends SkyeyeBusinessService { void saveList(List list, String quId, String userId); void changeVisibility(InputObject inputObject, OutputObject outputObject); + + List selectQuScore(String copyFromId); } diff --git a/skyeye-school/school-exam/src/main/java/com/skyeye/exam/examquscore/service/impl/ExamQuScoreServiceImpl.java b/skyeye-school/school-exam/src/main/java/com/skyeye/exam/examquscore/service/impl/ExamQuScoreServiceImpl.java index fa6b2c03..d12639f4 100644 --- a/skyeye-school/school-exam/src/main/java/com/skyeye/exam/examquscore/service/impl/ExamQuScoreServiceImpl.java +++ b/skyeye-school/school-exam/src/main/java/com/skyeye/exam/examquscore/service/impl/ExamQuScoreServiceImpl.java @@ -76,7 +76,7 @@ public class ExamQuScoreServiceImpl extends SkyeyeBusinessServiceImpl map = inputObject.getParams(); String id = map.get("id").toString(); UpdateWrapper updateWrapper = new UpdateWrapper<>(); - updateWrapper.eq(MybatisPlusUtil.toColumns(ExamQuScore::getId),id); + updateWrapper.eq(MybatisPlusUtil.toColumns(ExamQuScore::getId), id); updateWrapper.set(MybatisPlusUtil.toColumns(ExamQuScore::getVisibility), CommonNumConstants.NUM_ZERO); update(updateWrapper); } + @Override + public List selectQuScore(String copyFromId) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq(MybatisPlusUtil.toColumns(ExamQuScore::getQuId), copyFromId); + queryWrapper.eq(MybatisPlusUtil.toColumns(ExamQuScore::getVisibility), CommonNumConstants.NUM_ONE); + return list(queryWrapper); + } + } diff --git a/skyeye-school/school-exam/src/main/java/com/skyeye/exam/examsurveyanswer/service/ExamSurveyAnswerService.java b/skyeye-school/school-exam/src/main/java/com/skyeye/exam/examsurveyanswer/service/ExamSurveyAnswerService.java index 55e6dff9..c4fa65fb 100644 --- a/skyeye-school/school-exam/src/main/java/com/skyeye/exam/examsurveyanswer/service/ExamSurveyAnswerService.java +++ b/skyeye-school/school-exam/src/main/java/com/skyeye/exam/examsurveyanswer/service/ExamSurveyAnswerService.java @@ -5,6 +5,8 @@ import com.skyeye.common.object.InputObject; import com.skyeye.common.object.OutputObject; import com.skyeye.exam.examsurveyanswer.entity.ExamSurveyAnswer; +import java.util.List; + /** * @ClassName: ExamSurveyAnswerService * @Description: 试卷回答信息表管理服务接口层 @@ -17,4 +19,6 @@ public interface ExamSurveyAnswerService extends SkyeyeBusinessService querySurveyAnswer(String surveyId, String answerId, String userId); } diff --git a/skyeye-school/school-exam/src/main/java/com/skyeye/exam/examsurveyanswer/service/impl/ExamSurveyAnswerServiceImpl.java b/skyeye-school/school-exam/src/main/java/com/skyeye/exam/examsurveyanswer/service/impl/ExamSurveyAnswerServiceImpl.java index d696d298..872c1133 100644 --- a/skyeye-school/school-exam/src/main/java/com/skyeye/exam/examsurveyanswer/service/impl/ExamSurveyAnswerServiceImpl.java +++ b/skyeye-school/school-exam/src/main/java/com/skyeye/exam/examsurveyanswer/service/impl/ExamSurveyAnswerServiceImpl.java @@ -9,7 +9,6 @@ import com.skyeye.common.util.mybatisplus.MybatisPlusUtil; import com.skyeye.exam.examsurveyanswer.dao.ExamSurveyAnswerDao; import com.skyeye.exam.examsurveyanswer.entity.ExamSurveyAnswer; import com.skyeye.exam.examsurveyanswer.service.ExamSurveyAnswerService; -import com.skyeye.exception.CustomException; import org.springframework.stereotype.Service; import java.util.List; @@ -45,4 +44,13 @@ public class ExamSurveyAnswerServiceImpl extends SkyeyeBusinessServiceImpl querySurveyAnswer(String surveyId, String answerId, String userId) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq(MybatisPlusUtil.toColumns(ExamSurveyAnswer::getSurveyId), surveyId); + queryWrapper.eq(MybatisPlusUtil.toColumns(ExamSurveyAnswer::getId), answerId); + queryWrapper.eq(MybatisPlusUtil.toColumns(ExamSurveyAnswer::getCreateId), userId); + return list(queryWrapper); + } } diff --git a/skyeye-school/school-exam/src/main/java/com/skyeye/exam/examsurveydirectory/controller/ExamSurveyDirectoryController.java b/skyeye-school/school-exam/src/main/java/com/skyeye/exam/examsurveydirectory/controller/ExamSurveyDirectoryController.java index 0dfafe28..e9e70754 100644 --- a/skyeye-school/school-exam/src/main/java/com/skyeye/exam/examsurveydirectory/controller/ExamSurveyDirectoryController.java +++ b/skyeye-school/school-exam/src/main/java/com/skyeye/exam/examsurveydirectory/controller/ExamSurveyDirectoryController.java @@ -121,4 +121,19 @@ public class ExamSurveyDirectoryController { public void takeExam(InputObject inputObject, OutputObject outputObject) { examSurveyDirectoryService.takeExam(inputObject, outputObject); } + + /** + * 手动结束试卷 + * + * @param inputObject 入参以及用户信息等获取对象 + * @param outputObject 出参以及提示信息的返回值对象 + */ + @ApiOperation(id = "updateExamMationEndById", value = "手动结束试卷", method = "POST", allUse = "1") + @ApiImplicitParams({ + @ApiImplicitParam(id = "id", name = "id", value = "试卷id",required = "required")}) + @RequestMapping("/post/ExamSurveyDirectoryController/updateExamMationEndById") + public void updateExamMationEndById(InputObject inputObject, OutputObject outputObject) { + examSurveyDirectoryService.updateExamMationEndById(inputObject, outputObject); + } + } diff --git a/skyeye-school/school-exam/src/main/java/com/skyeye/exam/examsurveydirectory/service/ExamSurveyDirectoryService.java b/skyeye-school/school-exam/src/main/java/com/skyeye/exam/examsurveydirectory/service/ExamSurveyDirectoryService.java index c09963e1..5246424d 100644 --- a/skyeye-school/school-exam/src/main/java/com/skyeye/exam/examsurveydirectory/service/ExamSurveyDirectoryService.java +++ b/skyeye-school/school-exam/src/main/java/com/skyeye/exam/examsurveydirectory/service/ExamSurveyDirectoryService.java @@ -5,6 +5,8 @@ import com.skyeye.common.object.InputObject; import com.skyeye.common.object.OutputObject; import com.skyeye.exam.examsurveydirectory.entity.ExamSurveyDirectory; +import java.util.List; + /** * @ClassName: ExamSurveyDirectoryService * @Description: 试卷管理服务接口层 @@ -22,4 +24,6 @@ public interface ExamSurveyDirectoryService extends SkyeyeBusinessService map = inputObject.getParams(); - String quId = map.get("id").toString();//试卷id + String examDirectoryId = map.get("id").toString();//试卷id String userId = InputObject.getLogParamsStatic().get("id").toString(); String surveyId = ToolUtil.getSurFaceId(); examSurveyDirectories.setId(surveyId); @@ -149,17 +150,15 @@ public class ExamSurveyDirectoryServiceImpl extends SkyeyeBusinessServiceImpl questionList = Collections.singletonList(questionDao.selectById(quId)); + List questionList = questionService.queryQuestionMationCopyById(examDirectoryId); for (Question question : questionList) { - question.setCopyFromId(quId); + question.setCopyFromId(question.getId()); question.setId(ToolUtil.getSurFaceId()); question.setCreateTime(DateUtil.getTimeAndToString()); question.setBelongId(surveyId); questionService.copyQuestionListMation(question); } -// questionService.createEntity(questions, userId); - - + questionService.createEntity(questionList, StrUtil.EMPTY); } @Override @@ -190,4 +189,26 @@ public class ExamSurveyDirectoryServiceImpl extends SkyeyeBusinessServiceImpl map = inputObject.getParams(); + String examSurveyDirectoryId = map.get("id").toString(); + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq(MybatisPlusUtil.toColumns(ExamSurveyDirectory::getId), examSurveyDirectoryId); + ExamSurveyDirectory examSurveyDirectory = getOne(queryWrapper); + if (examSurveyDirectory != null && ObjUtil.isNotEmpty(examSurveyDirectory)) { + if (examSurveyDirectory.getSurveyState().equals(CommonNumConstants.NUM_ONE)) { + String realEndTime = DateUtil.getTimeAndToString(); + UpdateWrapper updateWrapper = new UpdateWrapper<>(); + updateWrapper.eq(MybatisPlusUtil.toColumns(ExamSurveyDirectory::getId), examSurveyDirectoryId); + updateWrapper.set(MybatisPlusUtil.toColumns(ExamSurveyDirectory::getRealEndTime), realEndTime); + updateWrapper.set(MybatisPlusUtil.toColumns(ExamSurveyDirectory::getSurveyState), CommonNumConstants.NUM_TWO); + updateWrapper.set(MybatisPlusUtil.toColumns(ExamSurveyDirectory::getEndType), CommonNumConstants.NUM_ONE); + update(updateWrapper); + } + } + else { + throw new CustomException("该试卷信息不存在!"); + } + } } diff --git a/skyeye-school/school-exam/src/main/resources/mapper/exam/SysEveUserStaffDao.xml b/skyeye-school/school-exam/src/main/resources/mapper/exam/SysEveUserStaffDao.xml index 4e8a62f0..36759b21 100644 --- a/skyeye-school/school-exam/src/main/resources/mapper/exam/SysEveUserStaffDao.xml +++ b/skyeye-school/school-exam/src/main/resources/mapper/exam/SysEveUserStaffDao.xml @@ -1182,37 +1182,37 @@