Merge branch 'pre'

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

@@ -118,7 +118,7 @@ public class TeacherStatisticsController {
 //                outInMap.put(inRecord.getUserId(), inRecord);
 //            }
             for (TeacherStatisticsPageVo record : voIPage.getRecords()) {
-                LocalDateTime startTime, endTime;
+                LocalDateTime startTime, endTime, amEndTime = null;
                 AttendanceRuleDetailsUserVo detailsUserVo = teacherTodyRuleByUserId.get(record.getUserId());
                 if(dto.getTimePeriod() == 1){
                     startTime = queryDate.atTime(5, 0, 0);
@@ -138,6 +138,10 @@ public class TeacherStatisticsController {
                     if(detailsUserVo != null && detailsUserVo.getPmEndTime() != null){
                         endTime = queryDate.atTime(detailsUserVo.getPmEndTime());
                     }
+                    amEndTime  = queryDate.atTime(12, 0, 0);
+                    if(detailsUserVo != null && detailsUserVo.getAmEndTime() != null){
+                        amEndTime = queryDate.atTime(detailsUserVo.getAmEndTime());
+                    }
                 }else{
                     startTime = queryDate.atTime(0, 0, 0);
                     if(detailsUserVo != null && detailsUserVo.getEveningStartTime() != null){
@@ -180,6 +184,7 @@ public class TeacherStatisticsController {
                     if(outInRecord != null){
                         record.setRecordTime(outInRecord.getRecordTime());
                         record.setStatus(outInRecord.getAttendanceStatus());
+                        record.setAttendanceMode("人脸");
                     }
                 }else{
                     //查询该教师是否通过车辆进入
@@ -187,9 +192,11 @@ public class TeacherStatisticsController {
                             new MPJLambdaWrapper<CarOutInRecord>()
                                     .select(CarOutInRecord.class, x -> VoToColumnUtil.fieldsToColumns(CarOutInRecord.class).contains(x.getProperty()))
                                     .leftJoin(CarMessageApply.class, CarMessageApply::getId, CarOutInRecord::getCarMessageApplyId)
-                                    .le(TeacherOutInRecord::getRecordTime, endTime)
+                                    .le(CarOutInRecord::getRecordTime, endTime)
                                     .eq("DATE_FORMAT(record_time, '%Y-%m-%d')", endTime.toLocalDate())
                                     .eq(CarMessageApply::getUserId, record.getUserId())
+                                    .ge(dto.getTimePeriod() == 2 && amEndTime != null, CarOutInRecord::getRecordTime, amEndTime)
+                                    .eq(CarOutInRecord::getReleaseResult, 1)
                                     .orderByAsc(CarOutInRecord::getRecordTime)
                     );
                     if(!list.isEmpty()){
@@ -197,9 +204,13 @@ public class TeacherStatisticsController {
                         if(outInRecord != null && outInRecord.getRecordTime().isBefore(startTime)){
                             record.setRecordTime(outInRecord.getRecordTime());
                             record.setStatus("到校");
+                            record.setAttendanceMode("车辆");
+                            record.setCarNumber(outInRecord.getPlanNo());
                         }else if(outInRecord != null && outInRecord.getRecordTime().isAfter(startTime)){
                             record.setRecordTime(outInRecord.getRecordTime());
                             record.setStatus("迟到");
+                            record.setAttendanceMode("车辆");
+                            record.setCarNumber(outInRecord.getPlanNo());
                         }
                     }
                 }

src/main/java/com/xjrsoft/module/attendance/vo/TeacherStatisticsPageVo.java

@@ -31,4 +31,10 @@ public class TeacherStatisticsPageVo {
 
     @ApiModelProperty("考勤时间")
     private LocalDateTime recordTime;
+
+    @ApiModelProperty("考勤方式")
+    private String attendanceMode;
+
+    @ApiModelProperty("车牌号")
+    private String carNumber;
 }

src/main/java/com/xjrsoft/module/hikvision/util/OutInRecordUtil.java

@@ -93,7 +93,7 @@ public class OutInRecordUtil {
         //车辆入库后，判定教师考情状态
         if(carMessageApplyId != 0){
             String selectTable = "car_message_apply";
-            Entity selectWhere = Entity.create(tableName);
+            Entity selectWhere = Entity.create(selectTable);
             selectWhere.set("car_message_apply_id", carMessageApplyId);
             selectWhere.set("plan_no", planNo);
             Map<String, Object> objectMap = SqlRunnerAdapter.db().dynamicSelectOne(selectTable, selectWhere);

src/main/java/com/xjrsoft/module/personnel/controller/StundentFaceProcessController.java

@@ -376,6 +376,7 @@ public class StundentFaceProcessController {
                 FaceManagement faceManagement = faceManagementMap.get(studentUser.getId());
                 faceManagement.setVerifyStatus(2);
                 faceManagement.setRegisterBase64(base64String);
+                faceManagement.setFileId(folderId);
                 faceManagementService.update(faceManagement);
             }
         }