Browse Source

修复学生出入记录传入userId查询不到数据的问题

dzx 8 months ago
parent
commit
800f691402

+ 2 - 2
src/main/java/com/xjrsoft/module/job/AttendanceMessageTask.java

@@ -160,7 +160,7 @@ public class AttendanceMessageTask {
                 characterKey = "character_string18";
                 //获取最近的时间
                 recentlyTime = getRecentlyTime(ruleDetails, now);
-                if(now.isBefore(recentlyTime)){
+                if(recentlyTime.getHour() != now.getHour() && recentlyTime.getMinute() == now.getMinute()){
                     log.info("未到时间,不需要提醒");
                     continue;
                 }
@@ -168,7 +168,7 @@ public class AttendanceMessageTask {
                 wechatTemplate = weChatUtil.getAttendanceMsgAbsenceTemplate();
                 recentlyTime = getRecentlyOverTime(ruleDetails, now);
                 characterKey = "character_string36";
-                if(now.isBefore(recentlyTime)){
+                if(recentlyTime.getHour() != now.getHour() && recentlyTime.getMinute() == now.getMinute()){
                     log.info("未到时间,不需要提醒");
                     continue;
                 }

+ 18 - 3
src/main/java/com/xjrsoft/module/personnel/controller/TeacherFaceProcessController.java

@@ -350,9 +350,24 @@ public class TeacherFaceProcessController {
                 teacherFaceProcessService.updateById(process);
 
                 FaceManagement faceManagement = faceManagementMap.get(Long.parseLong(teacherUser.getId()));
-                faceManagement.setVerifyStatus(2);
-                faceManagement.setRegisterBase64(base64String);
-                faceManagementService.update(faceManagement);
+                if(faceManagement == null){
+                    faceManagement = new FaceManagement();
+                    faceManagement.setUserType(2L);
+                    faceManagement.setUserId(Long.parseLong(teacherUser.getId()));
+                    faceManagement.setFileId(folderId);
+                    faceManagement.setIdno(teacherUser.getCredentialNumber());
+                    faceManagement.setName(teacherUser.getName());
+                    faceManagement.setSyncStatus(1);
+                    faceManagement.setSex(teacherUser.getGender());
+                    faceManagement.setVerifyStatus(2);
+                    faceManagement.setRegisterBase64(base64String);
+                    faceManagementService.save(faceManagement);
+                }else{
+                    faceManagement.setVerifyStatus(2);
+                    faceManagement.setRegisterBase64(base64String);
+                    faceManagementService.update(faceManagement);
+                }
+
             }
         }
         return RT.ok(true);