按照来到本地时间降序

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java

@@ -351,33 +351,36 @@ public class IcTripReportRecordServiceImpl extends BaseServiceImpl<IcTripReportR
             String errorDesFileUrl = null;
             List<IcTripReportExcelData.ErrorRow> errorRows = listener.getErrorRows();
 
-            // 生成并上传错误文件
+            boolean failed = errorRows.size() > 0;
-            try {
+            if (failed) {
-                // 文件生成
+                // 生成并上传错误文件
-                Path errorDescDir = FileUtils.getAndCreateDirUnderEpmetFilesDir("ic_trip_preport", "import", "error_des");
+                try {
-                String fileName = UUID.randomUUID().toString().concat(".xlsx");
+                    // 文件生成
-                errorDescFile = errorDescDir.resolve(fileName);
+                    Path errorDescDir = FileUtils.getAndCreateDirUnderEpmetFilesDir("ic_trip_preport", "import", "error_des");
-
+                    String fileName = UUID.randomUUID().toString().concat(".xlsx");
-                FileItemFactory factory = new DiskFileItemFactory(16, errorDescDir.toFile());
+                    errorDescFile = errorDescDir.resolve(fileName);
-                FileItem fileItem = factory.createItem("file", ContentType.APPLICATION_OCTET_STREAM.toString(), true, fileName);
+
-                OutputStream os = fileItem.getOutputStream();
+                    FileItemFactory factory = new DiskFileItemFactory(16, errorDescDir.toFile());
-
+                    FileItem fileItem = factory.createItem("file", ContentType.APPLICATION_OCTET_STREAM.toString(), true, fileName);
-                EasyExcel.write(os, IcTripReportExcelData.ErrorRow.class).sheet("导入失败列表").doWrite(errorRows);
+                    OutputStream os = fileItem.getOutputStream();
-
+
-                // 文件上传oss
+                    EasyExcel.write(os, IcTripReportExcelData.ErrorRow.class).sheet("导入失败列表").doWrite(errorRows);
-                Result<UploadImgResultDTO> errorDesFileUploadResult = ossFeignClient.uploadImportTaskDescFile(new CommonsMultipartFile(fileItem));
+
-                if (errorDesFileUploadResult.success()) {
+                    // 文件上传oss
-                    errorDesFileUrl = errorDesFileUploadResult.getData().getUrl();
+                    Result<UploadImgResultDTO> errorDesFileUploadResult = ossFeignClient.uploadImportTaskDescFile(new CommonsMultipartFile(fileItem));
-                }
+                    if (errorDesFileUploadResult.success()) {
-            } finally {
+                        errorDesFileUrl = errorDesFileUploadResult.getData().getUrl();
-                if (Files.exists(errorDescFile)) {
+                    }
-                    Files.delete(errorDescFile);
+                } finally {
+                    if (Files.exists(errorDescFile)) {
+                        Files.delete(errorDescFile);
+                    }
                 }
             }
 
             ImportTaskCommonFormDTO importFinishTaskForm = new ImportTaskCommonFormDTO();
             importFinishTaskForm.setTaskId(importTaskId);
-            importFinishTaskForm.setProcessStatus(errorRows.size() <= 0 ? ImportTaskConstants.PROCESS_STATUS_FINISHED_SUCCESS : ImportTaskConstants.PROCESS_STATUS_FINISHED_FAIL);
+            importFinishTaskForm.setProcessStatus(failed ? ImportTaskConstants.PROCESS_STATUS_FINISHED_FAIL : ImportTaskConstants.PROCESS_STATUS_FINISHED_SUCCESS);
             importFinishTaskForm.setOperatorId(userId);
             importFinishTaskForm.setResultDesc("");
             importFinishTaskForm.setResultDescFilePath(errorDesFileUrl);

epmet-user/epmet-user-server/src/main/resources/mapper/IcTripReportRecordDao.xml

@@ -57,7 +57,7 @@
                 AND ARRIVE_DATE <![CDATA[ <= ]]> #{endDate}
             </if>
         ORDER BY
-            r.CREATED_TIME DESC
+            r.ARRIVE_DATE DESC
     </select>
 
     <update id="batchDel" parameterType="map">