奖助学金导入

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

@@ -47,4 +47,10 @@ public class BaseStudentScholarshipCategoryStatisticPageVo {
     @ApiModelProperty("申请人数")
     private Integer applicantCount;
 
+    @ApiModelProperty("等级")
+    private Integer scholarshipLevel;
+
+    @ApiModelProperty("学期")
+    private String semesterName;
+
 }

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

@@ -14,8 +14,9 @@
         select count(*) from base_student_scholarship_applicant
         where status = 1 and base_student_scholarship_category_id = t1.id
         and delete_mark = 0
-        ) as applicant_count FROM base_student_scholarship_category t1
+        ) as applicant_count,t3.name as semester_name, t1.scholarship_level FROM base_student_scholarship_category t1
         LEFT JOIN xjr_dictionary_detail t2 ON t1.category = t2.code
+        left join base_semester t3 on t1.base_semester_id = t3.id
         WHERE t1.delete_mark = 0;
     </select>
 </mapper>