Skip to content

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

Merge remote-tracking branch 'origin/master'

parents c8583e92 ea0a26e7
Hide whitespace changes
Inline Side-by-side
Showing with 39 additions and 32 deletions
attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/service/impl/AttendanceStatServiceImpl.java
View file @ 21341d07
...@@ -262,17 +262,18 @@ public class AttendanceStatServiceImpl extends AbstractCRUDServiceImpl<Attendanc ...@@ -262,17 +262,18 @@ public class AttendanceStatServiceImpl extends AbstractCRUDServiceImpl<Attendanc
continue; continue;
} }
if(item.getStatus() == StaffSatusEnum.离职.getValue()){ if(item.getStatus() == StaffSatusEnum.离职.getValue()){
continue;
//离职状态时判断当前汇总日期是否在离职后 //离职状态时判断当前汇总日期是否在离职后
if(item.getLeaveDate()!=null){ // if(item.getLeaveDate()!=null){
String leaveDateStr = DateUtils.getStrDate(item.getLeaveDate()); // String leaveDateStr = DateUtils.getStrDate(item.getLeaveDate());
if(DateUtils.StrToDate(leaveDateStr).compareTo(DateUtils.StrToDate(query.getSummaryTime())) < 0){ // if(DateUtils.StrToDate(leaveDateStr).compareTo(DateUtils.StrToDate(query.getSummaryTime())) < 0){
//离职日期在统计日期之前不统计 // //离职日期在统计日期之前不统计
continue; // continue;
} // }
}else { // }else {
//没有离职日期也不统计 // //没有离职日期也不统计
continue; // continue;
} // }
} }
AttendanceStatEntity temp = this.selectOne(new AttendanceStatQuery().staffId(item.getStaffId()).year(item.getYear()).month(item.getMonth()).day(item.getDay())); AttendanceStatEntity temp = this.selectOne(new AttendanceStatQuery().staffId(item.getStaffId()).year(item.getYear()).month(item.getMonth()).day(item.getDay()));
...@@ -380,17 +381,18 @@ public class AttendanceStatServiceImpl extends AbstractCRUDServiceImpl<Attendanc ...@@ -380,17 +381,18 @@ public class AttendanceStatServiceImpl extends AbstractCRUDServiceImpl<Attendanc
List<AttendanceStaffStatEntity> updateStaffStat = new ArrayList<>(); List<AttendanceStaffStatEntity> updateStaffStat = new ArrayList<>();
for (ErrorSummaryVo item : errorSummaryVoList) { for (ErrorSummaryVo item : errorSummaryVoList) {
if(item.getStatus() == StaffSatusEnum.离职.getValue()){ if(item.getStatus() == StaffSatusEnum.离职.getValue()){
continue;
//离职状态时判断当前汇总日期是否在离职后 //离职状态时判断当前汇总日期是否在离职后
if(item.getLeaveDate()!=null){ // if(item.getLeaveDate()!=null){
String leaveDateStr = DateUtils.getStrDate(item.getLeaveDate()); // String leaveDateStr = DateUtils.getStrDate(item.getLeaveDate());
if(DateUtils.StrToDate(leaveDateStr).compareTo(DateUtils.StrToDate(query.getSummaryTime())) < 0){ // if(DateUtils.StrToDate(leaveDateStr).compareTo(DateUtils.StrToDate(query.getSummaryTime())) < 0){
//离职日期在统计日期之前不统计 // //离职日期在统计日期之前不统计
continue; // continue;
} // }
}else { // }else {
//没有离职日期也不统计 // //没有离职日期也不统计
continue; // continue;
} // }
} }
AttendanceStatEntity temp = this.selectOne(new AttendanceStatQuery().staffId(item.getStaffId()).year(item.getYear()).month(item.getMonth()).day(item.getDay())); AttendanceStatEntity temp = this.selectOne(new AttendanceStatQuery().staffId(item.getStaffId()).year(item.getYear()).month(item.getMonth()).day(item.getDay()));
String staffName =""; String staffName ="";
...@@ -432,7 +434,7 @@ public class AttendanceStatServiceImpl extends AbstractCRUDServiceImpl<Attendanc ...@@ -432,7 +434,7 @@ public class AttendanceStatServiceImpl extends AbstractCRUDServiceImpl<Attendanc
staffStat.initAttrValue(); staffStat.initAttrValue();
BeanUtils.copyProperties(item, staffStat, BeanUtil.getNullPropertyNames(item)); BeanUtils.copyProperties(item, staffStat, BeanUtil.getNullPropertyNames(item));
if(normal>0){ if(normal>0){
attendanceSummary = "正常*"+normal + "次;" + attendanceSummary; attendanceSummary = "正常*"+ normal + "次;" + attendanceSummary;
} }
staffStat.setAttendanceSummary(attendanceSummary); staffStat.setAttendanceSummary(attendanceSummary);
...@@ -499,17 +501,18 @@ public class AttendanceStatServiceImpl extends AbstractCRUDServiceImpl<Attendanc ...@@ -499,17 +501,18 @@ public class AttendanceStatServiceImpl extends AbstractCRUDServiceImpl<Attendanc
BigDecimal oneDay = new BigDecimal(1); BigDecimal oneDay = new BigDecimal(1);
for (LeaveSummaryVo item : leaveSummaryVoList) { for (LeaveSummaryVo item : leaveSummaryVoList) {
if(item.getStatus() == StaffSatusEnum.离职.getValue()){ if(item.getStatus() == StaffSatusEnum.离职.getValue()){
continue;
//离职状态时判断当前汇总日期是否在离职后 //离职状态时判断当前汇总日期是否在离职后
if(item.getLeaveDate()!=null){ // if(item.getLeaveDate()!=null){
String leaveDateStr = DateUtils.getStrDate(item.getLeaveDate()); // String leaveDateStr = DateUtils.getStrDate(item.getLeaveDate());
if(DateUtils.StrToDate(leaveDateStr).compareTo(DateUtils.StrToDate(query.getSummaryTime())) < 0){ // if(DateUtils.StrToDate(leaveDateStr).compareTo(DateUtils.StrToDate(query.getSummaryTime())) < 0){
//离职日期在统计日期之前不统计 // //离职日期在统计日期之前不统计
continue; // continue;
} // }
}else { // }else {
//没有离职日期也不统计 // //没有离职日期也不统计
continue; // continue;
} // }
} }
String attendanceSummary = ""; String attendanceSummary = "";
AttendanceStatEntity temp = this.selectOne(new AttendanceStatQuery().staffId(item.getStaffId()).year(item.getYear()).month(item.getMonth()).day(item.getDay())); AttendanceStatEntity temp = this.selectOne(new AttendanceStatQuery().staffId(item.getStaffId()).year(item.getYear()).month(item.getMonth()).day(item.getDay()));
...@@ -634,7 +637,11 @@ public class AttendanceStatServiceImpl extends AbstractCRUDServiceImpl<Attendanc ...@@ -634,7 +637,11 @@ public class AttendanceStatServiceImpl extends AbstractCRUDServiceImpl<Attendanc
if (staffStatTemp != null) { if (staffStatTemp != null) {
staffStat.setId(staffStatTemp.getId()); staffStat.setId(staffStatTemp.getId());
staffStat.setUpdateTime(new Date()); staffStat.setUpdateTime(new Date());
staffStat.setAttendanceSummary(staffStatTemp.getAttendanceSummary() + attendanceSummary); if(staffStatTemp.getAttendanceSummary().equals("正常")){
staffStat.setAttendanceSummary(attendanceSummary);
}else {
staffStat.setAttendanceSummary(staffStatTemp.getAttendanceSummary() + attendanceSummary);
}
updateStaffStat.add(staffStat); updateStaffStat.add(staffStat);
} else { } else {
staffStat.setCreateTime(DateUtils.StrToDate(query.getSummaryTime())); staffStat.setCreateTime(DateUtils.StrToDate(query.getSummaryTime()));
......
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