Browse Source

详情接口中增加学生userId

dzx 1 year ago
parent
commit
770e505178

+ 0 - 8
src/main/java/com/xjrsoft/module/student/controller/StudentHonorsController.java

@@ -56,14 +56,6 @@ public class StudentHonorsController {
         return RT.ok(pageOutput);
     }
 
-    @GetMapping(value = "/mobile-page")
-    @ApiOperation(value="学生荣誉列表(分页)")
-    @SaCheckPermission("studenthonors:detail")
-    public RT<PageOutput<StudentHonorsPageVo>> mobilePage(@Valid StudentHonorsPageDto dto){
-        Page<StudentHonorsPageVo> page = studentHonorsService.getPage(new Page<>(dto.getLimit(), dto.getSize()), dto);
-        PageOutput<StudentHonorsPageVo> pageOutput = ConventPage.getPageOutput(page, StudentHonorsPageVo.class);
-        return RT.ok(pageOutput);
-    }
 
     @GetMapping(value = "/tree")
     @ApiOperation(value = "学生荣誉列表(树)")

+ 3 - 0
src/main/java/com/xjrsoft/module/student/vo/StudentHonorsVo.java

@@ -53,6 +53,9 @@ public class StudentHonorsVo {
 
     @ApiModelProperty("学期Id")
     private Long baseSemesterId;
+
+    @ApiModelProperty("学生userId")
+    private Long studentUserId;
     /**
     * 学号
     */

+ 1 - 1
src/main/resources/mapper/student/StudentHonorsMapper.xml

@@ -29,7 +29,7 @@
         t1.major_set_id,t11.name AS major_set_name,t1.applicant_user_id,t1.name AS applicant_user_name,t1.award_date,
         t1.name,t1.honors_level,t8.name AS honors_level_cn,
         t1.honors_type,t9.name AS honors_type_cn,t1.honors_grade, t10.name AS honors_grade_cn,
-        t1.file_id,t1.base_semester_id  FROM student_honors t1
+        t1.file_id,t1.base_semester_id,t1.student_user_id  FROM student_honors t1
         LEFT JOIN xjr_user t2 ON t1.student_user_id = t2.id
         LEFT JOIN base_student_school_roll t3 ON t1.student_user_id = t3.user_id
         LEFT JOIN base_grade t4 ON t3.grade_id = t4.id