考勤报表 补卡添加补卡原因显示及导出

web/src/main/java/com/jpsoft/shinestar/modules/business/controller/WorkScheduleAttendanceController.java

@@ -1045,7 +1045,7 @@ public class WorkScheduleAttendanceController {
                                 wsaDayDTO.setOnWorkRecordTime1(onWorkRecordTime);
                                 wsaDayDTO.setOnLateLeaveMinute1(onLateLeaveMinute);
                                 wsaDayDTO.setOnLateLeaveMinute1N(onLateLeaveMinuteN);
-                                wsaDayDTO.setOffSupplementWork1(offSupplementWork);
+                                wsaDayDTO.setOnSupplementWork1(onSupplementWork);
 
                                 wsaDayDTO.setOffWorkResult1(offWorkResult);
                                 wsaDayDTO.setOffWorkStatus1(offWorkStatus);
@@ -1053,7 +1053,7 @@ public class WorkScheduleAttendanceController {
                                 wsaDayDTO.setOffWorkRecordTime1(offWorkRecordTime);
                                 wsaDayDTO.setOffLateLeaveMinute1(offLateLeaveMinute);
                                 wsaDayDTO.setOffLateLeaveMinute1N(offLateLeaveMinuteN);
-                                wsaDayDTO.setOnSupplementWork1(onSupplementWork);
+                                wsaDayDTO.setOffSupplementWork1(offSupplementWork);
                             } else if (i == 1) {
                                 wsaDayDTO.setOnWorkResult2(onWorkResult);
                                 wsaDayDTO.setOnWorkStatus2(onWorkStatus);
@@ -1061,7 +1061,7 @@ public class WorkScheduleAttendanceController {
                                 wsaDayDTO.setOnWorkRecordTime2(onWorkRecordTime);
                                 wsaDayDTO.setOnLateLeaveMinute2(onLateLeaveMinute);
                                 wsaDayDTO.setOnLateLeaveMinute2N(onLateLeaveMinuteN);
-                                wsaDayDTO.setOffSupplementWork2(offSupplementWork);
+                                wsaDayDTO.setOnSupplementWork2(onSupplementWork);
 
                                 wsaDayDTO.setOffWorkResult2(offWorkResult);
                                 wsaDayDTO.setOffWorkStatus2(offWorkStatus);
@@ -1069,7 +1069,7 @@ public class WorkScheduleAttendanceController {
                                 wsaDayDTO.setOffWorkRecordTime2(offWorkRecordTime);
                                 wsaDayDTO.setOffLateLeaveMinute2(offLateLeaveMinute);
                                 wsaDayDTO.setOffLateLeaveMinute2N(offLateLeaveMinuteN);
-                                wsaDayDTO.setOnSupplementWork2(onSupplementWork);
+                                wsaDayDTO.setOffSupplementWork2(offSupplementWork);
                             } else if (i == 2) {
                                 wsaDayDTO.setOnWorkResult3(onWorkResult);
                                 wsaDayDTO.setOnWorkStatus3(onWorkStatus);
@@ -1077,7 +1077,7 @@ public class WorkScheduleAttendanceController {
                                 wsaDayDTO.setOnWorkRecordTime3(onWorkRecordTime);
                                 wsaDayDTO.setOnLateLeaveMinute3(onLateLeaveMinute);
                                 wsaDayDTO.setOnLateLeaveMinute3N(onLateLeaveMinuteN);
-                                wsaDayDTO.setOffSupplementWork3(offSupplementWork);
+                                wsaDayDTO.setOnSupplementWork3(onSupplementWork);
 
                                 wsaDayDTO.setOffWorkResult3(offWorkResult);
                                 wsaDayDTO.setOffWorkStatus3(offWorkStatus);
@@ -1085,7 +1085,7 @@ public class WorkScheduleAttendanceController {
                                 wsaDayDTO.setOffWorkRecordTime3(offWorkRecordTime);
                                 wsaDayDTO.setOffLateLeaveMinute3(offLateLeaveMinute);
                                 wsaDayDTO.setOffLateLeaveMinute3N(offLateLeaveMinuteN);
-                                wsaDayDTO.setOnSupplementWork3(onSupplementWork);
+                                wsaDayDTO.setOffSupplementWork3(offSupplementWork);
                             }
                         }
 
@@ -1378,7 +1378,7 @@ public class WorkScheduleAttendanceController {
                                 wsaDayDTO.setOnWorkRecordTime2(onWorkRecordTime);
                                 wsaDayDTO.setOnLateLeaveMinute2(onLateLeaveMinute);
                                 wsaDayDTO.setOnLateLeaveMinute2N(onLateLeaveMinuteN);
-                                wsaDayDTO.setOnSupplementWork2(offSupplementWork);
+                                wsaDayDTO.setOnSupplementWork2(onSupplementWork);
 
                                 wsaDayDTO.setOffWorkResult2(offWorkResult);
                                 wsaDayDTO.setOffWorkStatus2(offWorkStatus);
@@ -1394,7 +1394,7 @@ public class WorkScheduleAttendanceController {
                                 wsaDayDTO.setOnWorkRecordTime3(onWorkRecordTime);
                                 wsaDayDTO.setOnLateLeaveMinute3(onLateLeaveMinute);
                                 wsaDayDTO.setOnLateLeaveMinute3N(onLateLeaveMinuteN);
-                                wsaDayDTO.setOnSupplementWork3(offSupplementWork);
+                                wsaDayDTO.setOnSupplementWork3(onSupplementWork);
 
                                 wsaDayDTO.setOffWorkResult3(offWorkResult);
                                 wsaDayDTO.setOffWorkStatus3(offWorkStatus);
@@ -1719,7 +1719,7 @@ public class WorkScheduleAttendanceController {
                                 wsaDayDTO.setOnWorkRecordTime2(onWorkRecordTime);
                                 wsaDayDTO.setOnLateLeaveMinute2(onLateLeaveMinute);
                                 wsaDayDTO.setOnLateLeaveMinute2N(onLateLeaveMinuteN);
-                                wsaDayDTO.setOnSupplementWork2(offSupplementWork);
+                                wsaDayDTO.setOnSupplementWork2(onSupplementWork);
 
                                 wsaDayDTO.setOffWorkResult2(offWorkResult);
                                 wsaDayDTO.setOffWorkStatus2(offWorkStatus);
@@ -1735,7 +1735,7 @@ public class WorkScheduleAttendanceController {
                                 wsaDayDTO.setOnWorkRecordTime3(onWorkRecordTime);
                                 wsaDayDTO.setOnLateLeaveMinute3(onLateLeaveMinute);
                                 wsaDayDTO.setOnLateLeaveMinute3N(onLateLeaveMinuteN);
-                                wsaDayDTO.setOnSupplementWork3(offSupplementWork);
+                                wsaDayDTO.setOnSupplementWork3(onSupplementWork);
 
                                 wsaDayDTO.setOffWorkResult3(offWorkResult);
                                 wsaDayDTO.setOffWorkStatus3(offWorkStatus);