Skip to content

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

修改考勤自动审核

parent f7f3ddbf
Hide whitespace changes
Inline Side-by-side
Showing with 53 additions and 26 deletions
attendance-performance-manager/src/main/java/com/mortals/xhx/daemon/task/SyncDoorsEventAfterTaskImpl.java
View file @ 5e1068eb
......@@ -86,8 +86,8 @@ public class SyncDoorsEventAfterTaskImpl implements ITaskExcuteService {
eventTypes.add(196891);
doorEventReq.setEventTypes(eventTypes);
// 获取当天的开始时间
Date todayStart = DateUtil.offsetHour(new Date(), -5).toJdkDate();
// Date todayStart = DateUtil.beginOfDay(new Date());
// Date todayStart = DateUtil.offsetHour(new Date(), -5).toJdkDate();
Date todayStart = DateUtil.beginOfDay(new Date());
// 获取当天的结束时间
Date todayEnd = DateUtil.endOfDay(new Date());
doorEventReq.setStartTime(todayStart);
......
attendance-performance-manager/src/main/java/com/mortals/xhx/daemon/task/SyncDoorsEventTaskImpl.java
View file @ 5e1068eb
......@@ -86,8 +86,8 @@ public class SyncDoorsEventTaskImpl implements ITaskExcuteService {
eventTypes.add(196891);
doorEventReq.setEventTypes(eventTypes);
// 获取当天的开始时间
Date todayStart = DateUtil.offsetHour(new Date(), -5).toJdkDate();
// Date todayStart = DateUtil.beginOfDay(new Date());
//Date todayStart = DateUtil.offsetHour(new Date(), -5).toJdkDate();
Date todayStart = DateUtil.beginOfDay(new Date());
// 获取当天的结束时间
Date todayEnd = DateUtil.endOfDay(new Date());
doorEventReq.setStartTime(todayStart);
......
attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/service/impl/PerformAttendRecordServiceImpl.java
View file @ 5e1068eb
......@@ -63,16 +63,17 @@ public class PerformAttendRecordServiceImpl extends AbstractCRUDServiceImpl<Perf
@Override
protected void saveBefore(PerformAttendRecordEntity entity, Context context) throws AppException {
updateStaffRuleNames(entity);
updateStaffRuleNames(entity, context);
}
@Override
protected void updateBefore(PerformAttendRecordEntity entity, Context context) throws AppException {
updateStaffRuleNames(entity);
updateStaffRuleNames(entity, context);
}
private void updateStaffRuleNames(PerformAttendRecordEntity entity) {
private void updateStaffRuleNames(PerformAttendRecordEntity entity, Context context) {
if (!ObjectUtils.isEmpty(entity.getRuleId())) {
PerformRulesEntity rulesEntity = rulesService.getCache(entity.getRuleId().toString());
entity.setRuleName(rulesEntity == null ? "" : rulesEntity.getName());
......@@ -84,6 +85,9 @@ public class PerformAttendRecordServiceImpl extends AbstractCRUDServiceImpl<Perf
entity.setDeptName(staffCache == null ? "" : staffCache.getDeptName());
}
entity.setErrorResult(entity.getRuleName());
entity.setDeductTime(new Date());
entity.setDeductPerson(context == null ? "" : context.getUser() == null ? "" : context.getUser().getRealName());
if (!ObjectUtils.isEmpty(entity.getAttendanceGroupId())) {
AttendanceGroupEntity attendanceGroupEntity = attendanceGroupService.get(entity.getAttendanceGroupId());
entity.setAttendanceGroupName(attendanceGroupEntity == null ? "" : attendanceGroupEntity.getGroupName());
......@@ -128,7 +132,8 @@ public class PerformAttendRecordServiceImpl extends AbstractCRUDServiceImpl<Perf
entity.setGoOffTimeStr("");
}
}
} else if (TypeEnum.自由工时.getValue() == attendanceGroupEntity.getType()) {
}
else if (TypeEnum.自由工时.getValue() == attendanceGroupEntity.getType()) {
} else if (TypeEnum.排班制.getValue() == attendanceGroupEntity.getType()) {
......@@ -152,13 +157,13 @@ public class PerformAttendRecordServiceImpl extends AbstractCRUDServiceImpl<Perf
String goWorkStr = "";
String offWorkStr = "";
if (!ObjectUtils.isEmpty(classDetailEntity.getGoWorkDate())) {
goWorkStr = DateUtil.formatTime(classDetailEntity.getGoWorkDate());
goWorkStr = DateUtil.format(classDetailEntity.getGoWorkDate(),"HH:mm");
}
if (!ObjectUtils.isEmpty(classDetailEntity.getOffWorkDate())) {
offWorkStr = DateUtil.formatTime(classDetailEntity.getOffWorkDate());
offWorkStr = DateUtil.format(classDetailEntity.getOffWorkDate(),"HH:mm");
}
goOffWorkSb.append(goWorkStr);
goOffWorkSb.append("~~");
goOffWorkSb.append("~");
goOffWorkSb.append(offWorkStr);
goOffWorkSb.append(" \n");
}
......
attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/service/impl/PerformComplainRecordServiceImpl.java
View file @ 5e1068eb
......@@ -45,25 +45,30 @@ public class PerformComplainRecordServiceImpl extends AbstractCRUDServiceImpl<Pe
@Override
protected void saveBefore(PerformComplainRecordEntity entity, Context context) throws AppException {
updateStaffRuleNames(entity);
updateStaffRuleNames(entity,context);
}
@Override
protected void updateBefore(PerformComplainRecordEntity entity, Context context) throws AppException {
updateStaffRuleNames(entity);
updateStaffRuleNames(entity,context);
}
private void updateStaffRuleNames(PerformComplainRecordEntity entity) {
private void updateStaffRuleNames(PerformComplainRecordEntity entity, Context context) {
if (!ObjectUtils.isEmpty(entity.getRuleId())) {
PerformRulesEntity rulesEntity = rulesService.getCache(entity.getRuleId().toString());
entity.setRuleName(rulesEntity.getName());
entity.setSubAddType(rulesEntity == null ? 2 : rulesEntity.getSubAddType());
}
if (!ObjectUtils.isEmpty(entity.getStaffId())) {
StaffEntity staffCache = staffService.getCache(entity.getStaffId().toString());
entity.setStaffName(staffCache == null ? "" : staffCache.getName());
entity.setDeptName(staffCache == null ? "" : staffCache.getDeptName());
}
entity.setDeductTime(new Date());
entity.setDeductPerson(context == null ? "" : context.getUser() == null ? "" : context.getUser().getRealName());
}
@Override
......
attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/service/impl/PerformEffectRecordServiceImpl.java
View file @ 5e1068eb
......@@ -45,25 +45,29 @@ public class PerformEffectRecordServiceImpl extends AbstractCRUDServiceImpl<Perf
@Override
protected void saveBefore(PerformEffectRecordEntity entity, Context context) throws AppException {
updateStaffRuleNames(entity);
updateStaffRuleNames(entity,context);
}
@Override
protected void updateBefore(PerformEffectRecordEntity entity, Context context) throws AppException {
updateStaffRuleNames(entity);
updateStaffRuleNames(entity,context);
}
private void updateStaffRuleNames(PerformEffectRecordEntity entity) {
private void updateStaffRuleNames(PerformEffectRecordEntity entity, Context context) {
if (!ObjectUtils.isEmpty(entity.getRuleId())) {
PerformRulesEntity rulesEntity = rulesService.getCache(entity.getRuleId().toString());
entity.setRuleName(rulesEntity.getName());
entity.setSubAddType(rulesEntity == null ? 1 : rulesEntity.getSubAddType());
}
if (!ObjectUtils.isEmpty(entity.getStaffId())) {
StaffEntity staffCache = staffService.getCache(entity.getStaffId().toString());
entity.setStaffName(staffCache == null ? "" : staffCache.getName());
entity.setDeptName(staffCache == null ? "" : staffCache.getDeptName());
}
entity.setDeductTime(new Date());
entity.setDeductPerson(context == null ? "" : context.getUser() == null ? "" : context.getUser().getRealName());
}
@Override
......
attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/service/impl/PerformGoworkRecordServiceImpl.java
View file @ 5e1068eb
......@@ -44,25 +44,29 @@ public class PerformGoworkRecordServiceImpl extends AbstractCRUDServiceImpl<Perf
@Override
protected void saveBefore(PerformGoworkRecordEntity entity, Context context) throws AppException {
updateStaffRuleNames(entity);
updateStaffRuleNames(entity,context);
}
@Override
protected void updateBefore(PerformGoworkRecordEntity entity, Context context) throws AppException {
updateStaffRuleNames(entity);
updateStaffRuleNames(entity,context);
}
private void updateStaffRuleNames(PerformGoworkRecordEntity entity) {
private void updateStaffRuleNames(PerformGoworkRecordEntity entity, Context context) {
if (!ObjectUtils.isEmpty(entity.getRuleId())) {
PerformRulesEntity rulesEntity = rulesService.getCache(entity.getRuleId().toString());
entity.setRuleName(rulesEntity.getName());
entity.setSubAddType(rulesEntity == null ? 1 : rulesEntity.getSubAddType());
}
if (!ObjectUtils.isEmpty(entity.getStaffId())) {
StaffEntity staffCache = staffService.getCache(entity.getStaffId().toString());
entity.setStaffName(staffCache == null ? "" : staffCache.getName());
entity.setDeptName(staffCache == null ? "" : staffCache.getDeptName());
}
entity.setDeductTime(new Date());
entity.setDeductPerson(context == null ? "" : context.getUser() == null ? "" : context.getUser().getRealName());
}
@Override
......
attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/service/impl/PerformOtherRecordServiceImpl.java
View file @ 5e1068eb
......@@ -44,25 +44,30 @@ public class PerformOtherRecordServiceImpl extends AbstractCRUDServiceImpl<Perfo
@Override
protected void saveBefore(PerformOtherRecordEntity entity, Context context) throws AppException {
updateStaffRuleNames(entity);
updateStaffRuleNames(entity,context);
}
@Override
protected void updateBefore(PerformOtherRecordEntity entity, Context context) throws AppException {
updateStaffRuleNames(entity);
updateStaffRuleNames(entity,context);
}
private void updateStaffRuleNames(PerformOtherRecordEntity entity) {
private void updateStaffRuleNames(PerformOtherRecordEntity entity, Context context) {
if (!ObjectUtils.isEmpty(entity.getRuleId())) {
PerformRulesEntity rulesEntity = rulesService.getCache(entity.getRuleId().toString());
entity.setRuleName(rulesEntity.getName());
entity.setSubAddType(rulesEntity == null ? 1 : rulesEntity.getSubAddType());
}
if (!ObjectUtils.isEmpty(entity.getStaffId())) {
StaffEntity staffCache = staffService.getCache(entity.getStaffId().toString());
entity.setStaffName(staffCache == null ? "" : staffCache.getName());
entity.setDeptName(staffCache == null ? "" : staffCache.getDeptName());
}
entity.setDeductTime(new Date());
entity.setDeductPerson(context == null ? "" : context.getUser() == null ? "" : context.getUser().getRealName());
}
@Override
......
attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/service/impl/PerformReviewRecordServiceImpl.java
View file @ 5e1068eb
......@@ -45,25 +45,29 @@ public class PerformReviewRecordServiceImpl extends AbstractCRUDServiceImpl<Perf
@Override
protected void saveBefore(PerformReviewRecordEntity entity, Context context) throws AppException {
updateStaffRuleNames(entity);
updateStaffRuleNames(entity, context);
}
@Override
protected void updateBefore(PerformReviewRecordEntity entity, Context context) throws AppException {
updateStaffRuleNames(entity);
updateStaffRuleNames(entity, context);
}
private void updateStaffRuleNames(PerformReviewRecordEntity entity) {
private void updateStaffRuleNames(PerformReviewRecordEntity entity, Context context) {
if (!ObjectUtils.isEmpty(entity.getRuleId())) {
PerformRulesEntity rulesEntity = rulesService.getCache(entity.getRuleId().toString());
entity.setRuleName(rulesEntity.getName());
entity.setSubAddType(rulesEntity == null ? 1 : rulesEntity.getSubAddType());
}
if (!ObjectUtils.isEmpty(entity.getStaffId())) {
StaffEntity staffCache = staffService.getCache(entity.getStaffId().toString());
entity.setStaffName(staffCache == null ? "" : staffCache.getName());
entity.setDeptName(staffCache == null ? "" : staffCache.getDeptName());
}
entity.setDeductTime(new Date());
entity.setDeductPerson(context == null ? "" : context.getUser() == null ? "" : context.getUser().getRealName());
}
@Override
......
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