修改固定班次考勤

attendance-performance-manager-ui/admin/src/views/attendance/record/error/list.vue

@@ -54,7 +54,7 @@
                     }
                 })
                 this.$nextTick(() => {
-                  this.selection = arr.map(item => item.id)  
+                  this.selection = arr.map(item => item.id)
                 })
                 if(arr.length < 1){
                     this.$message.error('请至少选择一条处理')
@@ -149,7 +149,7 @@
                         {label: "员工姓名", prop: "staffName",fixed:'left',width:100},
                         {label: "工号", prop: "workNum"},
                         {label: "部门", prop: "deptName"},
-                        {label: "考勤组", prop: "deptName"},
+                        {label: "考勤组", prop: "attendanceGroupName"},
                         {label: "班次", prop: "shiftsName"},
                         {label: "异常状态", prop: "errorStatus",formatter: this.formattereErrorStatus},
                         {label: "异常时间", prop: "errorDateTime", formatter: this.formatterDate},
@@ -175,7 +175,7 @@
                                 }else{
                                     return (
                                         <span>
-                                            
+
                                             <el-button type="text" size='mini' onClick={() => {
                                                 this.reCancle(row)
                                             }}>撤销</el-button>
@@ -192,4 +192,4 @@
             }
         }
     }
-</script>
+</script>
\ No newline at end of file

attendance-performance-manager-ui/admin/src/views/attendance/record/list.vue

@@ -498,12 +498,11 @@ export default {
           { label: "员工工号", prop: "workNum" },
           {
             label: "考勤组",
-            prop: "attendanceGroupName",
-            formatter: this.formatters,
+            prop: "attendanceGroupName"
           },
-          { label: "部门", prop: "deptName", formatter: this.formatters },
-          { label: "职位", prop: "positionName", formatter: this.formatters },
-          { label: "班次", prop: "shiftsName", formatter: this.formatters },
+          { label: "部门", prop: "deptName" },
+          { label: "职位", prop: "positionName"},
+          { label: "班次", prop: "classId", formatter: this.formatter },
           {
             label: "签到结果",
             prop: "signInResult",

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

@@ -39,28 +39,24 @@ public class AttendanceRecordErrorServiceImpl extends AbstractCRUDServiceImpl<At
     protected void findAfter(AttendanceRecordErrorEntity params, PageInfo pageInfo, Context context, List<AttendanceRecordErrorEntity> list) throws AppException {
 
         list.forEach(item -> {
-            AttendanceClassEntity attendanceClassEntity = attendanceClassService.get(item.getShiftsId(), context);
+            AttendanceClassDetailEntity attendanceClassDetailEntity = classDetailService.get(item.getShiftsId(), context);
 
-            if(!ObjectUtils.isEmpty(attendanceClassEntity)&&!ObjectUtils.isEmpty(attendanceClassEntity.getAttendanceClassDetailList())){
-                for (AttendanceClassDetailEntity attendanceClassDetailEntity : attendanceClassEntity.getAttendanceClassDetailList()) {
-                    if (!ObjectUtils.isEmpty(attendanceClassDetailEntity)) {
-                        String str = DateUtil.formatTime(item.getGoOffDateTime());
-                        String goStr = DateUtil.formatTime(attendanceClassDetailEntity.getGoWorkDate());
-                        String offStr = DateUtil.formatTime(attendanceClassDetailEntity.getOffWorkDate());
+            if (!ObjectUtils.isEmpty(attendanceClassDetailEntity)) {
+                String str = DateUtil.formatTime(item.getGoOffDateTime());
+                String goStr = DateUtil.formatTime(attendanceClassDetailEntity.getGoWorkDate());
+                String offStr = DateUtil.formatTime(attendanceClassDetailEntity.getOffWorkDate());
 
-                        if (!ObjectUtils.isEmpty(str)&&str.equals(goStr)) {
-                            item.setGoOrOff("上班");
-                        }
-                        if (!ObjectUtils.isEmpty(str)&&str.equals(offStr)) {
-                            item.setGoOrOff("下班");
-                        }
-                        if (ObjectUtils.isEmpty(item.getGoOrOff())) {
-                            item.setGoOrOff("上班");
-                        }
-                    }
+                if (!ObjectUtils.isEmpty(str) && str.equals(goStr)) {
+                    item.setGoOrOff("上班");
                 }
-            }else {
-                item.setGoOrOff("上班");
+                if (!ObjectUtils.isEmpty(str) && str.equals(offStr)) {
+                    item.setGoOrOff("下班");
+                }
+                if (ObjectUtils.isEmpty(item.getGoOrOff())) {
+                    item.setGoOrOff("");
+                }
+            } else {
+                item.setGoOrOff("");
             }
         });
     }