Parcourir la source

奖助学金导入

dzx il y a 1 an
Parent
commit
3cd5f08c5d

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

@@ -53,4 +53,7 @@ public class BaseStudentScholarshipCategoryStatisticPageVo {
     @ApiModelProperty("学期")
     private String semesterName;
 
+    @ApiModelProperty("学期id")
+    private Long semesterId;
+
 }

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

@@ -14,7 +14,7 @@
         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,t3.name as semester_name, t1.scholarship_level FROM base_student_scholarship_category t1
+        ) as applicant_count,t3.name as semester_name, t1.scholarship_level,t1.base_semester_id as semester_id 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;