From 809c7f485936759895f758dce781f64c9d9ccccd Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Fri, 16 Jul 2021 16:41:35 +0800
Subject: [PATCH] 选择题接口修改
---
src/main/java/org/springblade/modules/exam/controller/ExamSubjectChoicesController.java | 24 ++++++++++++++++++++++++
src/main/java/org/springblade/modules/exam/controller/ExamSubjectOptionController.java | 10 ++++++++++
src/main/java/org/springblade/modules/exam/mapper/ExamSubjectChoicesMapper.xml | 13 +++++--------
3 files changed, 39 insertions(+), 8 deletions(-)
diff --git a/src/main/java/org/springblade/modules/exam/controller/ExamSubjectChoicesController.java b/src/main/java/org/springblade/modules/exam/controller/ExamSubjectChoicesController.java
index d2d1fa5..23cde7f 100644
--- a/src/main/java/org/springblade/modules/exam/controller/ExamSubjectChoicesController.java
+++ b/src/main/java/org/springblade/modules/exam/controller/ExamSubjectChoicesController.java
@@ -1,18 +1,32 @@
package org.springblade.modules.exam.controller;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import lombok.AllArgsConstructor;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
+import org.springblade.core.secure.BladeUser;
import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.constant.BladeConstant;
import org.springblade.core.tool.utils.Func;
+import org.springblade.modules.dispatcher.entity.Dispatcher;
import org.springblade.modules.exam.entity.ExamSubjectChoices;
import org.springblade.modules.exam.service.ExamSubjectChoicesService;
import org.springblade.modules.exam.vo.ExamSubjectChoicesVO;
+import org.springblade.modules.jurisdiction.entity.Jurisdiction;
+import org.springblade.modules.jurisdiction.vo.JurisdictionVO;
+import org.springblade.modules.jurisdiction.wrapper.JurisdictionWrapper;
import org.springframework.web.bind.annotation.*;
+import springfox.documentation.annotations.ApiIgnore;
+
import java.util.Date;
+import java.util.List;
+import java.util.Map;
/**
* @author zhongrj
@@ -38,6 +52,16 @@
}
/**
+ * 分页
+ */
+ @GetMapping("/list")
+ public R<IPage<ExamSubjectChoices>> list(ExamSubjectChoices examSubjectChoices, Query query) {
+ IPage<ExamSubjectChoices> pages = examSubjectChoicesService.page(Condition.getPage(query), Condition.getQueryWrapper(examSubjectChoices));
+ return R.data(pages);
+ }
+
+
+ /**
* 新增
* @param examSubjectChoices 选择题信息对象
*/
diff --git a/src/main/java/org/springblade/modules/exam/controller/ExamSubjectOptionController.java b/src/main/java/org/springblade/modules/exam/controller/ExamSubjectOptionController.java
index d6b58b1..de879bf 100644
--- a/src/main/java/org/springblade/modules/exam/controller/ExamSubjectOptionController.java
+++ b/src/main/java/org/springblade/modules/exam/controller/ExamSubjectOptionController.java
@@ -8,6 +8,7 @@
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
+import org.springblade.modules.exam.entity.ExamSubjectChoices;
import org.springblade.modules.exam.entity.ExamSubjectOption;
import org.springblade.modules.exam.service.ExamSubjectOptionService;
import org.springblade.modules.exam.vo.ExamSubjectOptionVO;
@@ -39,6 +40,15 @@
}
/**
+ * 分页
+ */
+ @GetMapping("/list")
+ public R<IPage<ExamSubjectOption>> list(ExamSubjectOption examSubjectOption, Query query) {
+ IPage<ExamSubjectOption> pages = examSubjectOptionService.page(Condition.getPage(query), Condition.getQueryWrapper(examSubjectOption));
+ return R.data(pages);
+ }
+
+ /**
* 新增
* @param examSubjectOption 选择题选项信息对象
*/
diff --git a/src/main/java/org/springblade/modules/exam/mapper/ExamSubjectChoicesMapper.xml b/src/main/java/org/springblade/modules/exam/mapper/ExamSubjectChoicesMapper.xml
index babb7c0..73b194a 100644
--- a/src/main/java/org/springblade/modules/exam/mapper/ExamSubjectChoicesMapper.xml
+++ b/src/main/java/org/springblade/modules/exam/mapper/ExamSubjectChoicesMapper.xml
@@ -3,22 +3,19 @@
<mapper namespace="org.springblade.modules.exam.mapper.ExamSubjectChoicesMapper">
<!--选择题分页信息-->
- <select id="selectExamSubjectChoicesPage" resultMap="ExamSubjectChoicesInfoMap">
+ <select id="selectExamSubjectChoicesPage" resultType="org.springblade.modules.exam.vo.ExamSubjectChoicesVO">
SELECT
- esc.*,
- eso.id eso_id,eso.subject_choices_id,eso.option_name,eso.option_content,eso.creator,
- eso.create_date,eso.modifier,eso.modify_date,eso.del_flag,eso.application_code,eso.tenant_code
+ esc.*
FROM
exam_subject_choices esc
- left join
- exam_subject_option eso
- on
- esc.id = eso.subject_choices_id
WHERE
1=1
<if test="examSubjectChoices.subjectName!=null and examSubjectChoices.subjectName!=''">
and esc.subject_name like concat('%', #{examSubjectChoices.subjectName},'%')
</if>
+ <if test="examSubjectChoices.choicesType!=null and examSubjectChoices.choicesType!=''">
+ and choices_type = #{examSubjectChoices.choicesType}
+ </if>
</select>
--
Gitblit v1.9.3