mirror of
https://github.com/weizhiqiang1995/erp-pro.git
synced 2025-03-06 12:23:44 +08:00
feat:题库题目的增删改查,试卷的增删改查,发布,复制试卷,是否可参加考试,手动结束试卷
This commit is contained in:
parent
bc6e0d3a1a
commit
c9c723f043
23 changed files with 303 additions and 152 deletions
|
@ -22,6 +22,8 @@ public interface QuestionService extends SkyeyeBusinessService<Question> {
|
|||
|
||||
void copyQuestionListMation(Question question);
|
||||
|
||||
List<Question> queryQuestionMationCopyById(String surveyCopyId);
|
||||
|
||||
// String saveQuestion(Question question, String id, String userId);
|
||||
|
||||
}
|
||||
|
|
|
@ -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<QuestionDao,
|
|||
@Autowired
|
||||
private ExamQuChenColumnService examQuChenColumnService;
|
||||
|
||||
@Autowired
|
||||
private ExamQuChenRowService examQuChenRowService;
|
||||
|
||||
@Autowired
|
||||
private ExamQuestionLogicService examQuestionLogicService;
|
||||
|
||||
@Autowired
|
||||
private ExamQuScoreService examQuScoreService;
|
||||
|
||||
@Override
|
||||
public void createPostpose(Question entity, String userId) {
|
||||
entity.setQuTag(1);
|
||||
|
@ -90,7 +93,7 @@ public class QuestionServiceImpl extends SkyeyeBusinessServiceImpl<QuestionDao,
|
|||
List<ExamQuestionLogic> questionLogic = entity.getQuestionLogic();
|
||||
if (!questionLogic.isEmpty()) {
|
||||
examQuestionLogicService.setLogics(quId, questionLogic, userId);
|
||||
}else {
|
||||
} else {
|
||||
throw new CustomException("请设置问题逻辑");
|
||||
}
|
||||
List<ExamQuRadio> radioTd = entity.getRadioTd();
|
||||
|
@ -177,9 +180,9 @@ public class QuestionServiceImpl extends SkyeyeBusinessServiceImpl<QuestionDao,
|
|||
} else if (quType == QuType.ORDERQU.getIndex()) {
|
||||
examQuOrderbyService.removeByQuId(quId);
|
||||
} else if (quType == QuType.CHENRADIO.getIndex() ||
|
||||
quType == QuType.CHENFBK.getIndex() ||
|
||||
quType == QuType.CHENCHECKBOX.getIndex() ||
|
||||
quType == QuType.COMPCHENRADIO.getIndex()) {
|
||||
quType == QuType.CHENFBK.getIndex() ||
|
||||
quType == QuType.CHENCHECKBOX.getIndex() ||
|
||||
quType == QuType.COMPCHENRADIO.getIndex()) {
|
||||
examQuChenColumnService.removeByQuId(quId);
|
||||
}
|
||||
}
|
||||
|
@ -192,67 +195,90 @@ public class QuestionServiceImpl extends SkyeyeBusinessServiceImpl<QuestionDao,
|
|||
return questionList;
|
||||
}
|
||||
|
||||
@Autowired
|
||||
private ExamQuRadioDao examQuRadioDao;
|
||||
@Autowired
|
||||
private ExamQuCheckboxDao examQuCheckboxDao;
|
||||
@Autowired
|
||||
private ExamQuMultiFillblankDao examQuMultiFillblankDao;
|
||||
@Autowired
|
||||
private ExamQuChenRowDao examQuChenRowDao;
|
||||
@Autowired
|
||||
private ExamQuChenColumnDao examQuChenColumnDao;
|
||||
@Override
|
||||
public void copyQuestionListMation(Question question) {
|
||||
String quType = QuType.getActionName(Integer.parseInt(question.getQuType().toString()));
|
||||
if (quType.equals(QuType.RADIO.getActionName()) ||quType.equals(QuType.COMPRADIO.getActionName())){
|
||||
ExamQuRadio examQuRadio = examQuRadioService.selectById(question.getCopyFromId());
|
||||
examQuRadio.setId(ToolUtil.getSurFaceId());
|
||||
examQuRadio.setCreateTime(DateUtil.getTimeAndToString());
|
||||
examQuRadio.setQuId(question.getId());
|
||||
if (examQuRadio != null) {
|
||||
examQuRadioDao.insert(examQuRadio);
|
||||
if (quType.equals(QuType.RADIO.getActionName()) || quType.equals(QuType.COMPRADIO.getActionName())) {
|
||||
List<ExamQuRadio> 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<ExamQuCheckbox> 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<ExamQuMultiFillblank> 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<ExamQuChenRow> examQuChenRowList = examQuChenRowService.selectQuChenRow(question.getCopyFromId());
|
||||
List<ExamQuChenColumn> 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<ExamQuScore> 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<ExamQuOrderby> 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<Question> queryQuestionMationCopyById(String surveyCopyId) {
|
||||
QueryWrapper<Question> 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);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -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<Map<String, Object>> questionChenRow = examDao.queryQuestionChenRowListByQuestionId(question);//获取行选项
|
||||
List<Map<String, Object>> questionChenColumn = examDao.queryQuestionChenColumnListByQuestionId(question);//获取列选项
|
||||
for (Map<String, Object> 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<Map<String, Object>> questionChenRows = examDao.queryQuestionChenRowListByCopyId(question);//获取行选项
|
||||
List<Map<String, Object>> questionChenColumns = examDao.queryQuestionChenColumnListByCopyId(question);//获取列选项
|
||||
for (Map<String, Object> 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<String, Object> 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
|
||||
|
|
|
@ -14,5 +14,7 @@ public interface ExamQuCheckboxService extends SkyeyeBusinessService<ExamQuCheck
|
|||
|
||||
void removeByQuId(String quId);
|
||||
|
||||
List<ExamQuCheckbox> selectQuChenbox(String copyFromId);
|
||||
|
||||
// void queryExamQuCheckboxListById(InputObject inputObject, OutputObject outputObject);
|
||||
}
|
||||
|
|
|
@ -103,4 +103,12 @@ public class ExamQuCheckboxServiceImpl extends SkyeyeBusinessServiceImpl<ExamQuC
|
|||
updateWrapper.eq(MybatisPlusUtil.toColumns(ExamQuCheckbox::getQuId),quId);
|
||||
remove(updateWrapper);
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<ExamQuCheckbox> selectQuChenbox(String copyFromId) {
|
||||
QueryWrapper<ExamQuCheckbox> queryWrapper = new QueryWrapper<>();
|
||||
queryWrapper.eq(MybatisPlusUtil.toColumns(ExamQuCheckbox::getQuId),copyFromId);
|
||||
queryWrapper.eq(MybatisPlusUtil.toColumns(ExamQuCheckbox::getVisibility),CommonNumConstants.NUM_ONE);
|
||||
return list(queryWrapper);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -15,4 +15,6 @@ public interface ExamQuChenColumnService extends SkyeyeBusinessService<ExamQuChe
|
|||
void changeVisibility(InputObject inputObject, OutputObject outputObject);
|
||||
|
||||
void removeByQuId(String quId);
|
||||
|
||||
List<ExamQuChenColumn> selectQuChenColumn(String copyFromId);
|
||||
}
|
||||
|
|
|
@ -104,7 +104,7 @@ public class ExamQuChenColumnServiceImpl extends SkyeyeBusinessServiceImpl<ExamQ
|
|||
String quId = entity.getQuId();
|
||||
int queryvisibility = examQuChenRowService.QueryvisibilityInRow(quId, createId);
|
||||
Integer visibility = entity.getVisibility();
|
||||
if (visibility == 1 && queryvisibility == 1){
|
||||
if (visibility == 1 && queryvisibility == 1) {
|
||||
throw new CustomException("该选项已显示,请先隐藏再删除");
|
||||
}
|
||||
}
|
||||
|
@ -115,9 +115,9 @@ public class ExamQuChenColumnServiceImpl extends SkyeyeBusinessServiceImpl<ExamQ
|
|||
String id = map.get("id").toString();
|
||||
String quId = map.get("quId").toString();
|
||||
String createId = map.get("createId").toString();
|
||||
examQuChenRowService.changeVisibility(quId,createId);
|
||||
examQuChenRowService.changeVisibility(quId, createId);
|
||||
UpdateWrapper<ExamQuChenColumn> 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<ExamQ
|
|||
public void removeByQuId(String quId) {
|
||||
examQuChenRowService.removeByQuId(quId);
|
||||
UpdateWrapper<ExamQuChenColumn> updateWrapper = new UpdateWrapper<>();
|
||||
updateWrapper.eq(MybatisPlusUtil.toColumns(ExamQuChenColumn::getQuId),quId);
|
||||
updateWrapper.eq(MybatisPlusUtil.toColumns(ExamQuChenColumn::getQuId), quId);
|
||||
update(updateWrapper);
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<ExamQuChenColumn> selectQuChenColumn(String copyFromId) {
|
||||
QueryWrapper<ExamQuChenColumn> queryWrapper = new QueryWrapper<>();
|
||||
queryWrapper.eq(MybatisPlusUtil.toColumns(ExamQuChenColumn::getQuId), copyFromId);
|
||||
queryWrapper.eq(MybatisPlusUtil.toColumns(ExamQuChenColumn::getVisibility), CommonNumConstants.NUM_ONE);
|
||||
return list(queryWrapper);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -19,4 +19,6 @@ public interface ExamQuChenRowService extends SkyeyeBusinessService<ExamQuChenRo
|
|||
void changeVisibility(String quId, String createId);
|
||||
|
||||
void removeByQuId(String quId);
|
||||
|
||||
List<ExamQuChenRow> selectQuChenRow(String copyFromId);
|
||||
}
|
||||
|
|
|
@ -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<ExamQuCh
|
|||
|
||||
@Autowired
|
||||
private ExamQuChenRowService examQuChenRowService;
|
||||
|
||||
@Override
|
||||
public void saveRowEntity(List<ExamQuChenRow> quRow, String userId) {
|
||||
createEntity(quRow, userId);
|
||||
|
@ -32,17 +32,17 @@ public class ExamQuChenRowServiceImpl extends SkyeyeBusinessServiceImpl<ExamQuCh
|
|||
}
|
||||
|
||||
@Override
|
||||
public QueryWrapper<ExamQuChenRow> QueryExamQuChenRowList(String quId){
|
||||
public QueryWrapper<ExamQuChenRow> QueryExamQuChenRowList(String quId) {
|
||||
QueryWrapper<ExamQuChenRow> 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<ExamQuChenRow> 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<ExamQuCh
|
|||
@Override
|
||||
public void changeVisibility(String quId, String createId) {
|
||||
UpdateWrapper<ExamQuChenRow> 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<ExamQuCh
|
|||
@Override
|
||||
public void removeByQuId(String quId) {
|
||||
UpdateWrapper<ExamQuChenRow> updateWrapper = new UpdateWrapper<>();
|
||||
updateWrapper.eq(MybatisPlusUtil.toColumns(ExamQuChenRow::getQuId),quId);
|
||||
updateWrapper.eq(MybatisPlusUtil.toColumns(ExamQuChenRow::getQuId), quId);
|
||||
remove(updateWrapper);
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<ExamQuChenRow> selectQuChenRow(String copyFromId) {
|
||||
QueryWrapper<ExamQuChenRow> queryWrapper = new QueryWrapper<>();
|
||||
queryWrapper.eq(MybatisPlusUtil.toColumns(ExamQuChenRow::getQuId), copyFromId);
|
||||
queryWrapper.eq(MybatisPlusUtil.toColumns(ExamQuChenRow::getVisibility), CommonNumConstants.NUM_ONE);
|
||||
return list(queryWrapper);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -14,4 +14,6 @@ public interface ExamQuMultiFillblankService extends SkyeyeBusinessService<ExamQ
|
|||
void changeVisibility(InputObject inputObject, OutputObject outputObject);
|
||||
|
||||
void removeByQuId(String quId);
|
||||
|
||||
List<ExamQuMultiFillblank> selectQuMultiFillblank(String copyFromId);
|
||||
}
|
||||
|
|
|
@ -89,4 +89,12 @@ public class ExamQuMultiFillblankControllerImpl extends SkyeyeBusinessServiceImp
|
|||
updateWrapper.eq(MybatisPlusUtil.toColumns(ExamQuMultiFillblank::getQuId),quId);
|
||||
remove(updateWrapper);
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<ExamQuMultiFillblank> selectQuMultiFillblank(String copyFromId) {
|
||||
QueryWrapper<ExamQuMultiFillblank> queryWrapper = new QueryWrapper<>();
|
||||
queryWrapper.eq(MybatisPlusUtil.toColumns(ExamQuMultiFillblank::getQuId),copyFromId);
|
||||
queryWrapper.eq(MybatisPlusUtil.toColumns(ExamQuMultiFillblank::getVisibility),CommonNumConstants.NUM_ONE);
|
||||
return list(queryWrapper);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -14,4 +14,6 @@ public interface ExamQuOrderbyService extends SkyeyeBusinessService<ExamQuOrderb
|
|||
void changeVisibility(InputObject inputObject, OutputObject outputObject);
|
||||
|
||||
void removeByQuId(String quId);
|
||||
|
||||
List<ExamQuOrderby> selectQuOrderby(String copyFromId);
|
||||
}
|
||||
|
|
|
@ -68,7 +68,7 @@ public class ExamQuOrderbyServiceImpl extends SkyeyeBusinessServiceImpl<ExamQuOr
|
|||
@Override
|
||||
protected void deletePreExecution(ExamQuOrderby entity) {
|
||||
Integer visibility = entity.getVisibility();
|
||||
if (visibility == 1){
|
||||
if (visibility == 1) {
|
||||
throw new CustomException("该选项已显示,请先隐藏再删除");
|
||||
}
|
||||
}
|
||||
|
@ -78,7 +78,7 @@ public class ExamQuOrderbyServiceImpl extends SkyeyeBusinessServiceImpl<ExamQuOr
|
|||
Map<String, Object> map = inputObject.getParams();
|
||||
String id = map.get("id").toString();
|
||||
UpdateWrapper<ExamQuOrderby> 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<ExamQuOr
|
|||
@Override
|
||||
public void removeByQuId(String quId) {
|
||||
UpdateWrapper<ExamQuOrderby> updateWrapper = new UpdateWrapper<>();
|
||||
updateWrapper.eq(MybatisPlusUtil.toColumns(ExamQuOrderby::getQuId),quId);
|
||||
updateWrapper.eq(MybatisPlusUtil.toColumns(ExamQuOrderby::getQuId), quId);
|
||||
remove(updateWrapper);
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<ExamQuOrderby> selectQuOrderby(String copyFromId) {
|
||||
QueryWrapper<ExamQuOrderby> queryWrapper = new QueryWrapper<>();
|
||||
queryWrapper.eq(MybatisPlusUtil.toColumns(ExamQuOrderby::getQuId), copyFromId);
|
||||
queryWrapper.eq(MybatisPlusUtil.toColumns(ExamQuOrderby::getVisibility), CommonNumConstants.NUM_ONE);
|
||||
return list(queryWrapper);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -21,4 +21,6 @@ public interface ExamQuRadioService extends SkyeyeBusinessService<ExamQuRadio> {
|
|||
void changeVisibility(InputObject inputObject, OutputObject outputObject);
|
||||
|
||||
void removeByQuId(String quId);
|
||||
|
||||
List<ExamQuRadio> selectQuRadio(String copyFromId);
|
||||
}
|
||||
|
|
|
@ -106,5 +106,14 @@ public class ExamQuRadioServiceImpl extends SkyeyeBusinessServiceImpl<ExamQuRadi
|
|||
remove(updateWrapper);
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<ExamQuRadio> selectQuRadio(String copyFromId) {
|
||||
QueryWrapper<ExamQuRadio> queryWrapper = new QueryWrapper<>();
|
||||
queryWrapper.eq(MybatisPlusUtil.toColumns(ExamQuRadio::getQuId),copyFromId);
|
||||
queryWrapper.eq(MybatisPlusUtil.toColumns(ExamQuRadio::getVisibility),CommonNumConstants.NUM_ONE);
|
||||
List<ExamQuRadio> examQuRadioList = list(queryWrapper);
|
||||
return examQuRadioList;
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
|
|
@ -19,5 +19,7 @@ public interface ExamQuScoreService extends SkyeyeBusinessService<ExamQuScore> {
|
|||
void saveList(List<ExamQuScore> list, String quId, String userId);
|
||||
|
||||
void changeVisibility(InputObject inputObject, OutputObject outputObject);
|
||||
|
||||
List<ExamQuScore> selectQuScore(String copyFromId);
|
||||
}
|
||||
|
||||
|
|
|
@ -76,7 +76,7 @@ public class ExamQuScoreServiceImpl extends SkyeyeBusinessServiceImpl<ExamQuScor
|
|||
@Override
|
||||
protected void deletePreExecution(ExamQuScore entity) {
|
||||
Integer visibility = entity.getVisibility();
|
||||
if (visibility == 1){
|
||||
if (visibility == 1) {
|
||||
throw new CustomException("该选项已显示,请先隐藏再删除");
|
||||
}
|
||||
}
|
||||
|
@ -86,9 +86,17 @@ public class ExamQuScoreServiceImpl extends SkyeyeBusinessServiceImpl<ExamQuScor
|
|||
Map<String, Object> map = inputObject.getParams();
|
||||
String id = map.get("id").toString();
|
||||
UpdateWrapper<ExamQuScore> 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<ExamQuScore> selectQuScore(String copyFromId) {
|
||||
QueryWrapper<ExamQuScore> queryWrapper = new QueryWrapper<>();
|
||||
queryWrapper.eq(MybatisPlusUtil.toColumns(ExamQuScore::getQuId), copyFromId);
|
||||
queryWrapper.eq(MybatisPlusUtil.toColumns(ExamQuScore::getVisibility), CommonNumConstants.NUM_ONE);
|
||||
return list(queryWrapper);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -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<ExamSurve
|
|||
void queryMySurveyAnswerList(InputObject inputObject, OutputObject outputObject);
|
||||
|
||||
ExamSurveyAnswer queryWhetherExamIngByStuId(String userId, String id);
|
||||
|
||||
List<ExamSurveyAnswer> querySurveyAnswer(String surveyId, String answerId, String userId);
|
||||
}
|
||||
|
|
|
@ -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<ExamS
|
|||
ExamSurveyAnswer answer = getOne(queryWrapper);
|
||||
return answer;
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<ExamSurveyAnswer> querySurveyAnswer(String surveyId, String answerId, String userId) {
|
||||
QueryWrapper<ExamSurveyAnswer> 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);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -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<ExamSu
|
|||
ExamSurveyDirectory takeExam(InputObject inputObject, OutputObject outputObject);
|
||||
|
||||
void copyExamDirectory(InputObject inputObject, OutputObject outputObject);
|
||||
|
||||
void updateExamMationEndById(InputObject inputObject, OutputObject outputObject);
|
||||
}
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
package com.skyeye.exam.examsurveydirectory.service.impl;
|
||||
|
||||
import cn.hutool.core.io.unit.DataUnit;
|
||||
import cn.hutool.core.util.ObjUtil;
|
||||
import cn.hutool.core.util.StrUtil;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
|
||||
import com.skyeye.annotation.service.SkyeyeService;
|
||||
|
@ -12,6 +13,7 @@ import com.skyeye.common.object.OutputObject;
|
|||
import com.skyeye.common.util.DateUtil;
|
||||
import com.skyeye.common.util.ToolUtil;
|
||||
import com.skyeye.common.util.mybatisplus.MybatisPlusUtil;
|
||||
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;
|
||||
|
@ -27,7 +29,6 @@ import org.springframework.beans.factory.annotation.Autowired;
|
|||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
|
@ -141,7 +142,7 @@ public class ExamSurveyDirectoryServiceImpl extends SkyeyeBusinessServiceImpl<Ex
|
|||
public void copyExamDirectory(InputObject inputObject, OutputObject outputObject) {
|
||||
ExamSurveyDirectory examSurveyDirectories = new ExamSurveyDirectory();
|
||||
Map<String, Object> 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<Ex
|
|||
examSurveyDirectories.setSurveyModel(1);
|
||||
examSurveyDirectories.setCreateId(userId);
|
||||
examSurveyDirectories.setCreateTime(DateUtil.getTimeAndToString());
|
||||
List<Question> questionList = Collections.singletonList(questionDao.selectById(quId));
|
||||
List<Question> 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<Ex
|
|||
update(updateWrapper);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void updateExamMationEndById(InputObject inputObject, OutputObject outputObject) {
|
||||
Map<String, Object> map = inputObject.getParams();
|
||||
String examSurveyDirectoryId = map.get("id").toString();
|
||||
QueryWrapper<ExamSurveyDirectory> 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<ExamSurveyDirectory> 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("该试卷信息不存在!");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1182,37 +1182,37 @@
|
|||
|
||||
<select id="queryQuestionMationCopyById" parameterType="java.util.Map" resultType="java.util.Map">
|
||||
SELECT
|
||||
a.id,
|
||||
a.answer_input_row answerInputRow,
|
||||
a.answer_input_width answerInputWidth,
|
||||
a.belong_id belongId,
|
||||
a.cell_count cellCount,
|
||||
a.check_type checkType,
|
||||
a.contacts_attr contactsAttr,
|
||||
a.contacts_field contactsField,
|
||||
a.copy_from_id copyFromId,
|
||||
a.hv,
|
||||
a.order_by_id orderById,
|
||||
a.param_int01 paramInt01,
|
||||
a.param_int02 paramInt02,
|
||||
a.parent_qu_id parentQuId,
|
||||
a.qu_title quTitle,
|
||||
a.qu_tag quTag,
|
||||
a.qu_type quType,
|
||||
a.rand_order randOrder,
|
||||
a.tag,
|
||||
a.visibility,
|
||||
a.yesno_option yesnoOption,
|
||||
a.fraction
|
||||
a.id,
|
||||
a.answer_input_row answerInputRow,
|
||||
a.answer_input_width answerInputWidth,
|
||||
a.belong_id belongId,
|
||||
a.cell_count cellCount,
|
||||
a.check_type checkType,
|
||||
a.contacts_attr contactsAttr,
|
||||
a.contacts_field contactsField,
|
||||
a.copy_from_id copyFromId,
|
||||
a.hv,
|
||||
a.order_by_id orderById,
|
||||
a.param_int01 paramInt01,
|
||||
a.param_int02 paramInt02,
|
||||
a.parent_qu_id parentQuId,
|
||||
a.qu_title quTitle,
|
||||
a.qu_tag quTag,
|
||||
a.qu_type quType,
|
||||
a.rand_order randOrder,
|
||||
a.tag,
|
||||
a.visibility,
|
||||
a.yesno_option yesnoOption,
|
||||
a.fraction
|
||||
FROM
|
||||
exam_question a
|
||||
exam_question a
|
||||
WHERE
|
||||
a.belong_id = #{surveyCopyId}<!-- 所属试卷 -->
|
||||
a.belong_id = #{surveyCopyId}<!-- 所属试卷 -->
|
||||
AND a.tag = '2'<!-- 试卷的题 -->
|
||||
AND a.qu_tag != '2'<!-- 不是大题 -->
|
||||
AND a.visibility = '1'
|
||||
ORDER BY
|
||||
a.order_by_id ASC
|
||||
a.order_by_id ASC
|
||||
</select>
|
||||
|
||||
<insert id="addQuestionMationCopyByExamId" parameterType="java.util.Map">
|
||||
|
|
Loading…
Reference in a new issue