''

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

@@ -12,6 +12,7 @@ import com.miaxis.common.utils.poi.ExcelUtil;
 import com.miaxis.question.domain.QuestionCollection;
 import com.miaxis.question.dto.QuestionCollectionDTO;
 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;
@@ -45,8 +46,10 @@ public class QuestionCollectionController extends BaseController{
             @ApiImplicitParam(name = "pageNum",value = "当前页码" ,dataType = "int", paramType = "query", required = false),
             @ApiImplicitParam(name = "pageSize",value = "每页数据量" , dataType = "int", paramType = "query", required = false),
     })
-    public ResponsePageInfo<QuestionCollection> list(@ModelAttribute QuestionCollection questionCollection){
+    public ResponsePageInfo<QuestionCollection> list(){
         startPage();
+        QuestionCollection questionCollection = new QuestionCollection();
+        questionCollection.setUserId(SecurityUtils.getLoginUser().getStudent().getId());
         List<QuestionCollection> list = questionCollectionService.selectQuestionCollectionList(questionCollection);
         return toResponsePageInfo(list);
     }
@@ -111,14 +114,16 @@ public class QuestionCollectionController extends BaseController{
     @Log(title = "collection", businessType = BusinessTypeEnum.UPDATE)
     @PutMapping
     @ApiOperation("修改collection")
-    public Response<Integer> edit(@RequestBody QuestionCollection questionCollection){
+    public Response<Integer> edit(@RequestBody QuestionCollectionDTO questionCollectionDTO){
+        QuestionCollection questionCollection = new QuestionCollection();
+        BeanUtils.copyProperties(questionCollectionDTO,questionCollection);
+        questionCollection.setUserId(SecurityUtils.getLoginUser().getStudent().getId());
         return toResponse(questionCollectionService.updateById(questionCollection) ? 1 : 0);
     }
 
     /**
      * 删除collection
      */
-//    @PreAuthorize("@ss.hasPermi('question:collection:remove')")
     @Log(title = "collection", businessType = BusinessTypeEnum.DELETE)
 	@DeleteMapping("/{ids}")
     @ApiOperation("删除collection")
@@ -126,8 +131,6 @@ public class QuestionCollectionController extends BaseController{
             @ApiParam(name = "ids", value = "collectionids参数", required = true)
             @PathVariable Long[] ids
     ){
-//        questionCollectionService.removeByIds(Arrays.asList(ids));
-//        return Response.success();
         return toResponse(questionCollectionService.removeByIds(Arrays.asList(ids)) ? 1 : 0);
     }
 

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

@@ -55,8 +55,10 @@ public class QuestionWrongController extends BaseController{
             @ApiImplicitParam(name = "pageNum",value = "当前页码" ,dataType = "int", paramType = "query", required = false),
             @ApiImplicitParam(name = "pageSize",value = "每页数据量" , dataType = "int", paramType = "query", required = false),
     })
-    public ResponsePageInfo<QuestionWrong> list(@ModelAttribute QuestionWrong questionWrong){
+    public ResponsePageInfo<QuestionWrong> list(){
         startPage();
+        QuestionWrong questionWrong = new QuestionWrong();
+        questionWrong.setUserId(SecurityUtils.getLoginUser().getStudent().getId());
         List<QuestionWrong> list = questionWrongService.selectQuestionWrongList(questionWrong);
         return toResponsePageInfo(list);
     }

jkt-admin/src/main/java/com/miaxis/app/controller/score/ScoreInfoController.java

@@ -43,8 +43,10 @@ public class ScoreInfoController extends BaseController{
             @ApiImplicitParam(name = "pageNum",value = "当前页码" ,dataType = "int", paramType = "query", required = false),
             @ApiImplicitParam(name = "pageSize",value = "每页数据量" , dataType = "int", paramType = "query", required = false),
     })
-    public ResponsePageInfo<ScoreInfo> list(@ModelAttribute ScoreInfo scoreInfo){
+    public ResponsePageInfo<ScoreInfo> list(){
         startPage();
+        ScoreInfo scoreInfo = new ScoreInfo();
+        scoreInfo.setUserId(SecurityUtils.getLoginUser().getStudent().getId());
         List<ScoreInfo> list = scoreInfoService.selectScoreInfoList(scoreInfo);
         return toResponsePageInfo(list);
     }

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

@@ -1,6 +1,6 @@
 package com.miaxis.question.dto;
 
-import com.miaxis.common.core.domain.BaseBusinessEntity;
+
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -13,11 +13,14 @@ import lombok.Data;
 @Data
 public class QuestionCollectionDTO {
 
+    private static final long serialVersionUID = 1L;
+
 
 
 
     /** 题目ID */
-    @ApiModelProperty(value = "题目id")
+
+    @ApiModelProperty(value = "题目ID")
     private Long questionId;
 
 

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

@@ -1,6 +1,5 @@
 package com.miaxis.question.dto;
 
-import com.miaxis.common.core.domain.BaseBusinessEntity;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -15,8 +14,12 @@ public class QuestionWrongDTO {
 
 
 
+
+    private static final long serialVersionUID = 1L;
+
+
     /** 题目ID */
-    @ApiModelProperty(value = "题目id")
+    @ApiModelProperty(value = "题目ID")
     private Long questionId;
 
 }

jkt-service/src/main/java/com/miaxis/score/dto/ScoreInfoDTO.java

@@ -1,15 +1,8 @@
 package com.miaxis.score.dto;
 
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.miaxis.common.annotation.Excel;
 import com.miaxis.common.core.domain.BaseBusinessEntity;
-import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 
 /**
  * 模拟考成绩对象 score_info
@@ -26,11 +19,11 @@ public class ScoreInfoDTO extends BaseBusinessEntity{
 //    private Long userId;
 
     /** 考试车型 */
-    @ApiModelProperty(value = "考试车型")
+    @ApiModelProperty(value = "考试车型（小车、客车、货车、摩托车）")
     private String type;
 
     /** 考试科目 */
-    @ApiModelProperty(value = "考试科目")
+    @ApiModelProperty(value = "考试科目（科目一、科目二、科目三、科目四）")
     private String kskm;
 
     /** 分数 */