Merge remote-tracking branch 'origin/dev_import' into dev_import

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

@@ -222,7 +222,7 @@ public class BuildingController {
         importFormDTO.setOriginFileName(file.getOriginalFilename());
         Result<ImportTaskCommonResultDTO> importTask = epmetCommonServiceOpenFeignClient.createImportTask(importFormDTO);
         if (!importTask.success()){
-            throw new EpmetException("当前存在上传任务");
+            throw new EpmetException("存在进行中的导入");
         }
         buildingService.buildingImportExcel(formDTO,file,importTask);
         return new Result();

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

@@ -272,7 +272,7 @@ public class HouseController implements ResultDataResolver {
         importFormDTO.setOriginFileName(file.getOriginalFilename());
         Result<ImportTaskCommonResultDTO> importTask = epmetCommonServiceOpenFeignClient.createImportTask(importFormDTO);
         if (!importTask.success()){
-            throw new EpmetException("当前存在上传任务");
+            throw new EpmetException("存在进行中的导入");
         }
         houseService.dispose(file,formDTO,importTask);
         return new Result<>();

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

@@ -142,7 +142,7 @@ public class IcNeighborHoodController {
         importFormDTO.setOriginFileName(file.getOriginalFilename());
         Result<ImportTaskCommonResultDTO> importTask = epmetCommonServiceOpenFeignClient.createImportTask(importFormDTO);
         if (!importTask.success()){
-            throw new EpmetException("当前存在上传任务");
+            throw new EpmetException("存在进行中的导入");
         }
         icNeighborHoodService.neighborhoodImport(formDTO,file,importTask);
         return new Result();