Skip to content

A
attendance-performance-platform
Commit c1ba6539 authored by 赵啸非's avatar 赵啸非
Browse files
Options

修改考勤汇总

parent 3e11ffdf
Show whitespace changes
Inline Side-by-side
Showing with 13 additions and 12 deletions
attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/service/impl/AttendanceRecordHikServiceImpl.java
View file @ c1ba6539
...@@ -5,6 +5,7 @@ import cn.hutool.core.util.StrUtil; ...@@ -5,6 +5,7 @@ import cn.hutool.core.util.StrUtil;
import com.mortals.framework.service.IUser; import com.mortals.framework.service.IUser;
import com.mortals.framework.util.StringUtils; import com.mortals.framework.util.StringUtils;
import com.mortals.xhx.base.system.upload.service.UploadService; import com.mortals.xhx.base.system.upload.service.UploadService;
import com.mortals.xhx.common.code.GoWorkResultEnum;
import com.mortals.xhx.module.attendance.model.*; import com.mortals.xhx.module.attendance.model.*;
import com.mortals.xhx.module.attendance.service.*; import com.mortals.xhx.module.attendance.service.*;
import com.mortals.xhx.module.dept.service.DeptService; import com.mortals.xhx.module.dept.service.DeptService;
...@@ -144,8 +145,8 @@ public class AttendanceRecordHikServiceImpl extends AbstractCRUDServiceImpl<Atte ...@@ -144,8 +145,8 @@ public class AttendanceRecordHikServiceImpl extends AbstractCRUDServiceImpl<Atte
AttendanceRecordDetailEntity recordDetailEntity = new AttendanceRecordDetailEntity(); AttendanceRecordDetailEntity recordDetailEntity = new AttendanceRecordDetailEntity();
recordDetailEntity.setShiftsId(classDetailEntity.getId()); recordDetailEntity.setShiftsId(classDetailEntity.getId());
recordDetailEntity.setShiftsName(classDetailEntity.getClassName()); recordDetailEntity.setShiftsName(classDetailEntity.getClassName());
recordDetailEntity.setGoWorkResult(3); recordDetailEntity.setGoWorkResult(GoWorkResultEnum.缺卡.getValue());
recordDetailEntity.setOffWorkResult(3); recordDetailEntity.setOffWorkResult(GoWorkResultEnum.缺卡.getValue());
recordDetailEntity.setOrderNum(orderNum); recordDetailEntity.setOrderNum(orderNum);
detailEntity.add(recordDetailEntity); detailEntity.add(recordDetailEntity);
} }
...@@ -173,7 +174,7 @@ public class AttendanceRecordHikServiceImpl extends AbstractCRUDServiceImpl<Atte ...@@ -173,7 +174,7 @@ public class AttendanceRecordHikServiceImpl extends AbstractCRUDServiceImpl<Atte
if (!inTime) { if (!inTime) {
for (AttendanceRecordDetailEntity attendanceRecordDetailEntity : detailEntity) { for (AttendanceRecordDetailEntity attendanceRecordDetailEntity : detailEntity) {
if (attendanceRecordDetailEntity.getShiftsId().longValue() == classDetail.getId().longValue()) { if (attendanceRecordDetailEntity.getShiftsId().longValue() == classDetail.getId().longValue()) {
attendanceRecordDetailEntity.setGoWorkResult(4); attendanceRecordDetailEntity.setGoWorkResult(GoWorkResultEnum.迟到.getValue());
attendanceRecordDetailEntity.setGoWorkDate(attendanceDate); attendanceRecordDetailEntity.setGoWorkDate(attendanceDate);
} }
} }
...@@ -181,7 +182,7 @@ public class AttendanceRecordHikServiceImpl extends AbstractCRUDServiceImpl<Atte ...@@ -181,7 +182,7 @@ public class AttendanceRecordHikServiceImpl extends AbstractCRUDServiceImpl<Atte
if (inTime) { if (inTime) {
for (AttendanceRecordDetailEntity attendanceRecordDetailEntity : detailEntity) { for (AttendanceRecordDetailEntity attendanceRecordDetailEntity : detailEntity) {
if (attendanceRecordDetailEntity.getShiftsId().longValue() == classDetail.getId().longValue()) { if (attendanceRecordDetailEntity.getShiftsId().longValue() == classDetail.getId().longValue()) {
attendanceRecordDetailEntity.setGoWorkResult(1); attendanceRecordDetailEntity.setGoWorkResult(GoWorkResultEnum.正常.getValue());
attendanceRecordDetailEntity.setGoWorkDate(attendanceDate); attendanceRecordDetailEntity.setGoWorkDate(attendanceDate);
} }
} }
...@@ -192,7 +193,7 @@ public class AttendanceRecordHikServiceImpl extends AbstractCRUDServiceImpl<Atte ...@@ -192,7 +193,7 @@ public class AttendanceRecordHikServiceImpl extends AbstractCRUDServiceImpl<Atte
if (!inTime) { if (!inTime) {
for (AttendanceRecordDetailEntity attendanceRecordDetailEntity : detailEntity) { for (AttendanceRecordDetailEntity attendanceRecordDetailEntity : detailEntity) {
if (attendanceRecordDetailEntity.getShiftsId().longValue() == classDetail.getId().longValue()) { if (attendanceRecordDetailEntity.getShiftsId().longValue() == classDetail.getId().longValue()) {
attendanceRecordDetailEntity.setOffWorkResult(5); attendanceRecordDetailEntity.setOffWorkResult(GoWorkResultEnum.早退.getValue());
attendanceRecordDetailEntity.setOffWorkDate(attendanceDate); attendanceRecordDetailEntity.setOffWorkDate(attendanceDate);
} }
} }
...@@ -200,7 +201,7 @@ public class AttendanceRecordHikServiceImpl extends AbstractCRUDServiceImpl<Atte ...@@ -200,7 +201,7 @@ public class AttendanceRecordHikServiceImpl extends AbstractCRUDServiceImpl<Atte
if (inTime) { if (inTime) {
for (AttendanceRecordDetailEntity attendanceRecordDetailEntity : detailEntity) { for (AttendanceRecordDetailEntity attendanceRecordDetailEntity : detailEntity) {
if (attendanceRecordDetailEntity.getShiftsId().longValue() == classDetail.getId().longValue()) { if (attendanceRecordDetailEntity.getShiftsId().longValue() == classDetail.getId().longValue()) {
attendanceRecordDetailEntity.setOffWorkResult(1); attendanceRecordDetailEntity.setOffWorkResult(GoWorkResultEnum.正常.getValue());
attendanceRecordDetailEntity.setOffWorkDate(attendanceDate); attendanceRecordDetailEntity.setOffWorkDate(attendanceDate);
} }
} }
...@@ -243,8 +244,8 @@ public class AttendanceRecordHikServiceImpl extends AbstractCRUDServiceImpl<Atte ...@@ -243,8 +244,8 @@ public class AttendanceRecordHikServiceImpl extends AbstractCRUDServiceImpl<Atte
AttendanceRecordDetailEntity recordDetailEntity = new AttendanceRecordDetailEntity(); AttendanceRecordDetailEntity recordDetailEntity = new AttendanceRecordDetailEntity();
recordDetailEntity.setShiftsId(classDetailEntity.getId()); recordDetailEntity.setShiftsId(classDetailEntity.getId());
recordDetailEntity.setShiftsName(classDetailEntity.getClassName()); recordDetailEntity.setShiftsName(classDetailEntity.getClassName());
recordDetailEntity.setGoWorkResult(3); recordDetailEntity.setGoWorkResult(GoWorkResultEnum.缺卡.getValue());
recordDetailEntity.setOffWorkResult(3); recordDetailEntity.setOffWorkResult(GoWorkResultEnum.缺卡.getValue());
recordDetailEntity.setOrderNum(orderNum); recordDetailEntity.setOrderNum(orderNum);
detailEntity.add(recordDetailEntity); detailEntity.add(recordDetailEntity);
} }
...@@ -272,7 +273,7 @@ public class AttendanceRecordHikServiceImpl extends AbstractCRUDServiceImpl<Atte ...@@ -272,7 +273,7 @@ public class AttendanceRecordHikServiceImpl extends AbstractCRUDServiceImpl<Atte
if (!inTime) { if (!inTime) {
for (AttendanceRecordDetailEntity attendanceRecordDetailEntity : detailEntity) { for (AttendanceRecordDetailEntity attendanceRecordDetailEntity : detailEntity) {
if (attendanceRecordDetailEntity.getShiftsId().equals(classDetail.getId())) { if (attendanceRecordDetailEntity.getShiftsId().equals(classDetail.getId())) {
attendanceRecordDetailEntity.setGoWorkResult(4); attendanceRecordDetailEntity.setGoWorkResult(GoWorkResultEnum.迟到.getValue());
attendanceRecordDetailEntity.setGoWorkDate(attendanceDate); attendanceRecordDetailEntity.setGoWorkDate(attendanceDate);
} }
} }
...@@ -280,7 +281,7 @@ public class AttendanceRecordHikServiceImpl extends AbstractCRUDServiceImpl<Atte ...@@ -280,7 +281,7 @@ public class AttendanceRecordHikServiceImpl extends AbstractCRUDServiceImpl<Atte
if (inTime) { if (inTime) {
for (AttendanceRecordDetailEntity attendanceRecordDetailEntity : detailEntity) { for (AttendanceRecordDetailEntity attendanceRecordDetailEntity : detailEntity) {
if (attendanceRecordDetailEntity.getShiftsId().equals(classDetail.getId())) { if (attendanceRecordDetailEntity.getShiftsId().equals(classDetail.getId())) {
attendanceRecordDetailEntity.setGoWorkResult(1); attendanceRecordDetailEntity.setGoWorkResult(GoWorkResultEnum.正常.getValue());
attendanceRecordDetailEntity.setGoWorkDate(attendanceDate); attendanceRecordDetailEntity.setGoWorkDate(attendanceDate);
} }
} }
...@@ -291,7 +292,7 @@ public class AttendanceRecordHikServiceImpl extends AbstractCRUDServiceImpl<Atte ...@@ -291,7 +292,7 @@ public class AttendanceRecordHikServiceImpl extends AbstractCRUDServiceImpl<Atte
if (!inTime) { if (!inTime) {
for (AttendanceRecordDetailEntity attendanceRecordDetailEntity : detailEntity) { for (AttendanceRecordDetailEntity attendanceRecordDetailEntity : detailEntity) {
if (attendanceRecordDetailEntity.getShiftsId().equals(classDetail.getId())) { if (attendanceRecordDetailEntity.getShiftsId().equals(classDetail.getId())) {
attendanceRecordDetailEntity.setOffWorkResult(5); attendanceRecordDetailEntity.setOffWorkResult(GoWorkResultEnum.早退.getValue());
attendanceRecordDetailEntity.setOffWorkDate(attendanceDate); attendanceRecordDetailEntity.setOffWorkDate(attendanceDate);
} }
} }
...@@ -299,7 +300,7 @@ public class AttendanceRecordHikServiceImpl extends AbstractCRUDServiceImpl<Atte ...@@ -299,7 +300,7 @@ public class AttendanceRecordHikServiceImpl extends AbstractCRUDServiceImpl<Atte
if (inTime) { if (inTime) {
for (AttendanceRecordDetailEntity attendanceRecordDetailEntity : detailEntity) { for (AttendanceRecordDetailEntity attendanceRecordDetailEntity : detailEntity) {
if (attendanceRecordDetailEntity.getShiftsId().equals(classDetail.getId())) { if (attendanceRecordDetailEntity.getShiftsId().equals(classDetail.getId())) {
attendanceRecordDetailEntity.setOffWorkResult(1); attendanceRecordDetailEntity.setOffWorkResult(GoWorkResultEnum.正常.getValue());
attendanceRecordDetailEntity.setOffWorkDate(attendanceDate); attendanceRecordDetailEntity.setOffWorkDate(attendanceDate);
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment