合并分支 'gwj' 到 'master'

notes-attendance/src/main/java/com/zjty/tynotes/attendance/entity/exl/DepartmentExl.java

@@ -35,6 +35,26 @@ public class DepartmentExl {
     @Excel(name = "出差天数", orderNum = "7", width = 20)
     private Float outWorkDay;
 
-    @Excel(name = "请假天数", orderNum = "8", width = 20)
-    private Float offFromWorkDay;
+    @Excel(name = "病假天数", orderNum = "8", width = 20)
+    private Float sickLeaveDay;
+
+    @Excel(name = "事假天数", orderNum = "9", width = 20)
+    private Integer thingLeaveDay;
+
+    @Excel(name = "旷工天数", orderNum = "10", width = 20)
+    private Float absenteeismDay;
+
+    @Excel(name = "迟到15分钟", orderNum = "11", width = 20)
+    private Integer lateOne;
+
+    @Excel(name = "迟到一小时", orderNum = "12", width = 20)
+    private Integer lateTwo;
+
+    @Excel(name = "迟到半天", orderNum = "13", width = 20)
+    private Integer lateThree;
+
+    @Excel(name = "迟到一天", orderNum = "14", width = 20)
+    private Integer lateFour;
+
+
 }

notes-attendance/src/main/java/com/zjty/tynotes/attendance/entity/vo/UserAttenVo.java

@@ -55,6 +55,9 @@ public class UserAttenVo {
     @ApiModelProperty(value = "病假天数",example = "1")
     private Float sickLeaveDay;
 
+    @ApiModelProperty(value = "事假天数",example = "1")
+    private Float thingDay;
+
     @ApiModelProperty(value = "加班时长",example = "1")
     private Integer overWorkHours;
 
@@ -73,6 +76,7 @@ public class UserAttenVo {
         this.leaveEarlyDay = 0;
         this.outWorkDay = 0f;
         this.sickLeaveDay = 0f;
+        this.thingDay = 0f;
         this.overWorkHours = 0;
         this.absenteeismDay = 0f;
     }

notes-attendance/src/main/java/com/zjty/tynotes/attendance/service/impl/AttendanceDetailsServiceImpl.java

@@ -83,6 +83,9 @@ public class AttendanceDetailsServiceImpl implements AttendanceDetailsService {
                     if(attendanceDetails.getSickLeaveDay()!=null){
                         userAttenVo.setSickLeaveDay(userAttenVo.getSickLeaveDay()+attendanceDetails.getSickLeaveDay());
                     }
+                    if(attendanceDetails.getThingLeaveDay()!=null){
+                        userAttenVo.setThingDay(userAttenVo.getThingDay()+attendanceDetails.getThingLeaveDay());
+                    }
                     if(("0").equals(attendanceDetails.getIsLateDay())){
                         if(attendanceDetails.getLateStatus().equals("0")){
                             userAttenVo.setLateOne(userAttenVo.getLateOne()+1);