Merge branch 'dev_test_async' into develop

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcNeighborHoodController.java

@@ -156,13 +156,12 @@ public class IcNeighborHoodController {
         try {
             inputStream = file.getInputStream();
         }catch (Exception e){
-            log.error("读取文件失败");
-        }finally {
             ImportTaskCommonFormDTO input = new ImportTaskCommonFormDTO();
             input.setOperatorId(formDTO.getUserId());
             input.setTaskId(importTask.getData().getTaskId());
             input.setProcessStatus(ImportTaskConstants.PROCESS_STATUS_FINISHED_FAIL);
             epmetCommonServiceOpenFeignClient.finishImportTask(input);
+            log.error("读取文件失败");
         }
         icNeighborHoodService.neighborhoodImport(formDTO,inputStream,importTask);
         return new Result();