From 9cad9657501598be39ae4fde0fbcd39641f1e0c5 Mon Sep 17 00:00:00 2001 From: wanggeng <450292408@qq.com> Date: Fri, 27 May 2022 17:44:30 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E8=AF=95=E5=8D=B7=E8=AF=95?= =?UTF-8?q?=E9=A2=98=E5=9F=BA=E7=A1=80=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../question/PaperQuestionController.java | 27 +++++++ .../dao/paper/question/IPaperQuestionDao.java | 8 ++ .../question/PaperQuestionRandomSaveVO.java | 39 ++++++++++ .../paper/question/IPaperQuestionService.java | 16 ++++ .../impl/PaperQuestionServiceImpl.java | 78 +++++++++++++++++++ .../service/question/IQuestionService.java | 11 +++ .../question/impl/QuestionServiceImpl.java | 28 ++++++- .../paper/question/paper-question-mapper.xml | 43 +++++++++- .../main/resources/templates/paper/list.html | 14 ++-- .../templates/paper/question/list.html | 39 +++------- .../templates/paper/question/save-select.html | 62 ++------------- 11 files changed, 267 insertions(+), 98 deletions(-) create mode 100644 module-examine/src/main/java/ink/wgink/module/examine/pojo/vos/paper/question/PaperQuestionRandomSaveVO.java diff --git a/module-examine/src/main/java/ink/wgink/module/examine/controller/api/paper/question/PaperQuestionController.java b/module-examine/src/main/java/ink/wgink/module/examine/controller/api/paper/question/PaperQuestionController.java index f588e630..23cba8c7 100644 --- a/module-examine/src/main/java/ink/wgink/module/examine/controller/api/paper/question/PaperQuestionController.java +++ b/module-examine/src/main/java/ink/wgink/module/examine/controller/api/paper/question/PaperQuestionController.java @@ -1,11 +1,14 @@ package ink.wgink.module.examine.controller.api.paper.question; +import ink.wgink.annotation.CheckRequestBodyAnnotation; import ink.wgink.common.base.DefaultBaseController; import ink.wgink.exceptions.ParamsException; +import ink.wgink.exceptions.RemoveException; import ink.wgink.exceptions.SearchException; import ink.wgink.interfaces.consts.ISystemConstant; import ink.wgink.module.examine.pojo.dtos.paper.question.PaperQuestionDTO; import ink.wgink.module.examine.pojo.dtos.question.QuestionDTO; +import ink.wgink.module.examine.pojo.vos.paper.question.PaperQuestionRandomSaveVO; import ink.wgink.module.examine.service.paper.question.IPaperQuestionService; import ink.wgink.pojo.ListPage; import ink.wgink.pojo.result.ErrorResult; @@ -16,6 +19,7 @@ import io.swagger.annotations.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import java.util.Arrays; import java.util.List; import java.util.Map; @@ -48,6 +52,29 @@ public class PaperQuestionController extends DefaultBaseController { return new SuccessResult(); } + @ApiOperation(value = "随机保存试题", notes = "随机保存试题接口") + @ApiImplicitParams({ + @ApiImplicitParam(name = "paperId", value = "试卷ID", paramType = "path"), + }) + @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) + @PostMapping("save-random/paper-id/{paperId}") + @CheckRequestBodyAnnotation + public SuccessResult saveRandom(@PathVariable("paperId") String paperId, @RequestBody PaperQuestionRandomSaveVO paperQuestionRandomSaveVO) { + paperQuestionService.saveRandom(paperId, paperQuestionRandomSaveVO); + return new SuccessResult(); + } + + @ApiOperation(value = "删除试卷试题(id列表)", notes = "删除试卷试题(id列表)接口") + @ApiImplicitParams({ + @ApiImplicitParam(name = "ids", value = "ID列表，用下划线分隔", paramType = "path", example = "1_2_3") + }) + @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) + @DeleteMapping("delete/{ids}") + public SuccessResult delete(@PathVariable("ids") String ids) throws RemoveException { + paperQuestionService.delete(Arrays.asList(ids.split("\\_"))); + return new SuccessResult(); + } + @ApiOperation(value = "试卷试题列表", notes = "试卷试题列表接口") @ApiImplicitParams({ @ApiImplicitParam(name = "paperId", value = "试卷ID", paramType = "path"), diff --git a/module-examine/src/main/java/ink/wgink/module/examine/dao/paper/question/IPaperQuestionDao.java b/module-examine/src/main/java/ink/wgink/module/examine/dao/paper/question/IPaperQuestionDao.java index a760ee70..f95a1856 100644 --- a/module-examine/src/main/java/ink/wgink/module/examine/dao/paper/question/IPaperQuestionDao.java +++ b/module-examine/src/main/java/ink/wgink/module/examine/dao/paper/question/IPaperQuestionDao.java @@ -72,4 +72,12 @@ public interface IPaperQuestionDao extends IInitBaseTable { * @throws SearchException */ List listQuestion(Map params) throws SearchException; + + /** + * ID列表 + * + * @param params + * @return + */ + List listId(Map params); } diff --git a/module-examine/src/main/java/ink/wgink/module/examine/pojo/vos/paper/question/PaperQuestionRandomSaveVO.java b/module-examine/src/main/java/ink/wgink/module/examine/pojo/vos/paper/question/PaperQuestionRandomSaveVO.java new file mode 100644 index 00000000..0f264db3 --- /dev/null +++ b/module-examine/src/main/java/ink/wgink/module/examine/pojo/vos/paper/question/PaperQuestionRandomSaveVO.java @@ -0,0 +1,39 @@ +package ink.wgink.module.examine.pojo.vos.paper.question; + +import ink.wgink.annotation.CheckEmptyAnnotation; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +/** + * @ClassName: PaperQuestionRandomSaveVO + * @Description: 试卷试题随机保存 + * @Author: wanggeng + * @Date: 2022/5/26 15:43 + * @Version: 1.0 + */ +@ApiModel +public class PaperQuestionRandomSaveVO { + + @ApiModelProperty(name = "questionType", value = "") + @CheckEmptyAnnotation(name = "试题种类") + private String questionType; + @ApiModelProperty(name = "questionChoiceType", value = "") + @CheckEmptyAnnotation(name = "试题选择类型") + private String questionChoiceType; + + public String getQuestionType() { + return questionType == null ? "" : questionType.trim(); + } + + public void setQuestionType(String questionType) { + this.questionType = questionType; + } + + public String getQuestionChoiceType() { + return questionChoiceType == null ? "" : questionChoiceType.trim(); + } + + public void setQuestionChoiceType(String questionChoiceType) { + this.questionChoiceType = questionChoiceType; + } +} diff --git a/module-examine/src/main/java/ink/wgink/module/examine/service/paper/question/IPaperQuestionService.java b/module-examine/src/main/java/ink/wgink/module/examine/service/paper/question/IPaperQuestionService.java index 537d7533..a5d6ab87 100644 --- a/module-examine/src/main/java/ink/wgink/module/examine/service/paper/question/IPaperQuestionService.java +++ b/module-examine/src/main/java/ink/wgink/module/examine/service/paper/question/IPaperQuestionService.java @@ -2,6 +2,7 @@ package ink.wgink.module.examine.service.paper.question; import ink.wgink.module.examine.pojo.dtos.paper.question.PaperQuestionDTO; import ink.wgink.module.examine.pojo.dtos.question.QuestionDTO; +import ink.wgink.module.examine.pojo.vos.paper.question.PaperQuestionRandomSaveVO; import ink.wgink.pojo.ListPage; import ink.wgink.pojo.result.SuccessResultList; @@ -24,6 +25,21 @@ public interface IPaperQuestionService { */ void save(String paperId, List questionIds); + /** + * 随机保存 + * + * @param paperId + * @param paperQuestionRandomSaveVO + */ + void saveRandom(String paperId, PaperQuestionRandomSaveVO paperQuestionRandomSaveVO); + + /** + * 删除 + * + * @param paperQuestionIds + */ + void delete(List paperQuestionIds); + /** * 试卷试题列表 * diff --git a/module-examine/src/main/java/ink/wgink/module/examine/service/paper/question/impl/PaperQuestionServiceImpl.java b/module-examine/src/main/java/ink/wgink/module/examine/service/paper/question/impl/PaperQuestionServiceImpl.java index 8ad97379..1d42b5ab 100644 --- a/module-examine/src/main/java/ink/wgink/module/examine/service/paper/question/impl/PaperQuestionServiceImpl.java +++ b/module-examine/src/main/java/ink/wgink/module/examine/service/paper/question/impl/PaperQuestionServiceImpl.java @@ -1,12 +1,20 @@ package ink.wgink.module.examine.service.paper.question.impl; +import com.alibaba.druid.util.StringUtils; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import ink.wgink.common.base.DefaultBaseService; +import ink.wgink.exceptions.SaveException; import ink.wgink.module.examine.dao.paper.question.IPaperQuestionDao; +import ink.wgink.module.examine.enums.question.QuestionChoiceTypeEnum; +import ink.wgink.module.examine.enums.question.QuestionTypeEnum; +import ink.wgink.module.examine.pojo.dtos.paper.PaperDTO; import ink.wgink.module.examine.pojo.dtos.paper.question.PaperQuestionDTO; import ink.wgink.module.examine.pojo.dtos.question.QuestionDTO; +import ink.wgink.module.examine.pojo.vos.paper.question.PaperQuestionRandomSaveVO; +import ink.wgink.module.examine.service.paper.IPaperService; import ink.wgink.module.examine.service.paper.question.IPaperQuestionService; +import ink.wgink.module.examine.service.question.IQuestionService; import ink.wgink.pojo.ListPage; import ink.wgink.pojo.result.SuccessResultList; import ink.wgink.util.UUIDUtil; @@ -27,6 +35,10 @@ public class PaperQuestionServiceImpl extends DefaultBaseService implements IPap @Autowired private IPaperQuestionDao paperQuestionDao; + @Autowired + private IPaperService paperService; + @Autowired + private IQuestionService questionService; @Override public void save(String paperId, List questionIds) { @@ -40,6 +52,72 @@ public class PaperQuestionServiceImpl extends DefaultBaseService implements IPap } } + @Override + public void saveRandom(String paperId, PaperQuestionRandomSaveVO paperQuestionRandomSaveVO) { + PaperDTO paperDTO = paperService.getById(paperId); + QuestionTypeEnum questionTypeEnum = null; + QuestionChoiceTypeEnum questionChoiceTypeEnum = null; + int randomCount = 0; + // 单选 + if (StringUtils.equals(paperQuestionRandomSaveVO.getQuestionType(), QuestionTypeEnum.CHOICE.getValue()) && + StringUtils.equals(paperQuestionRandomSaveVO.getQuestionChoiceType(), QuestionChoiceTypeEnum.SINGLE.getValue())) { + questionTypeEnum = QuestionTypeEnum.CHOICE; + questionChoiceTypeEnum = QuestionChoiceTypeEnum.SINGLE; + randomCount = paperDTO.getChoiceSingleCount(); + } + // 多选 + if (StringUtils.equals(paperQuestionRandomSaveVO.getQuestionType(), QuestionTypeEnum.CHOICE.getValue()) && + StringUtils.equals(paperQuestionRandomSaveVO.getQuestionChoiceType(), QuestionChoiceTypeEnum.MULTIPLE.getValue())) { + questionTypeEnum = QuestionTypeEnum.CHOICE; + questionChoiceTypeEnum = QuestionChoiceTypeEnum.MULTIPLE; + randomCount = paperDTO.getChoiceMultipleCount(); + } + // 判断 + if (StringUtils.equals(paperQuestionRandomSaveVO.getQuestionType(), QuestionTypeEnum.TURE_OR_FALSE.getValue())) { + questionTypeEnum = QuestionTypeEnum.TURE_OR_FALSE; + randomCount = paperDTO.getTureOrFalseCount(); + } + // 填空 + if (StringUtils.equals(paperQuestionRandomSaveVO.getQuestionType(), QuestionTypeEnum.FILL_IN_THE_BLANKS.getValue())) { + questionTypeEnum = QuestionTypeEnum.FILL_IN_THE_BLANKS; + randomCount = paperDTO.getFillInTheBlanksCount(); + } + // 解答 + if (StringUtils.equals(paperQuestionRandomSaveVO.getQuestionType(), QuestionTypeEnum.ANSWER.getValue())) { + questionTypeEnum = QuestionTypeEnum.ANSWER; + randomCount = paperDTO.getAnswerCount(); + } + // 随机抽题 + List randomQuestionIds = questionService.listRandomIdByRandomCountAndTypeAndChoiceType(randomCount, questionTypeEnum, questionChoiceTypeEnum); + if (randomQuestionIds.isEmpty()) { + throw new SaveException("没有试题可以随机"); + } + + // 删除对应的试题 + Map params = getHashMap(6); + params.put("questionType", questionTypeEnum.getValue()); + params.put("questionChoiceType", questionChoiceTypeEnum == null ? null : questionChoiceTypeEnum.getValue()); + params.put("paperId", paperId); + List wantDeleteIds = paperQuestionDao.listId(params); + + if (!wantDeleteIds.isEmpty()) { + // 删除 + params.clear(); + params.put("paperQuestionIds", wantDeleteIds); + paperQuestionDao.delete(params); + } + + // 保存试题 + save(paperId, randomQuestionIds); + } + + @Override + public void delete(List paperQuestionIds) { + Map params = getHashMap(2); + params.put("paperQuestionIds", paperQuestionIds); + paperQuestionDao.delete(params); + } + @Override public List list(String paperId, Map params) { params = params == null ? getHashMap(0) : params; diff --git a/module-examine/src/main/java/ink/wgink/module/examine/service/question/IQuestionService.java b/module-examine/src/main/java/ink/wgink/module/examine/service/question/IQuestionService.java index ee4f0cc7..f99ed1db 100644 --- a/module-examine/src/main/java/ink/wgink/module/examine/service/question/IQuestionService.java +++ b/module-examine/src/main/java/ink/wgink/module/examine/service/question/IQuestionService.java @@ -2,6 +2,8 @@ package ink.wgink.module.examine.service.question; import ink.wgink.exceptions.RemoveException; import ink.wgink.exceptions.SearchException; +import ink.wgink.module.examine.enums.question.QuestionChoiceTypeEnum; +import ink.wgink.module.examine.enums.question.QuestionTypeEnum; import ink.wgink.module.examine.pojo.dtos.question.QuestionDTO; import ink.wgink.module.examine.pojo.vos.question.QuestionVO; import ink.wgink.pojo.ListPage; @@ -145,5 +147,14 @@ public interface IQuestionService { */ Integer count(Map params) throws SearchException; + /** + * 随机试题ID + * + * @param randomCount + * @param questionTypeEnum + * @param questionChoiceTypeEnum + * @return + */ + List listRandomIdByRandomCountAndTypeAndChoiceType(int randomCount, QuestionTypeEnum questionTypeEnum, QuestionChoiceTypeEnum questionChoiceTypeEnum); } \ No newline at end of file diff --git a/module-examine/src/main/java/ink/wgink/module/examine/service/question/impl/QuestionServiceImpl.java b/module-examine/src/main/java/ink/wgink/module/examine/service/question/impl/QuestionServiceImpl.java index 9264cb90..fc73be99 100644 --- a/module-examine/src/main/java/ink/wgink/module/examine/service/question/impl/QuestionServiceImpl.java +++ b/module-examine/src/main/java/ink/wgink/module/examine/service/question/impl/QuestionServiceImpl.java @@ -6,6 +6,7 @@ import ink.wgink.common.base.DefaultBaseService; import ink.wgink.exceptions.RemoveException; import ink.wgink.exceptions.SearchException; import ink.wgink.module.examine.dao.question.IQuestionDao; +import ink.wgink.module.examine.enums.question.QuestionChoiceTypeEnum; import ink.wgink.module.examine.enums.question.QuestionTypeEnum; import ink.wgink.module.examine.pojo.dtos.question.QuestionDTO; import ink.wgink.module.examine.pojo.dtos.question.QuestionOptionsDTO; @@ -24,9 +25,7 @@ import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.Arrays; -import java.util.List; -import java.util.Map; +import java.util.*; /** * @ClassName: QuestionServiceImpl @@ -243,6 +242,29 @@ public class QuestionServiceImpl extends DefaultBaseService implements IQuestion return count == null ? 0 : count; } + @Override + public List listRandomIdByRandomCountAndTypeAndChoiceType(int randomCount, QuestionTypeEnum questionTypeEnum, QuestionChoiceTypeEnum questionChoiceTypeEnum) { + Map params = getHashMap(4); + params.put("type", questionTypeEnum.getValue()); + params.put("choiceType", questionChoiceTypeEnum == null ? null : questionChoiceTypeEnum.getValue()); + List questionIds = questionDao.listIds(params); + // 试题数小于随机总数，返回全部试题ID + if (questionIds.size() <= randomCount) { + return questionIds; + } + Random random = new Random(System.currentTimeMillis()); + Map randomMap = new HashMap<>(randomCount * 2); + while (randomMap.size() < randomCount) { + int randomNumber = random.nextInt(questionIds.size()); + randomMap.put(randomNumber, questionIds.get(randomNumber)); + } + List randomQuestionIds = new ArrayList<>(); + for (Map.Entry kv : randomMap.entrySet()) { + randomQuestionIds.add(kv.getValue()); + } + return randomQuestionIds; + } + private List listPOByIds(List questionIds) { Map params = getHashMap(2); params.put("questionIds", questionIds); diff --git a/module-examine/src/main/resources/mybatis/mapper/paper/question/paper-question-mapper.xml b/module-examine/src/main/resources/mybatis/mapper/paper/question/paper-question-mapper.xml index 077a5078..11b41635 100644 --- a/module-examine/src/main/resources/mybatis/mapper/paper/question/paper-question-mapper.xml +++ b/module-examine/src/main/resources/mybatis/mapper/paper/question/paper-question-mapper.xml @@ -48,14 +48,14 @@ ) - + DELETE FROM exam_paper_question WHERE - paper_id IN - - #{paperIds[${index}]} + paper_question_id IN + + #{paperQuestionIds[${index}]} @@ -131,6 +131,10 @@ AND jt1.type = #{questionType} + + AND + jt1.choice_type = #{questionChoiceType} + ORDER BY @@ -186,6 +190,10 @@ AND t1.choice_type = #{choiceType} + + AND + t1.question_type = #{questionType} + AND t1.question_id IN @@ -224,4 +232,31 @@ + + + \ No newline at end of file diff --git a/module-examine/src/main/resources/templates/paper/list.html b/module-examine/src/main/resources/templates/paper/list.html index c0ac1a13..3808872d 100644 --- a/module-examine/src/main/resources/templates/paper/list.html +++ b/module-examine/src/main/resources/templates/paper/list.html @@ -279,9 +279,9 @@ } }); // 试卷考题 - function openPaperQuestion(title, questionType, data, count) { + function openPaperQuestion(title, questionType, questionChoiceType, data, count) { top.dialog.open({ - url: top.restAjax.path('route/paper/question/list?paperId={paperId}&questionType={questionType}&selectCount={count}', [data.paperId, questionType, count]), + url: top.restAjax.path('route/paper/question/list?paperId={paperId}&questionType={questionType}&questionChoiceType={questionChoiceType}&selectCount={count}', [data.paperId, questionType, questionChoiceType, count]), title: '【'+ title +'】试题列表', width: '1000px', height: '80%', @@ -292,15 +292,15 @@ var data = obj.data; var event = obj.event; if(event === 'choiceSingleEvent') { - openPaperQuestion('单选', 'choiceSingle', data, this.dataset.count); + openPaperQuestion('单选', 'choice', 'single', data, this.dataset.count); } else if(event === 'choiceMultipleEvent') { - openPaperQuestion('多选', 'choiceMultiple', data, this.dataset.count); + openPaperQuestion('多选', 'choice', 'multiple', data, this.dataset.count); } else if(event === 'tureOrFalseEvent') { - openPaperQuestion('判断', 'tureOrFalse', data, this.dataset.count); + openPaperQuestion('判断', 'tureOrFalse', '', data, this.dataset.count); } else if(event === 'fillInTheBlanksEvent') { - openPaperQuestion('填空', 'fillInTheBlanks', data, this.dataset.count); + openPaperQuestion('填空', 'fillInTheBlanks', '', data, this.dataset.count); } else if(event === 'answerEvent') { - openPaperQuestion('解答', 'answer', data, this.dataset.count); + openPaperQuestion('解答', 'answer', '', data, this.dataset.count); } }); }); diff --git a/module-examine/src/main/resources/templates/paper/question/list.html b/module-examine/src/main/resources/templates/paper/question/list.html index 2a912f76..01e17cb2 100644 --- a/module-examine/src/main/resources/templates/paper/question/list.html +++ b/module-examine/src/main/resources/templates/paper/question/list.html @@ -23,6 +23,7 @@ +
可添加题目量：0
@@ -62,9 +63,11 @@ var queryParams = top.restAjax.params(window.location.href); var paperId = queryParams.paperId; var questionType = queryParams.questionType; + var questionChoiceType = queryParams.questionChoiceType; var selectCount = queryParams.selectCount; var selectedCount = 0; - var tableUrl = 'api/paper/question/listpage/paper-id/{paperId}?questionType={questionType}'; + var canAddCount = 0; + var tableUrl = 'api/paper/question/listpage/paper-id/{paperId}?questionType={questionType}&questionChoiceType={questionChoiceType}'; function getDifficulty(num) { var result = ''; @@ -79,7 +82,7 @@ table.render({ elem: '#dataTable', id: 'dataTable', - url: top.restAjax.path(tableUrl, [paperId, questionType]), + url: top.restAjax.path(tableUrl, [paperId, questionType, questionChoiceType]), width: admin.screen() > 1 ? '100%' : '', height: $win.height() - 60, limit: 20, @@ -165,6 +168,8 @@ page: true, parseData: function(data) { selectedCount = data.total; + canAddCount = parseInt(selectCount) - parseInt(selectedCount); + $('#canAddCount').text(canAddCount); return { 'code': 0, 'msg': '', @@ -177,7 +182,6 @@ // 重载表格 function reloadTable(currentPage) { table.reload('dataTable', { - url: top.restAjax.path(tableUrl, [paperId, questionType]), where: { keywords: $('#keywords').val(), startTime: $('#startTime').val(), @@ -186,7 +190,6 @@ page: { curr: currentPage }, - height: $win.height() - 60, }); } // 删除 @@ -232,7 +235,7 @@ yes: function (index) { top.dialog.close(index); var layIndex; - top.restAjax.delete(top.restAjax.path('api/examinationpaperquestion/removeexaminationpaperquestion/{ids}', [ids]), {}, null, function (code, data) { + top.restAjax.delete(top.restAjax.path('api/paper/question/delete/{ids}', [ids]), {}, null, function (code, data) { top.dialog.msg(top.dataMessage.deleteSuccess, {time: 1000}); reloadTable(); }, function (code, data) { @@ -258,9 +261,9 @@ yes: function (index) { top.dialog.close(index); var layIndex; - top.restAjax.post(top.restAjax.path('api/examinationpaperquestion/saveexaminationpaperquestionrandom', []), { - paperId: paperId, - questionType: questionType + top.restAjax.post(top.restAjax.path('api/paper/question/save-random/paper-id/{paperId}', [paperId]), { + questionType: questionType, + questionChoiceType: questionChoiceType }, null, function (code, data) { top.dialog.msg('操作成功', {time: 1000}); reloadTable(); @@ -274,26 +277,8 @@ } }); } else if(layEvent === 'manualSaveEvent') { - var type; - var choiceType; - if(questionType === 'choiceSingle') { - type = 'choice'; - choiceType = 'single'; - } else if(questionType === 'choiceMultiple') { - type = 'choice'; - choiceType = 'multiple'; - } else if(questionType === 'tureOrFalse') { - type = 'tureOrFalse'; - choiceType = ''; - } else if(questionType === 'fillInTheBlanks') { - type = 'fillInTheBlanks'; - choiceType = ''; - } else if(questionType === 'answer') { - type = 'answer'; - choiceType = ''; - } top.dialog.open({ - url: top.restAjax.path('route/paper/question/save-select?paperId={paperId}&selectCount={selectCount}&type={type}&choiceType={choiceType}', [paperId, parseInt(selectCount - selectedCount), type, choiceType]), + url: top.restAjax.path('route/paper/question/save-select?paperId={paperId}&selectCount={selectCount}&questionType={type}&questionChoiceType={choiceType}', [paperId, canAddCount, questionType, questionChoiceType]), title: '选择试题', width: '75%', height: '80%', diff --git a/module-examine/src/main/resources/templates/paper/question/save-select.html b/module-examine/src/main/resources/templates/paper/question/save-select.html index 95f654d6..0fca27f0 100644 --- a/module-examine/src/main/resources/templates/paper/question/save-select.html +++ b/module-examine/src/main/resources/templates/paper/question/save-select.html @@ -20,22 +20,6 @@
-
- -
-
- +