From dc9612e102d076e3404d88ad7cb920c08b50ed7f Mon Sep 17 00:00:00 2001 From: flower Date: Thu, 20 Dec 2018 00:11:52 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A2=98=E7=9B=AE=E6=9B=B4=E6=96=B0=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E7=BC=96=E5=86=99=EF=BC=8C=E8=A1=A8=E5=8D=95=E9=AA=8C?= =?UTF-8?q?=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ExamQuestionController.java | 38 +++- .../exam/mapper/ExamQuestionItemMapper.java | 1 + .../service/IExamQuestionItemService.java | 3 +- .../exam/service/IExamQuestionService.java | 2 + .../impl/ExamQuestionItemServiceImpl.java | 7 + .../service/impl/ExamQuestionServiceImpl.java | 27 +++ .../mapper/exam/ExamQuestionItemMapper.xml | 10 +- .../exam/examQuestion/choiceUpdate.html | 206 ++++++++++++++++++ .../exam/examQuestion/examQuestion.html | 26 +-- .../exam/examQuestion/judgeUpdate.html | 192 ++++++++++++++++ .../exam/examQuestion/morechoiceUpdate.html | 206 ++++++++++++++++++ 11 files changed, 700 insertions(+), 18 deletions(-) create mode 100644 ruoyi-exam/src/main/resources/templates/exam/examQuestion/choiceUpdate.html create mode 100644 ruoyi-exam/src/main/resources/templates/exam/examQuestion/judgeUpdate.html create mode 100644 ruoyi-exam/src/main/resources/templates/exam/examQuestion/morechoiceUpdate.html diff --git a/ruoyi-exam/src/main/java/com/ruoyi/exam/controller/ExamQuestionController.java b/ruoyi-exam/src/main/java/com/ruoyi/exam/controller/ExamQuestionController.java index f7e462995..4a8257440 100644 --- a/ruoyi-exam/src/main/java/com/ruoyi/exam/controller/ExamQuestionController.java +++ b/ruoyi-exam/src/main/java/com/ruoyi/exam/controller/ExamQuestionController.java @@ -4,8 +4,12 @@ import java.util.ArrayList; import java.util.Enumeration; import java.util.List; +import cn.hutool.json.JSONArray; +import com.ruoyi.common.json.JSONObject; import com.ruoyi.exam.domain.ExamQuestionCategory; +import com.ruoyi.exam.domain.ExamQuestionItem; import com.ruoyi.exam.service.IExamQuestionCategoryService; +import com.ruoyi.exam.service.IExamQuestionItemService; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; @@ -38,6 +42,9 @@ public class ExamQuestionController extends BaseController @Autowired private IExamQuestionCategoryService examQuestionCategoryService; + + @Autowired + private IExamQuestionItemService examQuestionItemService; @RequiresPermissions("exam:examQuestion:view") @GetMapping() @@ -139,6 +146,18 @@ public class ExamQuestionController extends BaseController return toAjax(examQuestionService.insertQuestion(examQuestion,number,content)); } + + @RequiresPermissions("exam:examQuestion:edit") + @Log(title = "问题", businessType = BusinessType.INSERT) + @PostMapping("/update") + @ResponseBody + public AjaxResult update(ExamQuestion examQuestion,@RequestParam(value = "number", required = true) String[] number, + @RequestParam(value = "content", required = true) String[] content) + { + + return toAjax(examQuestionService.updateQuestion(examQuestion,number,content)); + } + /** * 修改问题 */ @@ -147,7 +166,21 @@ public class ExamQuestionController extends BaseController { ExamQuestion examQuestion = examQuestionService.selectExamQuestionById(id); mmap.put("examQuestion", examQuestion); - return prefix + "/edit"; + ExamQuestionItem examQuestionItem = new ExamQuestionItem(); + examQuestionItem.setExamQuestionId(id); + List examQuestionItems = examQuestionItemService.selectList(examQuestionItem); + JSONArray arr = new JSONArray(); + arr.addAll(examQuestionItems); + mmap.put("examQuestionItem", arr.toString()); + String s = ""; + if(examQuestion.getType().equals("1")){ + s= "/choiceUpdate"; + }else if(examQuestion.getType().equals("2")){ + s = "/morechoiceUpdate"; + }else{ + s = "/judgeUpdate"; + } + return prefix + s; } /** @@ -170,7 +203,8 @@ public class ExamQuestionController extends BaseController @PostMapping( "/remove") @ResponseBody public AjaxResult remove(String ids) - { + { + examQuestionItemService.deleteByQuestionIds(ids); return toAjax(examQuestionService.deleteExamQuestionByIds(ids)); } diff --git a/ruoyi-exam/src/main/java/com/ruoyi/exam/mapper/ExamQuestionItemMapper.java b/ruoyi-exam/src/main/java/com/ruoyi/exam/mapper/ExamQuestionItemMapper.java index d9f931a30..4dedeb556 100644 --- a/ruoyi-exam/src/main/java/com/ruoyi/exam/mapper/ExamQuestionItemMapper.java +++ b/ruoyi-exam/src/main/java/com/ruoyi/exam/mapper/ExamQuestionItemMapper.java @@ -60,4 +60,5 @@ public interface ExamQuestionItemMapper extends MyMapper */ public int deleteExamQuestionItemByIds(String[] ids); + void deleteByQuestionIds(String[] ids); } \ No newline at end of file diff --git a/ruoyi-exam/src/main/java/com/ruoyi/exam/service/IExamQuestionItemService.java b/ruoyi-exam/src/main/java/com/ruoyi/exam/service/IExamQuestionItemService.java index 23a345931..78fe22939 100644 --- a/ruoyi-exam/src/main/java/com/ruoyi/exam/service/IExamQuestionItemService.java +++ b/ruoyi-exam/src/main/java/com/ruoyi/exam/service/IExamQuestionItemService.java @@ -26,5 +26,6 @@ public interface IExamQuestionItemService extends AbstractBaseService selectExamQuestionItemList(ExamQuestionItem examQuestionItem); - + + void deleteByQuestionIds(String ids); } diff --git a/ruoyi-exam/src/main/java/com/ruoyi/exam/service/IExamQuestionService.java b/ruoyi-exam/src/main/java/com/ruoyi/exam/service/IExamQuestionService.java index a743aeefb..c8070081f 100644 --- a/ruoyi-exam/src/main/java/com/ruoyi/exam/service/IExamQuestionService.java +++ b/ruoyi-exam/src/main/java/com/ruoyi/exam/service/IExamQuestionService.java @@ -52,4 +52,6 @@ public interface IExamQuestionService extends AbstractBaseService public int deleteExamQuestionByIds(String ids); int insertQuestion(ExamQuestion examQuestion, String[] number, String[] content); + + int updateQuestion(ExamQuestion examQuestion, String[] number, String[] content); } diff --git a/ruoyi-exam/src/main/java/com/ruoyi/exam/service/impl/ExamQuestionItemServiceImpl.java b/ruoyi-exam/src/main/java/com/ruoyi/exam/service/impl/ExamQuestionItemServiceImpl.java index f0b445fd5..28d393709 100644 --- a/ruoyi-exam/src/main/java/com/ruoyi/exam/service/impl/ExamQuestionItemServiceImpl.java +++ b/ruoyi-exam/src/main/java/com/ruoyi/exam/service/impl/ExamQuestionItemServiceImpl.java @@ -32,6 +32,13 @@ public class ExamQuestionItemServiceImpl extends AbstractBaseServiceImpl select = examQuestionMapper.selectExamQuestionList(examQuestion); + String id = select.get(0).getId(); + examQuestionItemMapper.deleteByQuestionIds(new String[]{id}); + ExamQuestionItem examQuestionItem = new ExamQuestionItem(); + for (int i1 = 0; i1 < number.length; i1++) {examQuestionItem.setContent(content[i1]); + examQuestionItem.setNumber(number[i1]); + examQuestionItem.setExamQuestionId(select.get(0).getId()+""); + examQuestionItem.setCreateDate(date); + examQuestionItem.setCreateBy(ShiroUtils.getLoginName()); + examQuestionItemMapper.insertExamQuestionItem(examQuestionItem); + + + } + + + return i ; + + } + } diff --git a/ruoyi-exam/src/main/resources/mapper/exam/ExamQuestionItemMapper.xml b/ruoyi-exam/src/main/resources/mapper/exam/ExamQuestionItemMapper.xml index c0ec90260..0584c15c0 100644 --- a/ruoyi-exam/src/main/resources/mapper/exam/ExamQuestionItemMapper.xml +++ b/ruoyi-exam/src/main/resources/mapper/exam/ExamQuestionItemMapper.xml @@ -96,5 +96,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{id} - + + + + delete from exam_question_item where exam_question_id in + + #{id} + + + \ No newline at end of file diff --git a/ruoyi-exam/src/main/resources/templates/exam/examQuestion/choiceUpdate.html b/ruoyi-exam/src/main/resources/templates/exam/examQuestion/choiceUpdate.html new file mode 100644 index 000000000..001b7e38f --- /dev/null +++ b/ruoyi-exam/src/main/resources/templates/exam/examQuestion/choiceUpdate.html @@ -0,0 +1,206 @@ + + + + + +
+
+
+ + + + + + +
+ +
+
+ + + + + + + +
+ +
+ +
+
+ +
+
+ +
+
+ +
+ +
+ +
+
+ +
+
+ +
+
+ +
+ + +
+ + + + + + + + + +
+ +
+ +
+
+ +
+
+
+ + + diff --git a/ruoyi-exam/src/main/resources/templates/exam/examQuestion/examQuestion.html b/ruoyi-exam/src/main/resources/templates/exam/examQuestion/examQuestion.html index 1afe8c19c..0300b199a 100644 --- a/ruoyi-exam/src/main/resources/templates/exam/examQuestion/examQuestion.html +++ b/ruoyi-exam/src/main/resources/templates/exam/examQuestion/examQuestion.html @@ -78,9 +78,7 @@ shiro:hasPermission="exam:examQuestion:remove"> 删除 - - 导出 - +
@@ -93,6 +91,7 @@ + + diff --git a/ruoyi-exam/src/main/resources/templates/exam/examQuestion/morechoiceUpdate.html b/ruoyi-exam/src/main/resources/templates/exam/examQuestion/morechoiceUpdate.html new file mode 100644 index 000000000..76ae5c135 --- /dev/null +++ b/ruoyi-exam/src/main/resources/templates/exam/examQuestion/morechoiceUpdate.html @@ -0,0 +1,206 @@ + + + + + +
+
+
+ + + + + + +
+ +
+
+ + + + + + + +
+ +
+ +
+
+ +
+
+ +
+
+ +
+ +
+ +
+
+ +
+
+ +
+
+ +
+ + +
+ + + + + + + + + +
+ +
+ +
+
+ +
+
+
+ + +