年假修改考情状态逻辑问题修改

common/src/main/java/com/jpsoft/shinestar/modules/business/service/impl/WorkScheduleAttendanceServiceImpl.java

@@ -1062,6 +1062,16 @@ public class WorkScheduleAttendanceServiceImpl implements WorkScheduleAttendance
                                 personScheduleId, workShiftId, "0", 0, classify, "3");
                         return;
                     } else {
+                        //年假
+                        List<YearRequestForLeaveInfo> yearRequestForLeaveInfoList1 = yearRequestForLeaveInfoService.findByPersonIdAndDate(personInfo.getId(), attendanceTime.toDate());
+
+                        if(yearRequestForLeaveInfoList1.size()>0){
+                            saveWorkAttendance(personInfo.getId(), new BigDecimal(0), attendanceTime.toDate(), dateStr,
+                                    personScheduleId, workShiftId, "0", 0, classify, "7");
+                            return;
+                        }
+
+                        //请假
                         List<RequestForLeaveInfo> requestForLeaveList1 = requestForLeaveInfoService.findByPersonIdAndAttendanceDate(personInfo.getId(), attendanceTime.toDate());
 
                         if (requestForLeaveList1.size() > 0) {
@@ -1072,14 +1082,6 @@ public class WorkScheduleAttendanceServiceImpl implements WorkScheduleAttendance
                         }
                     }
 
-                    List<YearRequestForLeaveInfo> yearRequestForLeaveInfoList1 = yearRequestForLeaveInfoService.findByPersonIdAndDate(personInfo.getId(), attendanceTime.toDate());
-
-                    if(yearRequestForLeaveInfoList1.size()>0){
-                        saveWorkAttendance(personInfo.getId(), new BigDecimal(0), attendanceTime.toDate(), dateStr,
-                                personScheduleId, workShiftId, "0", 0, classify, "7");
-                        return;
-                    }
-
                     //查询人员考勤时段是否有加班
                     if(workOverPerson!=null && workOver!=null){
                         if("1".equals(classify)){