修改考勤汇总情况描述

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

@@ -407,24 +407,33 @@ public class AttendanceStatServiceImpl extends AbstractCRUDServiceImpl<Attendanc
                         updateList.add(temp);
                     }
                     String attendanceSummary = "";
+                    int normal = 4; //正常次数
                     if (item.getMorningTimes() > 0) {
                         attendanceSummary += "缺卡*" + item.getMorningTimes() + "次;";
+                        normal= normal-item.getMorningTimes();
                     }
                     if (item.getLateTimes() > 0) {
                         attendanceSummary += "迟到*" + item.getLateTimes() + "次;";
+                        normal= normal-item.getLateTimes();
                     }
                     if (item.getOvertimeTimes() > 0) {
                         attendanceSummary += "早退*" + item.getOvertimeTimes() + "次;";
+                        normal= normal-item.getOvertimeTimes();
                     }
                     if (item.getLeaveHalfDay() > 0) {
                         attendanceSummary += "事假半天*" + item.getLeaveHalfDay() + "次;";
+                        normal = normal-2;
                     }
                     if (item.getLeaveDay() > 0) {
                         attendanceSummary += "事假全天*" + item.getLeaveDay() + "次;";
+                        normal = 0;
                     }
                     AttendanceStaffStatEntity staffStat = new AttendanceStaffStatEntity();
                     staffStat.initAttrValue();
                     BeanUtils.copyProperties(item, staffStat, BeanUtil.getNullPropertyNames(item));
+                    if(normal>0){
+                        attendanceSummary = "正常*"+normal + "次;" + attendanceSummary;
+                    }
                     staffStat.setAttendanceSummary(attendanceSummary);
 
                     if (!ObjectUtils.isEmpty(attendanceSummary)) {
@@ -535,7 +544,7 @@ public class AttendanceStatServiceImpl extends AbstractCRUDServiceImpl<Attendanc
                         if (leaveTypeEnum == null) {
                             leaveTypeEnum = LeaveTypeEnum.事假;  //默认为事假
                         }
-                        attendanceSummary = leaveTypeEnum.getDesc() + "*1";
+                        attendanceSummary = leaveTypeEnum.getDesc() + "*1次";
                         switch (leaveTypeEnum) {
                             case 事假:
                                 temp.setPersonalLeave(leaveTime);
@@ -620,16 +629,17 @@ public class AttendanceStatServiceImpl extends AbstractCRUDServiceImpl<Attendanc
                     AttendanceStaffStatEntity staffStat = new AttendanceStaffStatEntity();
                     staffStat.initAttrValue();
                     BeanUtils.copyProperties(item, staffStat, BeanUtil.getNullPropertyNames(item));
-                    staffStat.setAttendanceSummary(attendanceSummary);
                     AttendanceStaffStatEntity staffStatTemp = attendanceStaffStatService.selectOne(new AttendanceStaffStatQuery().staffId(item.getStaffId()).year(item.getYear()).month(item.getMonth()).day(item.getDay()));
                     staffStat.setStaffName(staffName);
                     if (staffStatTemp != null) {
                         staffStat.setId(staffStatTemp.getId());
                         staffStat.setUpdateTime(new Date());
+                        staffStat.setAttendanceSummary(staffStatTemp.getAttendanceSummary() + attendanceSummary);
                         updateStaffStat.add(staffStat);
                     } else {
                         staffStat.setCreateTime(DateUtils.StrToDate(query.getSummaryTime()));
                         staffStat.setCreateUserId(1l);
+                        staffStat.setAttendanceSummary(attendanceSummary);
                         addStaffStat.add(staffStat);
                     }
                 }