修改导出业务

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

 package com.mortals.xhx.module.attendance.web;
 
 import com.mortals.framework.exception.AppException;
+import com.mortals.framework.model.OrderCol;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.xhx.base.system.param.service.ParamService;
 import com.mortals.xhx.common.code.GoWorkResultEnum;
@@ -70,6 +71,13 @@ public class AttendanceRecordController extends BaseCRUDJsonBodyMappingControlle
         if (query.getGroupId()!=null){
             query.setAttendanceGroupId(query.getGroupId());
         }
+
+        if (ObjectUtils.isEmpty(query.getOrderColList())) {
+            query.setOrderColList(Arrays.asList(new OrderCol("createTime", OrderCol.DESCENDING)));
+        } else {
+            query.getOrderColList().add(new OrderCol("createTime", OrderCol.DESCENDING));
+        }
+
         super.doListBefore(query, model, context);
     }
 

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

@@ -4,6 +4,7 @@ import cn.hutool.core.util.StrUtil;
 import com.mortals.framework.common.Rest;
 import com.mortals.framework.exception.AppException;
 import com.mortals.framework.model.Context;
+import com.mortals.framework.model.OrderCol;
 import com.mortals.framework.util.StringUtils;
 import com.mortals.framework.utils.ServletUtils;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
@@ -21,6 +22,7 @@ import com.mortals.xhx.module.staff.model.StaffQuery;
 import com.mortals.xhx.module.staff.service.StaffService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -29,10 +31,8 @@ import org.springframework.web.multipart.MultipartFile;
 
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
+
 /**
 *
 * 海康考勤打卡记录汇总信息
@@ -67,6 +67,9 @@ public class AttendanceRecordHikController extends BaseCRUDJsonBodyMappingContro
     }
 
 
+
+
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void doImportDataBefore(List<AttendanceRecordHikEntity> list, boolean updateSupport, Context context) throws AppException {
@@ -147,6 +150,13 @@ public class AttendanceRecordHikController extends BaseCRUDJsonBodyMappingContro
             String staffName = "%" + query.getStaffName() + "%";
             query.setStaffName(staffName);
         }
+
+        if (ObjectUtils.isEmpty(query.getOrderColList())) {
+            query.setOrderColList(Arrays.asList(new OrderCol("createTime", OrderCol.DESCENDING)));
+        } else {
+            query.getOrderColList().add(new OrderCol("createTime", OrderCol.DESCENDING));
+        }
+
         super.doListBefore(query, model, context);
     }