考勤汇总bug修改

attendance-performance-manager/src/main/java/com/mortals/xhx/daemon/task/AttendanceSummaryTaskImpl.java

@@ -40,7 +40,7 @@ public class AttendanceSummaryTaskImpl  implements ITaskExcuteService {
 
         AttendanceSummaryQuery query = new AttendanceSummaryQuery();
         query.setSummaryTimeEnd(DateUtils.getStrDate(now.getTime()));
-        now.add(Calendar.DAY_OF_MONTH, -10);
+        //now.add(Calendar.DAY_OF_MONTH, -10);
         query.setSummaryTimeStart(DateUtils.getStrDate(now.getTime()));
         log.info("考勤汇总时间:"+DateUtils.getDateTime(now.getTime(),"yyyy-MM-dd HH:mm:ss"));
         //重新汇总最近10天的考勤数据

attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/model/vo/ErrorSummaryVo.java

@@ -17,6 +17,10 @@ public class ErrorSummaryVo {
      * 员工姓名
      */
     private String staffName;
+    /**
+     * 工号
+     */
+    private String workNum;
     /**
      * 年
      */

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

@@ -320,13 +320,16 @@ public class AttendanceStatServiceImpl extends AbstractCRUDServiceImpl<Attendanc
                         }
                     }
                     AttendanceStatEntity temp = this.selectOne(new AttendanceStatQuery().staffId(item.getStaffId()).year(item.getYear()).month(item.getMonth()).day(item.getDay()));
+                    String staffName ="";
                     if (temp != null) {
+                        staffName = temp.getStaffName();
                         BeanUtils.copyProperties(item, temp, BeanUtil.getNullPropertyNames(item));
                         temp.setGoTimes(0);     //默认只要有异常考勤，当天就不算全勤
                         if (item.getMorningTimes() > 0) {
                             temp.setNonCompliancePunch(new BigDecimal(item.getMorningTimes()));
                         }
                         //this.dao.update(temp);
+                        temp.setStaffName(staffName);
                         updateList.add(temp);
                     }
                     String attendanceSummary = "";
@@ -360,6 +363,7 @@ public class AttendanceStatServiceImpl extends AbstractCRUDServiceImpl<Attendanc
                             staffStat.setRemark(JSON.toJSONString(detailEntities));
                         }
                     }
+                    staffStat.setStaffName(staffName);
                     AttendanceStaffStatEntity staffStatTemp = attendanceStaffStatService.selectOne(new AttendanceStaffStatQuery().staffId(item.getStaffId()).year(item.getYear()).month(item.getMonth()).day(item.getDay()));
                     if (staffStatTemp != null) {
                         staffStat.setId(staffStatTemp.getId());
@@ -408,7 +412,9 @@ public class AttendanceStatServiceImpl extends AbstractCRUDServiceImpl<Attendanc
                     }
                     String attendanceSummary = "";
                     AttendanceStatEntity temp = this.selectOne(new AttendanceStatQuery().staffId(item.getStaffId()).year(item.getYear()).month(item.getMonth()).day(item.getDay()));
+                    String staffName ="";
                     if (temp != null) {
+                        staffName = temp.getStaffName();
                         BigDecimal leaveTime = new BigDecimal(item.getDuration()).divide(day, 1, BigDecimal.ROUND_HALF_DOWN);
                         String endStr = DateUtils.getStrDate(item.getEndTime());
                         String dayStr = query.getSummaryTime();
@@ -510,6 +516,7 @@ public class AttendanceStatServiceImpl extends AbstractCRUDServiceImpl<Attendanc
                                 break;
                         }
                         //this.dao.update(temp);
+                        temp.setStaffName(staffName);
                         updateList.add(temp);
                     }
 
@@ -518,6 +525,7 @@ public class AttendanceStatServiceImpl extends AbstractCRUDServiceImpl<Attendanc
                     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());

attendance-performance-manager/src/main/resources/sqlmap/module/attendance/AttendanceSummaryMapper.xml

@@ -74,7 +74,7 @@
     <select id="getErrorSummary" parameterType="com.mortals.xhx.module.attendance.model.vo.AttendanceSummaryQuery" resultType="com.mortals.xhx.module.attendance.model.vo.ErrorSummaryVo">
         select
             e.staffId,
-            e.staffName,
+            e.workNum,
             ANY_VALUE(s.`status`) as `status`,
             ANY_VALUE(s.leaveDate) as leaveDate,
             ANY_VALUE(DATE_FORMAT(errorDateTime,'%Y')) as `year`,
@@ -93,7 +93,7 @@
         <if test="staffId != null and staffId!=''"> AND e.staffId = #{staffId}</if>
         group by
             e.staffId,
-            e.staffName,
+            e.workNum,
             DATE_FORMAT(errorDateTime,'%Y-%m-%d')
     </select>
 </mapper>
\ No newline at end of file