Merge remote-tracking branch 'origin/master'

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

@@ -57,4 +57,8 @@ public class ErrorSummaryVo {
 
     /** 异常次数 **/
     private Integer errorCount;
+    /**
+     * 入职时间
+     */
+    private Date entryDate;
 }

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

@@ -54,4 +54,8 @@ public class LeaveSummaryVo {
      * 离职时间
      */
     private Date leaveDate;
+    /**
+     * 入职时间
+     */
+    private Date entryDate;
 }

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

 package com.mortals.xhx.module.attendance.model.vo;
 
+import com.mortals.framework.annotation.Excel;
 import lombok.Data;
 
 import java.math.BigDecimal;
@@ -138,6 +139,10 @@ public class VacationBalanceSummaryVo {
      * 离职时间
      */
     private Date leaveDate;
+    /**
+     * 入职时间
+     */
+    private Date entryDate;
     /**
      * 所属大厅
      */

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

@@ -245,6 +245,11 @@ public class AttendanceStatServiceImpl extends AbstractCRUDServiceImpl<Attendanc
                 List<AttendanceStaffStatEntity> addStaffStat = new ArrayList<>();
                 List<AttendanceStaffStatEntity> updateStaffStat = new ArrayList<>();
                 for (VacationBalanceSummaryVo item : vacationBalanceSummaryVoList) {
+                    String entryDateStr = DateUtils.getStrDate(item.getEntryDate());
+                    if(DateUtils.StrToDate(query.getSummaryTime()).compareTo(DateUtils.StrToDate(entryDateStr)) < 0){
+                        //统计日期在入职日期之前不统计
+                        continue;
+                    }
                     if(item.getStatus() == StaffSatusEnum.离职.getValue()){
                         //离职状态时判断当前汇总日期是否在离职后
                         if(item.getLeaveDate()!=null){

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

@@ -296,6 +296,7 @@ public class StaffServiceImpl extends AbstractCRUDCacheServiceImpl<StaffDao, Sta
                         staffLeaveEntity.setJobName(staff.getPositionName());
                         staffLeaveEntity.setStaffType(staff.getStaffType());
                         staffLeaveEntity.setStatus(StaffSatusEnum.离职.getValue());
+                        staffLeaveEntity.setEntryDate(staff.getCreateTime());
                         staffLeaveEntity.setLeaveDate(new Date());
                         staffLeaveEntity.setLeaveReason("");
                         staffLeaveEntity.setAuditStatus(AuditStatusEnum.通过.getValue());

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

@@ -15,6 +15,7 @@
             s.salaId,
             s.salaName,
             s.`status`,
+            s.createTime AS entryDate,
             s.leaveDate,
             DATE_FORMAT(STR_TO_DATE(#{summaryTime},'%Y-%m-%d'),'%Y') as `year`,
             DATE_FORMAT(STR_TO_DATE(#{summaryTime},'%Y-%m-%d'),'%m') as `month`,
@@ -63,6 +64,7 @@
             r.leavePersonId AS staffId,
             r.leavePerson AS staffName,
             ANY_VALUE(s.`status`) as `status`,
+            ANY_VALUE(s.createTime) AS entryDate,
             ANY_VALUE(s.leaveDate) as leaveDate,
             r.leaveType,
             IFNULL(sum(r.duration),0) as duration,
@@ -89,6 +91,7 @@
             e.staffId,
             e.workNum,
             ANY_VALUE(s.`status`) as `status`,
+            ANY_VALUE(s.createTime) AS entryDate,
             ANY_VALUE(s.leaveDate) as leaveDate,
             ANY_VALUE(DATE_FORMAT(errorDateTime,'%Y')) as `year`,
             ANY_VALUE(DATE_FORMAT(errorDateTime,'%m')) as `month`,