修改考勤汇总

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

@@ -477,9 +477,10 @@ export default {
           { label: "部门", prop: "deptName", formatter: this.formatters },
           { label: "职位", prop: "positionName", formatter: this.formatters },
           { label: "班次", prop: "shiftsName", formatter: this.formatters },
-          { label: "签到结果", prop: "signInResult", formatter: this.formatters },
-          { label: "签退结果", prop: "signOutResult", formatter: this.formatters },
-          { label: "打卡结果", prop: "punchResult", formatter: this.formatters },
+          { label: "签到结果", prop: "signInResult", formatter: this.formatter },
+          { label: "签退结果", prop: "signOutResult", formatter: this.formatter },
+          { label: "打卡结果", prop: "punchResult", formatter: this.formatter },
+          { label: "考勤类型", prop: "attendType", formatter: this.formatter },
 
           // {label: "考勤打卡记录详细信息",
           //   width: 120,

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

@@ -133,7 +133,7 @@ public class AttendanceRecordEntity extends AttendanceRecordVo {
 
         this.signOutResult = 0;
 
-        this.attendType = "0";
+        this.attendType = "现场打卡";
 
         this.punchResult = 0;
     }

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

@@ -402,6 +402,9 @@ public class AttendanceRecordHikServiceImpl extends AbstractCRUDServiceImpl<Atte
                     attendanceRecordEntity.setShiftsName(detailEntityList.get(0).getShiftsName());
                     attendanceRecordEntity.setShiftsId(attendanceClassDetailService.selectOne(new AttendanceClassDetailQuery().id(detailEntityList.get(0).getShiftsId())).getClassId());
                     attendanceRecordEntity.setAttendanceRecordDetailList(detailEntityList);
+
+                   attendanceRecordEntity.setAttendType("现场打卡");
+
                     attendanceRecordService.save(attendanceRecordEntity, context);
                 }
 

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

@@ -77,9 +77,10 @@ public class AttendanceRecordController extends BaseCRUDJsonBodyMappingControlle
         }
 
         if (ObjectUtils.isEmpty(query.getOrderColList())) {
-            query.setOrderColList(Arrays.asList(new OrderCol("createTime", OrderCol.DESCENDING)));
+            query.setOrderColList(Arrays.asList(new OrderCol("attendanceDate", OrderCol.DESCENDING),new OrderCol("staffName", OrderCol.DESCENDING)));
         } else {
-            query.getOrderColList().add(new OrderCol("createTime", OrderCol.DESCENDING));
+            query.getOrderColList().add(new OrderCol("attendanceDate", OrderCol.DESCENDING));
+            query.getOrderColList().add(new OrderCol("staffName", OrderCol.DESCENDING));
         }
 
         super.doListBefore(query, model, context);

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

@@ -127,14 +127,13 @@ public class AttendanceRecordHikController extends BaseCRUDJsonBodyMappingContro
             if (ObjectUtils.isEmpty(hikEntity.getAttendanceDateStart())) {
                 throw new AppException("请选择开始日期");
             }
-
-
             hikService.addAttendanceRecord(hikEntity, getContext());
             model.put("message_info", busiDesc + "成功");
             this.recordSysLog(this.request, busiDesc + " 【成功】");
-        } catch (Exception var9) {
+        } catch (Exception e) {
             code = -1;
-            this.doException(this.request, busiDesc, model, var9);
+            this.doException(this.request, busiDesc, model, e);
+            model.put("message_info", e.getMessage());
         }
 
         this.init(model, context);