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

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

@@ -85,6 +85,7 @@ public class AttendanceRecordErrorController extends BaseCRUDJsonBodyMappingCont
     @Override
     protected void init(Map<String, Object> model, Context context) {
         this.addDict(model, "errorStatus", ErrorStatusEnum.getEnumMap());
+        this.addDict(model, "processResult", ErrorStatusEnum.getEnumMap());
         this.addDict(model, "processStatus", paramService.getParamBySecondOrganize("AttendanceRecordError", "processStatus"));
         this.addDict(model, "deptId", deptService.find(new DeptQuery()).stream().collect(Collectors.toMap(x -> x.getId().toString(), y -> y.getDeptName())));
         this.addDict(model, "groupId", attendanceGroupService.find(new AttendanceGroupQuery()).stream().collect(Collectors.toMap(x -> x.getId().toString(), y -> y.getGroupName())));

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

@@ -72,15 +72,15 @@
             ANY_VALUE(DATE_FORMAT(errorDateTime,'%Y')) as `year`,
             ANY_VALUE(DATE_FORMAT(errorDateTime,'%m')) as `month`,
             ANY_VALUE(DATE_FORMAT(errorDateTime,'%d')) as `day`,
-            sum(case errorStatus when 0 then 1 ELSE 0 end) as morningTimes,
-            sum(case errorStatus when 0 then 1 ELSE 0 end) as afternoonTimes,
-            sum(case errorStatus when 1 then 1 ELSE 0 end) as overtimeTimes,
-            sum(case errorStatus when 2 then 1 ELSE 0 end) as lateTimes
+            sum(case processResult when 0 then 1 ELSE 0 end) as morningTimes,
+            sum(case processResult when 0 then 1 ELSE 0 end) as afternoonTimes,
+            sum(case processResult when 1 then 1 ELSE 0 end) as overtimeTimes,
+            sum(case processResult when 2 then 1 ELSE 0 end) as lateTimes
         from
             mortals_xhx_attendance_record_error e
         where
             processStatus = 1
-            and errorStatus != 4
+            and processResult != 4
             and e.errorDateTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{summaryTime},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
             and e.errorDateTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{summaryTime},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
         group by