Merge branch 'pre'

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

@@ -75,7 +75,7 @@ public class StatisticsController {
             LocalDate queryDate = LocalDate.parse(dto.getDate(), formatter);
             LocalDateTime startTime, endTime;
             if(dto.getTimePeriod() != null && dto.getTimePeriod() == 1){
-                startTime = queryDate.atTime(9, 0, 0);
+                startTime = queryDate.atTime(5, 0, 0);
                 endTime = queryDate.atTime(12, 0, 0);
             }else if(dto.getTimePeriod() != null && dto.getTimePeriod() == 2){
                 startTime = queryDate.atTime(12, 0, 0);
@@ -144,7 +144,7 @@ public class StatisticsController {
             LocalDate queryDate = LocalDate.parse(dto.getDate(), formatter);
             LocalDateTime startTime, endTime;
             if(dto.getTimePeriod() != null && dto.getTimePeriod() == 1){
-                startTime = queryDate.atTime(9, 0, 0);
+                startTime = queryDate.atTime(5, 0, 0);
                 endTime = queryDate.atTime(12, 0, 0);
             }else if(dto.getTimePeriod() != null && dto.getTimePeriod() == 2){
                 startTime = queryDate.atTime(12, 0, 0);

src/main/java/com/xjrsoft/module/outint/controller/TeacherOutInRecordController.java

@@ -58,7 +58,6 @@ public class TeacherOutInRecordController {
     @ApiOperation(value="教师出入记录列表(分页)")
     @SaCheckPermission("teacheroutinrecord:detail")
     public RT<PageOutput<TeacherOutInRecordPageVo>> page(@Valid TeacherOutInRecordPageDto dto){
-
         MPJLambdaWrapper<TeacherOutInRecord> queryWrapper= MPJWrappers.<TeacherOutInRecord>lambdaJoin()
                 .disableSubLogicDel()
                 .orderByDesc(TeacherOutInRecord::getId)
@@ -73,7 +72,6 @@ public class TeacherOutInRecordController {
                         ext->ext.selectAs(XjrUser::getCredentialNumber, TeacherOutInRecordPageVo::getIdentityCard)
                         .selectAs(XjrUser::getMobile,TeacherOutInRecordPageVo::getPhone)
                         .select(XjrUser::getName))
-
                 .leftJoin(DictionaryDetail.class,DictionaryDetail::getCode, XjrUser::getGender, ext->ext.selectAs(DictionaryDetail::getName, TeacherOutInRecordPageVo::getGender));
 
         if(ObjectUtil.isNotNull(dto.getDeptId()) && dto.getDeptId() != 0){

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

@@ -99,7 +99,7 @@ public class StudentLeaveServiceImpl extends MPJBaseServiceImpl<StudentLeaveMapp
         List<StudentLeave> leaveList = this.baseMapper.getLeaveList(startTime, endTime);
         Map<Long, StudentLeave> result = new HashMap<>();
         for (StudentLeave studentLeave : leaveList) {
-            result.put(studentLeave.getClassId(), studentLeave);
+            result.put(studentLeave.getStudentUserId(), studentLeave);
         }
         return result;
     }