修改考勤汇总

attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/service/impl/AttendanceRecordHikServiceImpl.java

@@ -129,8 +129,9 @@ public class AttendanceRecordHikServiceImpl extends AbstractCRUDServiceImpl<Atte
                         String week = this.getWeek(attendanceDate1);
                         //log.info("week:{}", week);
                         //通过考勤日期的星期拿到班次id.
-                        if(ObjectUtils.isEmpty(attendanceGroupFixedworkEntity)){
-                            log.info("attendanceGroupFixedworkEntity is null ! groupId:{}",attendanceGroupEntity.getId());
+                        if (ObjectUtils.isEmpty(attendanceGroupFixedworkEntity)) {
+                            log.info("attendanceGroupFixedworkEntity is null ! groupId:{}", attendanceGroupEntity.getId());
+                            continue;
                         }
                         Long weekClassId = this.getWeekClassId(attendanceGroupFixedworkEntity, week);
                         //log.info("weekClassId:{}", weekClassId);
@@ -413,25 +414,25 @@ public class AttendanceRecordHikServiceImpl extends AbstractCRUDServiceImpl<Atte
                     }
 
                     for (AttendanceRecordDetailEntity detailEntity : detailEntityList) {
-                        if (OffWorkResultEnum.正常.getValue() == detailEntity.getOffWorkResult()||OffWorkResultEnum.早退.getValue() == detailEntity.getOffWorkResult() ) {
+                        if (OffWorkResultEnum.正常.getValue() == detailEntity.getOffWorkResult() || OffWorkResultEnum.早退.getValue() == detailEntity.getOffWorkResult()) {
                             attendanceRecordEntity.setSignOutResult(YesNoEnum.YES.getValue());
                             break;
                         }
                     }
 
                     for (AttendanceRecordDetailEntity detailEntity : detailEntityList) {
-                        if (OffWorkResultEnum.缺卡.getValue() == detailEntity.getOffWorkResult() ) {
+                        if (OffWorkResultEnum.缺卡.getValue() == detailEntity.getOffWorkResult()) {
                             attendanceRecordEntity.setPunchResult(YesNoEnum.NO.getValue());
                             break;
                         }
 
-                        if (OffWorkResultEnum.缺卡.getValue() == detailEntity.getOffWorkResult() ) {
+                        if (OffWorkResultEnum.缺卡.getValue() == detailEntity.getOffWorkResult()) {
                             attendanceRecordEntity.setPunchResult(YesNoEnum.NO.getValue());
                             break;
                         }
                     }
 
-                    if(YesNoEnum.YES.getValue()==attendanceRecordEntity.getSignInResult()&&YesNoEnum.YES.getValue()==attendanceRecordEntity.getSignOutResult()){
+                    if (YesNoEnum.YES.getValue() == attendanceRecordEntity.getSignInResult() && YesNoEnum.YES.getValue() == attendanceRecordEntity.getSignOutResult()) {
                         attendanceRecordEntity.setPunchResult(YesNoEnum.YES.getValue());
                     }
 
@@ -445,12 +446,12 @@ public class AttendanceRecordHikServiceImpl extends AbstractCRUDServiceImpl<Atte
                     query.setAttendanceDate(attendanceRecordEntity.getAttendanceDate());
 
                     AttendanceRecordEntity recordEntity = attendanceRecordService.selectOne(query);
-                    if(!ObjectUtils.isEmpty(recordEntity)){
+                    if (!ObjectUtils.isEmpty(recordEntity)) {
                         attendanceRecordEntity.setId(recordEntity.getId());
                         attendanceRecordEntity.setUpdateTime(new Date());
                         attendanceRecordEntity.setUpdateUserId(this.getContextUserId(context));
-                        attendanceRecordService.update(attendanceRecordEntity,context);
-                    }else {
+                        attendanceRecordService.update(attendanceRecordEntity, context);
+                    } else {
                         attendanceRecordService.save(attendanceRecordEntity, context);
                     }
                 }