1、详情接口增加学期、年级、班级、专业id

2、查询详情的附件列表时，增加非空判定

src/main/java/com/xjrsoft/module/student/service/impl/StudentHonorsServiceImpl.java

@@ -1,5 +1,6 @@
 package com.xjrsoft.module.student.service.impl;
 
+import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.yulichang.base.MPJBaseServiceImpl;
@@ -46,7 +47,10 @@ public class StudentHonorsServiceImpl extends MPJBaseServiceImpl<StudentHonorsMa
     @Override
     public StudentHonorsVo getInfo(Long id) {
         StudentHonorsVo result = studentHonorsMapper.getInfo(id);
-        result.setFileInfos(fileService.list(Wrappers.<File>query().lambda().eq(File::getFolderId, result.getFileId())));
+        if(ObjectUtil.isNotNull(result) && ObjectUtil.isNotNull(result.getFileId())){
+            result.setFileInfos(fileService.list(Wrappers.<File>query().lambda().eq(File::getFolderId, result.getFileId())));
+        }
+
         return result;
     }
 

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

@@ -26,6 +26,9 @@ public class StudentHonorsVo {
     */
     @ApiModelProperty("申请人姓名")
     private String applicantUserName;
+
+    @ApiModelProperty("申请人Id")
+    private Long applicantUserId;
     /**
     * 学期ID(base_semester)
     */
@@ -36,11 +39,20 @@ public class StudentHonorsVo {
     */
     @ApiModelProperty("年级")
     private String gradeName;
+
+    @ApiModelProperty("年级id")
+    private Long gradeId;
     /**
     * 学生用户编号
     */
     @ApiModelProperty("班级")
     private String className;
+
+    @ApiModelProperty("班级Id")
+    private Long classId;
+
+    @ApiModelProperty("学期Id")
+    private Long baseSemesterId;
     /**
     * 学号
     */
@@ -50,7 +62,10 @@ public class StudentHonorsVo {
     * 所学专业
     */
     @ApiModelProperty("所学专业")
-    private String majorName;
+    private String majorSetName;
+
+    @ApiModelProperty("所学专业Id")
+    private Long majorSetId;
     /**
     * 荣誉级别(xjr_dictionary_item[honors_level])
     */

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

@@ -25,10 +25,11 @@
     </select>
 
     <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,
-        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,
+        SELECT t1.id,t2.name AS student_name,t1.student_id,t3.grade_id,t4.name AS grade_name,t1.class_id,t5.name AS class_name,
+        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  FROM student_honors t1
+        t1.file_id,t1.base_semester_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