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

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

@@ -20,9 +20,9 @@ public class AttendanceRecordVo extends BaseEntityLong {
     private List<AttendanceGroupFixedworkSpecialVo> list;
 
     @Excels({
-            @Excel(name = "上班打卡时间", width = 30, dateFormat = "yyyy-MM-dd", targetAttr = "goWorkDate", type = Excel.Type.EXPORT),
+            @Excel(name = "上班打卡时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss", targetAttr = "goWorkDate", type = Excel.Type.EXPORT),
             @Excel(name = "上班打卡结果", readConverterExp = "1=正常,2=请假,3=缺卡,4=迟到,5=早退", targetAttr = "goWorkResult", type = Excel.Type.EXPORT),
-            @Excel(name = "下班打卡时间", width = 30, dateFormat = "yyyy-MM-dd", targetAttr = "offWorkDate", type = Excel.Type.EXPORT),
+            @Excel(name = "下班打卡时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss", targetAttr = "offWorkDate", type = Excel.Type.EXPORT),
             @Excel(name = "下班打卡结果", readConverterExp = "1=正常,2=请假,3=缺卡,4=迟到,5=早退", targetAttr = "offWorkResult", type = Excel.Type.EXPORT)
 
     })

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

@@ -171,7 +171,7 @@ public class AttendanceRecordController extends BaseCRUDJsonBodyMappingControlle
             query.setOrderColList(Arrays.asList(new OrderCol("attendanceDate", OrderCol.DESCENDING), new OrderCol("staffName", OrderCol.DESCENDING)));
         } else {
             query.getOrderColList().add(new OrderCol("attendanceDate", OrderCol.DESCENDING));
-            query.getOrderColList().add(new OrderCol("staffName", 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

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