Commit abb3f7cf authored by 廖旭伟's avatar 廖旭伟

修改考勤汇总情况描述

parent 0b5188d1
...@@ -432,7 +432,7 @@ public class AttendanceStatServiceImpl extends AbstractCRUDServiceImpl<Attendanc ...@@ -432,7 +432,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);
...@@ -634,7 +634,11 @@ public class AttendanceStatServiceImpl extends AbstractCRUDServiceImpl<Attendanc ...@@ -634,7 +634,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