Merge branch 'pre'

src/main/java/com/xjrsoft/module/job/AttendanceMessageTask.java

@@ -160,7 +160,7 @@ public class AttendanceMessageTask {
                 characterKey = "character_string18";
                 //获取最近的时间
                 recentlyTime = getRecentlyTime(ruleDetails, now);
-                if(recentlyTime.getHour() != now.getHour() && recentlyTime.getMinute() == now.getMinute()){
+                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(recentlyTime.getHour() != now.getHour() && recentlyTime.getMinute() == now.getMinute()){
+                if(recentlyTime.getHour() != now.getHour() && recentlyTime.getMinute() != now.getMinute()){
                     log.info("未到时间，不需要提醒");
                     continue;
                 }

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

@@ -33,6 +33,7 @@ import com.xjrsoft.module.personnel.dto.StundentFaceProcessPageDto;
 import com.xjrsoft.module.personnel.dto.UpdateStundentFaceProcessDto;
 import com.xjrsoft.module.personnel.entity.FaceManagement;
 import com.xjrsoft.module.personnel.entity.StundentFaceProcess;
+import com.xjrsoft.module.personnel.entity.TeacherFaceProcess;
 import com.xjrsoft.module.personnel.service.IFaceManagementService;
 import com.xjrsoft.module.personnel.service.IStundentFaceProcessService;
 import com.xjrsoft.module.personnel.vo.StundentFaceProcessPageVo;
@@ -113,6 +114,7 @@ public class StundentFaceProcessController {
                         .select(StundentFaceProcess::getId,StundentFaceProcess::getUserId,StundentFaceProcess::getClassId,StundentFaceProcess::getFacePhoto)
                         .innerJoin(XjrUser.class,XjrUser::getId, StundentFaceProcess::getUserId)
                         .leftJoin(File.class,File::getFolderId,StundentFaceProcess::getFacePhoto)
+                        .leftJoin(FaceManagement.class,FaceManagement::getFileId, StundentFaceProcess::getFacePhoto)
                         .leftJoin(DictionaryDetail.class,DictionaryDetail::getCode,StundentFaceProcess::getGender, ext->ext.selectAs(DictionaryDetail::getName, StundentFaceProcessPageVo::getGender))
                         .leftJoin(BaseStudentSchoolRoll.class,BaseStudentSchoolRoll::getUserId,StundentFaceProcess::getUserId)
                         .leftJoin(DictionaryDetail.class,DictionaryDetail::getCode,BaseStudentSchoolRoll::getStduyStatus, ext->ext.selectAs(DictionaryDetail::getName, StundentFaceProcessPageVo::getStduyStatus))

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

@@ -96,6 +96,7 @@ public class TeacherFaceProcessController {
                 .select(TeacherFaceProcess::getId,TeacherFaceProcess::getUserId,TeacherFaceProcess::getDepId,TeacherFaceProcess::getFacePhoto)
                 .innerJoin(XjrUser.class,XjrUser::getId, TeacherFaceProcess::getUserId)
                 .leftJoin(File.class,File::getFolderId,TeacherFaceProcess::getFacePhoto)
+                .leftJoin(FaceManagement.class,FaceManagement::getFileId,TeacherFaceProcess::getFacePhoto)
                 .leftJoin(DictionaryDetail.class,DictionaryDetail::getCode,TeacherFaceProcess::getGender, ext->ext.selectAs(DictionaryDetail::getName, TeacherFaceProcessPageVo::getGender))
                 .selectAs(XjrUser::getName,TeacherFaceProcessPageVo::getName)
                 .select("t2.file_url AS face_photo_url,t1.user_name AS user_name,t1.mobile")