请假状态下打卡算正常上班。

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

@@ -384,6 +384,11 @@ public class WorkScheduleAttendanceServiceImpl implements WorkScheduleAttendance
                 }
             }
 
+            //如果是状态是请假，但正常打卡则工作状态算上班
+            if("4".equals(workStatus)){
+                workStatus = "1";
+            }
+
             //记录上班打卡
             saveWorkAttendance(personId, temperature, recordTime, date.toString("yyyy-MM-dd"), workPersonScheduling.getId(),
                     workBeginShift.getId(), result, minutes, "1", workStatus);
@@ -515,6 +520,11 @@ public class WorkScheduleAttendanceServiceImpl implements WorkScheduleAttendance
                 }
             }
 
+            //如果是状态是请假，但正常打卡则工作状态算上班
+            if("4".equals(workStatus)){
+                workStatus = "1";
+            }
+
             saveWorkAttendance(personId, temperature, recordTime, date.toString("yyyy-MM-dd"), workPersonScheduling.getId(),
                     workEndShift.getId(), result, minutes, "2", workStatus,workOverPerson);