修改考勤汇总

attendance-performance-manager-ui/admin/src/assets/mixins/table.js

@@ -330,7 +330,7 @@ export default {
     },
     // 格式化单元格数据
     formatterDate(row, column) {
-      //console.log("date:",row,column)
+      console.log("date:",row,column)
       return formatterDate(row, column);
     },
     // 格式化单元格数据 只要年月日

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

@@ -399,14 +399,11 @@ export default {
       },
       /** 子表列元素 */
       columnSet: [
-        { prop: "recordId", label: "考勤记录ID", width: 100 },
-        { prop: "shiftsId", label: "班次ID", width: 100 },
-        { prop: "shiftsName", label: "班次名称", width: 100 },
+        { prop: "shiftsName", label: "班次名称", width: 150 },
         { prop: "goWorkDate", label: "上班打卡时间", width: 100 , formatter: this.formatterDate},
         { prop: "goWorkResult", label: "上班打卡结果", width: 100, formatter: this.formatterString },
         { prop: "offWorkDate", label: "下班打卡时间", width: 100 , formatter: this.formatterDate},
-        { prop: "offWorkResult", label: "下班打卡结果", width: 100 , formatter: this.formatterString},
-        { prop: "remark", label: "备注", width: 100 },
+        { prop: "offWorkResult", label: "下班打卡结果", width: 100 , formatter: this.formatterString}
 
 
       ],

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

@@ -120,17 +120,17 @@ public class AttendanceRecordHikServiceImpl extends AbstractCRUDServiceImpl<Atte
                         attendanceRecordEntity.setAttendanceGroupId(attendanceGroupEntity.getId());
                         attendanceRecordEntity.setAttendanceGroupName(attendanceGroupEntity.getGroupName());
 
-                        log.info("attendanceGroupEntity.getId()=={}", attendanceGroupEntity.getId());
+                        //log.info("attendanceGroupEntity.getId()=={}", attendanceGroupEntity.getId());
                         //查询考勤组详细信息获取班次
                         AttendanceGroupFixedworkEntity attendanceGroupFixedworkEntity = attendanceGroupFixedworkService.selectOne(new AttendanceGroupFixedworkQuery()
                                 .groupId(attendanceGroupEntity.getId()));
                         //判断当前考勤日期为周几
                         Date attendanceDate1 = attendanceDate;
                         String week = this.getWeek(attendanceDate1);
-                        log.info("week:{}", week);
+                        //log.info("week:{}", week);
                         //通过考勤日期的星期拿到班次id.
                         Long weekClassId = this.getWeekClassId(attendanceGroupFixedworkEntity, week);
-                        log.info("weekClassId:{}", weekClassId);
+                        //log.info("weekClassId:{}", weekClassId);
                         //weekClassId为-1 则不在考勤
                         if (weekClassId == -1L) {
                             //跳过本次循环