dzx преди 1 година
родител
ревизия
24b72001db

+ 10 - 0
src/main/java/com/xjrsoft/module/assessment/controller/AssessmentPlanAnswerController.java

@@ -51,6 +51,16 @@ public class AssessmentPlanAnswerController {
         return RT.ok(pageOutput);
     }
 
+    @GetMapping(value = "/result-page")
+    @ApiOperation(value="考核计划答题列表-学生端(分页)")
+    @SaCheckPermission("assessmenttemplateplan:detail")
+    public RT<PageOutput<AssessmentPlanAnswerStudentPageVo>> resultPage(@Valid AssessmentPlanAnswerPageDto dto){
+        dto.setStudentUserId(StpUtil.getLoginIdAsLong());
+        Page<AssessmentPlanAnswerStudentPageVo> page = planService.getStudentPage(new Page<>(dto.getLimit(), dto.getSize()), dto);
+        PageOutput<AssessmentPlanAnswerStudentPageVo> pageOutput = ConventPage.getPageOutput(page, AssessmentPlanAnswerStudentPageVo.class);
+        return RT.ok(pageOutput);
+    }
+
     @GetMapping(value = "/teacher-page")
     @ApiOperation(value="考核计划答题列表-教师端(分页)")
     @SaCheckPermission("assessmenttemplateplan:detail")

+ 1 - 1
src/main/java/com/xjrsoft/module/assessment/dto/AssessmentPlanAnswerSubmitDto.java

@@ -23,6 +23,6 @@ public class AssessmentPlanAnswerSubmitDto implements Serializable {
     private Long questionId;
 
     @ApiModelProperty("状态(0:未发布 1:已发布)")
-    private Long answerId;
+    private String answerId;
 
 }

+ 1 - 1
src/main/java/com/xjrsoft/module/assessment/entity/AssessmentPlanAnswerResult.java

@@ -81,7 +81,7 @@ public class AssessmentPlanAnswerResult implements Serializable {
      * 选项id(assessment_plan_question[category=3的id])
      */
     @ApiModelProperty("选项id(assessment_plan_question[category=3的id])")
-    private Long answerId;
+    private String answerId;
     /**
     * 考核计划id(assessment_template_plan)
     */

+ 1 - 1
src/main/resources/sqlScript/20210328_sql.sql

@@ -235,7 +235,7 @@ CREATE TABLE `assessment_plan_answer_result` (
   `enabled_mark` INT DEFAULT NULL,
   `student_user_id` BIGINT DEFAULT NULL COMMENT '学生id',
   `question_id` BIGINT DEFAULT NULL COMMENT '选项id(assessment_plan_question[category=2的id])',
-  `answer_id` BIGINT DEFAULT NULL COMMENT '选项id(assessment_plan_question[category=3的id])',
+  `answer_id` varchar(40) DEFAULT NULL COMMENT '选项id(assessment_plan_question[category=3的id])',
   `assessment_template_plan_id` BIGINT DEFAULT NULL COMMENT '考核计划id(assessment_template_plan)',
   PRIMARY KEY (`id`) USING BTREE
 ) ENGINE=INNODB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='考核答题结果';