bug修复

src/main/java/com/xjrsoft/module/attendance/controller/TeacherStatisticsController.java

@@ -126,7 +126,7 @@ public class TeacherStatisticsController {
             for (TeacherStatisticsPageVo record : voIPage.getRecords()) {
                 LocalDateTime startTime, endTime, amEndTime = null;
                 AttendanceRuleDetailsUserVo detailsUserVo = teacherTodyRuleByUserId.get(record.getUserId());
-                if(dto.getTimePeriod() == 1){
+                if(dto.getTimePeriod() != null && dto.getTimePeriod() == 1){
                     startTime = queryDate.atTime(5, 0, 0);
                     if(detailsUserVo != null && detailsUserVo.getAmStartTime() != null){
                         startTime = queryDate.atTime(detailsUserVo.getAmStartTime());
@@ -135,7 +135,7 @@ public class TeacherStatisticsController {
                     if(detailsUserVo != null && detailsUserVo.getAmEndTime() != null){
                         endTime = queryDate.atTime(detailsUserVo.getAmEndTime());
                     }
-                }else if(dto.getTimePeriod() == 2){
+                }else if(dto.getTimePeriod() != null && dto.getTimePeriod() == 2){
                     startTime = queryDate.atTime(12, 0, 0);
                     if(detailsUserVo != null && detailsUserVo.getPmStartTime() != null){
                         startTime = queryDate.atTime(detailsUserVo.getPmStartTime());

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

@@ -4,7 +4,7 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.xjrsoft.module.student.mapper.BaseStudentScholarshipReleaseMapper">
     <select id="getPage" parameterType="com.xjrsoft.module.student.dto.BaseStudentScholarshipReleasePageDto" resultType="com.xjrsoft.module.student.vo.BaseStudentScholarshipReleasePageVo">
-        SELECT t1.id,t2.name AS semester_name,t1.release_status,t1.name,t4.name AS gender_cn,t3.credential_number,t6.name AS class_name,
+        SELECT t1.id,t2.name AS semester_name,t1.release_status,t3.name,t4.name AS gender_cn,t3.credential_number,t6.name AS class_name,
         t7.name AS scholarship_category,t8.name AS category_cn,t7.scholarship_level,t1.amount,t1.bank_no,t1.bank_type,t1.bank_user_name,
         (SELECT SUM(amount) FROM base_student_scholarship_release WHERE base_student_scholarship_applicant_id = t1.id AND delete_mark = 0) AS release_amount,
         (SELECT release_date FROM base_student_scholarship_release WHERE base_student_scholarship_applicant_id = t1.id