将学生荣誉中的专业名称改为专业id

src/main/java/com/xjrsoft/module/student/controller/StudentHonorsController.java

@@ -56,6 +56,15 @@ 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 = "学生荣誉列表(树)")
     @SaCheckPermission("studenthonors:detail")

src/main/java/com/xjrsoft/module/student/entity/StudentHonors.java

@@ -111,8 +111,8 @@ public class StudentHonors implements Serializable {
     /**
     * 所学专业
     */
-    @ApiModelProperty("所学专业")
-    private String majorName;
+    @ApiModelProperty("所学专业id")
+    private String majorId;
     /**
     * 荣誉级别(xjr_dictionary_item[honors_level])
     */

src/main/java/com/xjrsoft/module/student/vo/StudentHonorsPageVo.java

@@ -70,5 +70,6 @@ public class StudentHonorsPageVo {
     @ApiModelProperty("状态（1:结束 0:未结束）")
     private Integer status;
 
-
+    @ApiModelProperty("教师id")
+    private Long teacherId;
 }

src/main/resources/mapper/student/StudentHonorsMapper.xml

@@ -10,7 +10,7 @@
         LEFT JOIN xjr_dictionary_detail t3 ON t1.honors_level = t3.code AND t3.item_id = 1731576278748352514
         LEFT JOIN xjr_dictionary_detail t4 ON t1.honors_type = t4.code AND t4.item_id = 1731577666295418881
         LEFT JOIN xjr_dictionary_detail t5 ON t1.honors_grade = t5.code AND t5.item_id = 1731577201793028098
-        WHERE t1.delete_mark = 0 AND t1.class_id = #{dto.classId}
+        WHERE t1.delete_mark = 0 AND t1.class_id = #{dto.classId} and t1.status = 1
     </select>
 
     <select id="getSemesterInfo" resultType="com.xjrsoft.module.student.vo.StudentHonorsListVo">
@@ -26,7 +26,7 @@
 
     <select id="getInfo" resultType="com.xjrsoft.module.student.vo.StudentHonorsVo">
         SELECT t1.id,t2.name AS student_name,t1.student_id,t4.name AS grade_name,t5.name AS class_name,
-        t1.major_name,t1.name AS applicant_user_name,t1.award_date,t1.name,t1.honors_level,t8.name AS honors_level_cn,
+        t11.name AS major_name,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  FROM student_honors t1
         LEFT JOIN xjr_user t2 ON t1.student_user_id = t2.id
@@ -38,6 +38,7 @@
         LEFT JOIN xjr_dictionary_detail t8 ON t1.honors_level = t8.code AND t8.item_id = 1731576278748352514
         LEFT JOIN xjr_dictionary_detail t9 ON t1.honors_type = t9.code AND t9.item_id = 1731577666295418881
         LEFT JOIN xjr_dictionary_detail t10 ON t1.honors_grade = t10.code AND t10.item_id = 1731577201793028098
+        LEFT JOIN base_major_set t11 ON t1.major_id = t11.id
         WHERE t1.id = #{id} and t1.delete_mark = 0
     </select>
     <select id="getSortCode" resultType="java.lang.Integer">