Merge branch 'master' of http://gitlab.scsmile.cn/zxf/attendance-performance-platform

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

@@ -223,6 +223,8 @@ public class AttendanceStatEntity extends AttendanceStatVo {
      * 手机号码
      */
     private String phoneNumer;
+    @Excel(name = "应到天数")
+    private Integer workDays;
     /**
      * 出勤天数
      */

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

@@ -11,6 +11,7 @@
         s.deptId,
         s.deptName,
         s.phoneNumer,
+        count(1) as workDays,
         ROUND(IFNULL(sum(s.goTimes),0)/count(1),4) as attendanceRate,
         sum(s.goTimes) AS goTimes,
         sum(s.morningTimes) AS morningTimes,