若尔盖考勤汇总导表需求

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

@@ -73,7 +73,7 @@ public class AttendanceStatEntity extends AttendanceStatVo {
     /**
      * 上午缺卡次数
      */
-    @Excel(name = "缺卡次数")
+    @Excel(name = "考勤汇总-未按规定打卡(缺卡次数(次))",sort = 9)
     private Integer morningTimes;
     /**
      * 下午缺卡次数
@@ -173,7 +173,7 @@ public class AttendanceStatEntity extends AttendanceStatVo {
     /**
      * 考勤汇总-未按规定打卡（含忘记打卡）
      */
-    @Excel(name = "考勤汇总-未按规定打卡(缺卡次数(次))",sort = 9)
+    //@Excel(name = "考勤汇总-未按规定打卡(缺卡次数(次))",sort = 9)
     private BigDecimal nonCompliancePunch;
     /**
      * 考勤汇总-迟到（次）

attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/web/AttendanceStatController.java

@@ -340,21 +340,21 @@ public class AttendanceStatController extends BaseCRUDJsonBodyMappingController<
         if(isNull(entity.getNonCompliancePunch())){
             entity.setNonCompliancePunch(null);
         }
-        if(entity.getLateTimes()!=null && entity.getLateTimes()==0){
-            entity.setLateTimes(null);
-        }
-        if(entity.getSurfingMobileTimes()!=null && entity.getSurfingMobileTimes()==0){
-            entity.setSurfingMobileTimes(null);
-        }
-        if(entity.getOvertimeTimes()!=null && entity.getOvertimeTimes()==0){
-            entity.setOvertimeTimes(null);
-        }
+//        if(entity.getLateTimes()!=null && entity.getLateTimes()==0){
+//            entity.setLateTimes(null);
+//        }
+//        if(entity.getSurfingMobileTimes()!=null && entity.getSurfingMobileTimes()==0){
+//            entity.setSurfingMobileTimes(null);
+//        }
+//        if(entity.getOvertimeTimes()!=null && entity.getOvertimeTimes()==0){
+//            entity.setOvertimeTimes(null);
+//        }
         if(isNull(entity.getVacancy())){
             entity.setVacancy(null);
         }
-        if(entity.getNonStandardDressTimes()!=null && entity.getNonStandardDressTimes()==0){
-            entity.setNonStandardDressTimes(null);
-        }
+//        if(entity.getNonStandardDressTimes()!=null && entity.getNonStandardDressTimes()==0){
+//            entity.setNonStandardDressTimes(null);
+//        }
         if(isNull(entity.getUnexcusedMeetingAbsence())){
             entity.setUnexcusedMeetingAbsence(null);
         }

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

@@ -16,7 +16,7 @@
         count(1) as workDays,
         sum(s.goWorks) AS goWorks,
         ROUND(IFNULL(sum(s.goWorks),0)/count(1),4) as attendanceRate,
-        count(1)*4 as sumCheck,
+        sum(4-s.morningTimes-s.lateTimes-s.overtimeTimes) as sumCheck,
         sum(s.goTimes) AS goTimes,
         sum(s.morningTimes) AS morningTimes,
         sum(s.afternoonTimes) AS afternoonTimes,
@@ -45,12 +45,12 @@
         sum(s.otherDays) AS otherDays,
         sum(s.nonCompliancePunch) AS nonCompliancePunch,
         sum(s.surfingMobileTimes) AS surfingMobileTimes,
-        sum(s.overtimeTimes) AS overtimeTimes,
+        sum(IFNULL(s.overtimeTimes,0)) AS overtimeTimes,
         sum(s.vacancy) AS vacancy,
         sum(s.nonStandardDressTimes) AS nonStandardDressTimes,
         sum(s.unexcusedMeetingAbsence) AS unexcusedMeetingAbsence,
         sum(s.earlyLeaveMeeting) AS earlyLeaveMeeting,
-        sum(s.lateTimes) AS lateTimes,
+        sum(IFNULL(s.lateTimes,0)) AS lateTimes,
         sum(s.leaveTime) AS leaveTime
         FROM
         mortals_xhx_attendance_stat s
@@ -91,7 +91,7 @@
         count(1) as workDays,
         sum(s.goWorks) AS goWorks,
         ROUND(IFNULL(sum(s.goWorks),0)/count(1),4) as attendanceRate,
-        count(1)*4 as sumCheck,
+        sum(4-s.morningTimes-s.lateTimes-s.overtimeTimes) as sumCheck,
         sum(s.goTimes) AS goTimes,
         sum(s.morningTimes) AS morningTimes,
         sum(s.afternoonTimes) AS afternoonTimes,
@@ -120,12 +120,12 @@
         sum(s.otherDays) AS otherDays,
         sum(s.nonCompliancePunch) AS nonCompliancePunch,
         sum(s.surfingMobileTimes) AS surfingMobileTimes,
-        sum(s.overtimeTimes) AS overtimeTimes,
+        sum(IFNULL(s.overtimeTimes,0)) AS overtimeTimes,
         sum(s.vacancy) AS vacancy,
         sum(s.nonStandardDressTimes) AS nonStandardDressTimes,
         sum(s.unexcusedMeetingAbsence) AS unexcusedMeetingAbsence,
         sum(s.earlyLeaveMeeting) AS earlyLeaveMeeting,
-        sum(s.lateTimes) AS lateTimes,
+        sum(IFNULL(s.lateTimes,0)) AS lateTimes,
         sum(s.leaveTime) AS leaveTime
         FROM
         mortals_xhx_attendance_stat s