Merge branch 'master' of http://gitlab.scsmile.cn/zxf/attendance-performance-platform

attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/service/work/FixWorkOtherAttendance.java

@@ -158,7 +158,7 @@ public class FixWorkOtherAttendance extends AttendanceWorkAbstract {
             recordDetailEntity.setGoWorkDate(DateUtil.parse(commonData.getDateStr() + " " + DateUtil.formatTime(classDetailEntity.getGoWorkDate())));
 
             recordDetailEntity.setOffWorkResult(GoWorkResultEnum.缺卡.getValue());
-            recordDetailEntity.setOffWorkDate(DateUtil.parse(commonData.getDateStr() + " " + DateUtil.formatTime(classDetailEntity.getGoWorkDate())));
+            recordDetailEntity.setOffWorkDate(DateUtil.parse(commonData.getDateStr() + " " + DateUtil.formatTime(classDetailEntity.getOffWorkDate())));
 
             recordDetailEntity.setOrderNum(orderNum);
             commonData.getDetailEntityList().add(recordDetailEntity);
@@ -244,8 +244,8 @@ public class FixWorkOtherAttendance extends AttendanceWorkAbstract {
 
                 if (next.getOffWorkResult() == OffWorkResultEnum.缺卡.getValue()) {
                     if (DateUtil.compare(new Date(), next.getOffWorkDate()) < 0) {
-                        next.setGoWorkDate(null);
-                        next.setGoWorkResult(GoWorkResultEnum.正常.getValue());
+                        next.setOffWorkDate(null);
+                        next.setOffWorkResult(OffWorkResultEnum.正常.getValue());
                     }
                 }
             }

attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/web/AttendanceStatController.java

@@ -226,7 +226,7 @@ public class AttendanceStatController extends BaseCRUDJsonBodyMappingController<
                     collect = attendanceStaffStatEntities.stream().collect(Collectors.toMap(x -> x.getYear() + x.getMonth() + x.getDay(), y -> y.getAttendanceSummary()));
                 }
                 List<Map<String, Object>> mapList = new ArrayList<>();
-                for (int i = 1; i <= subDay.intValue(); i++) {
+                for (int i = 0; i <= subDay.intValue(); i++) {
                     DateTime curDate = DateUtil.offsetDay(startDate, i);
                     //判断详细是否存在，如果不存在 则构造一个空的
                     Integer year = DateUtil.year(curDate);