车型字段修改成String

jkt-admin/src/main/java/com/miaxis/app/controller/question/QuestionCollectionController.java

@@ -4,20 +4,16 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.miaxis.common.annotation.Log;
 import com.miaxis.common.constant.Constants;
 import com.miaxis.common.core.controller.BaseController;
-import com.miaxis.common.core.domain.BaseBusinessEntity;
 import com.miaxis.common.core.domain.Response;
 import com.miaxis.common.core.page.ResponsePageInfo;
 import com.miaxis.common.enums.BusinessTypeEnum;
 import com.miaxis.common.exception.CustomException;
 import com.miaxis.common.utils.SecurityUtils;
-import com.miaxis.common.utils.poi.ExcelUtil;
 import com.miaxis.question.domain.QuestionCollection;
 import com.miaxis.question.dto.QuestionCollectionDTO;
 import com.miaxis.question.dto.QuestionCollectionListDTO;
 import com.miaxis.question.service.IQuestionCollectionService;
-import com.miaxis.score.domain.ScoreInfo;
 import io.swagger.annotations.*;
-import org.aspectj.weaver.patterns.TypePatternQuestions;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;

jkt-service/src/main/java/com/miaxis/question/domain/QuestionCollection.java

@@ -52,5 +52,5 @@ public class QuestionCollection extends BaseBusinessEntity{
     @Excel(name = "车型")
     @TableField("car_type")
     @ApiModelProperty(value = "车型")
-    private Long carType;
+    private String carType;
 }

jkt-service/src/main/java/com/miaxis/question/domain/QuestionWrong.java

@@ -52,7 +52,7 @@ public class QuestionWrong extends BaseBusinessEntity{
     @Excel(name = "车型")
     @TableField("car_type")
     @ApiModelProperty(value = "车型")
-    private Long carType;
+    private String carType;
 
 
 }

jkt-service/src/main/java/com/miaxis/question/dto/QuestionCollectionDTO.java

@@ -29,6 +29,6 @@ public class QuestionCollectionDTO {
 
     /** 车型 */
     @ApiModelProperty(value = "车型",required=true)
-    private Long carType;
+    private String carType;
 
 }

jkt-service/src/main/java/com/miaxis/question/dto/QuestionCollectionListDTO.java

@@ -25,4 +25,11 @@ public class QuestionCollectionListDTO extends BaseBusinessEntity {
     @ApiModelProperty(value = "题目ID",hidden = true)
     private Long questionId;
 
+    /** 科目 */
+    @ApiModelProperty(value = "科目",required=true)
+    private Long km;
+
+    /** 车型 */
+    @ApiModelProperty(value = "车型",required=true)
+    private String carType;
 }

jkt-service/src/main/java/com/miaxis/question/dto/QuestionWrongDTO.java

@@ -28,6 +28,6 @@ public class QuestionWrongDTO {
 
     /** 车型 */
     @ApiModelProperty(value = "车型",required=true)
-    private Long carType;
+    private String carType;
 
 }

jkt-service/src/main/java/com/miaxis/question/dto/QuestionWrongListDTO.java

@@ -20,6 +20,13 @@ public class QuestionWrongListDTO extends BaseBusinessEntity {
     @ApiModelProperty(value = "题目ID",hidden = true)
     private Long questionId;
 
+    /** 科目 */
+    @ApiModelProperty(value = "科目",required=true)
+    private Long km;
+
+    /** 车型 */
+    @ApiModelProperty(value = "车型",required=true)
+    private String carType;