From 38c044b1ee4c066bd35a748b423a1f12ae4289aa Mon Sep 17 00:00:00 2001
From: shijie <648688341@qq.com>
Date: Fri, 21 Aug 2020 15:58:25 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E6=9F=A5=E8=AF=A2=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=EF=BC=8C=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E6=89=93war=E5=8C=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                              |  8 ++++++++
 src/main/java/com/msdw/tms/TmsApplication.java       |  8 +++++++-
 .../java/com/msdw/tms/entity/QuestionsEntity.java    |  2 +-
 .../tms/entity/request/QuestionsQueryRequest.java    |  9 +++++----
 .../msdw/tms/service/impl/QuestionsServiceImpl.java  | 12 ++++++------
 5 files changed, 27 insertions(+), 12 deletions(-)

diff --git a/pom.xml b/pom.xml
index ce557e1..5d3a89c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,6 +14,7 @@
     <name>tms</name>
     <description>测评管理系统</description>
 
+    <packaging>war</packaging>
     <properties>
         <java.version>1.8</java.version>
     </properties>
@@ -39,6 +40,13 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-tomcat</artifactId>
+            <!--打包的时候可以不用包进去，别的设施会提供。事实上该依赖理论上可以参与编译，测试，运行等周期。
+                相当于compile，但是打包阶段做了exclude操作-->
+            <scope>provided</scope>
+        </dependency>
 
         <dependency>
             <groupId>com.baomidou</groupId>
diff --git a/src/main/java/com/msdw/tms/TmsApplication.java b/src/main/java/com/msdw/tms/TmsApplication.java
index 33869c2..4bf070b 100644
--- a/src/main/java/com/msdw/tms/TmsApplication.java
+++ b/src/main/java/com/msdw/tms/TmsApplication.java
@@ -2,12 +2,18 @@ package com.msdw.tms;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.builder.SpringApplicationBuilder;
+import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
 
 @SpringBootApplication
-public class TmsApplication {
+public class TmsApplication extends SpringBootServletInitializer {
 
     public static void main(String[] args) {
         SpringApplication.run(TmsApplication.class, args);
     }
 
+    @Override
+    protected SpringApplicationBuilder configure(SpringApplicationBuilder builder) {
+        return builder.sources(TmsApplication.class);
+    }
 }
diff --git a/src/main/java/com/msdw/tms/entity/QuestionsEntity.java b/src/main/java/com/msdw/tms/entity/QuestionsEntity.java
index fd56112..03600ef 100644
--- a/src/main/java/com/msdw/tms/entity/QuestionsEntity.java
+++ b/src/main/java/com/msdw/tms/entity/QuestionsEntity.java
@@ -23,7 +23,7 @@ public class QuestionsEntity implements Serializable {
 	@TableId
 	private Integer id;
 	/**
-	 * 题型号：用于区分是什么题型
+	 * 题型号：1、单选题，2、多选题，3、判断题
 	 */
 	private Integer questionTypeNo;
 	/**
diff --git a/src/main/java/com/msdw/tms/entity/request/QuestionsQueryRequest.java b/src/main/java/com/msdw/tms/entity/request/QuestionsQueryRequest.java
index 62f98bd..f73f4a3 100644
--- a/src/main/java/com/msdw/tms/entity/request/QuestionsQueryRequest.java
+++ b/src/main/java/com/msdw/tms/entity/request/QuestionsQueryRequest.java
@@ -19,10 +19,11 @@ public class QuestionsQueryRequest {
     @ApiModelProperty(value = "题干，问题描述", name = "questionStem", example = "世界上最大的哺乳动物是什么？")
     private String questionStem;
 
-    // /**
-    //  * 题型id
-    //  */
-    // private Integer questionType;
+    /**
+     * 题型id
+     */
+    @ApiModelProperty(value = "题型号：1、单选题，2、多选题，3、判断题", name = "questionTypeNo", example = "1")
+    private Integer questionTypeNo;
     // /**
     //  * 参考答案
     //  */
diff --git a/src/main/java/com/msdw/tms/service/impl/QuestionsServiceImpl.java b/src/main/java/com/msdw/tms/service/impl/QuestionsServiceImpl.java
index a2d7274..6ece057 100644
--- a/src/main/java/com/msdw/tms/service/impl/QuestionsServiceImpl.java
+++ b/src/main/java/com/msdw/tms/service/impl/QuestionsServiceImpl.java
@@ -70,14 +70,14 @@ public class QuestionsServiceImpl extends ServiceImpl<QuestionsDao, QuestionsEnt
             if (request.getQuestionStem() != null) {
                 queryWrapper.like("question_stem", request.getQuestionStem());
             }
-            //TODO 扩展搜索条件
             // 题型：判断题型是否为空，不为空则加入搜索条件
-            // if (questionsRequest.getQuestionType() != null) {
-            //     queryWrapper.eq("question_type", questionsRequest.getQuestionType());
-            // }
+            if (request.getQuestionTypeNo() != null) {
+                queryWrapper.eq("question_type_no", request.getQuestionTypeNo());
+            }
+            //TODO 扩展搜索条件
             // 修改时间：判断修改时间是否为空，不为空则加入搜索条件
-            // if (questionsRequest.getModifyTime() != null) {
-            //     queryWrapper.eq("modify_time", questionsRequest.getModifyTime());
+            // if (request.getModifyTime() != null) {
+            //     queryWrapper.eq("modify_time", request.getModifyTime());
             // }
         }