Merge remote-tracking branch 'origin/develop' into release_temp

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

@@ -219,7 +219,7 @@ public class BuildingController {
         ImportTaskCommonFormDTO importFormDTO = new ImportTaskCommonFormDTO();
         importFormDTO.setBizType(ImportTaskConstants.BIZ_TYPE_BUILDING);
         importFormDTO.setOperatorId(formDTO.getUserId());
-        importFormDTO.setOriginFileName(ImportErrorMsgConstants.BUILDING_ERROR_NAME);
+        importFormDTO.setOriginFileName(file.getOriginalFilename());
         Result<ImportTaskCommonResultDTO> importTask = epmetCommonServiceOpenFeignClient.createImportTask(importFormDTO);
         if (!importTask.success()){
             throw new EpmetException("当前存在上传任务");

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

@@ -269,7 +269,7 @@ public class HouseController implements ResultDataResolver {
         ImportTaskCommonFormDTO importFormDTO = new ImportTaskCommonFormDTO();
         importFormDTO.setBizType(ImportTaskConstants.BIZ_TYPE_HOUSE);
         importFormDTO.setOperatorId(formDTO.getUserId());
-        importFormDTO.setOriginFileName(ImportErrorMsgConstants.HOUSE_ERROR_NAME);
+        importFormDTO.setOriginFileName(file.getOriginalFilename());
         Result<ImportTaskCommonResultDTO> importTask = epmetCommonServiceOpenFeignClient.createImportTask(importFormDTO);
         if (!importTask.success()){
             throw new EpmetException("当前存在上传任务");

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

@@ -139,7 +139,7 @@ public class IcNeighborHoodController {
         ImportTaskCommonFormDTO importFormDTO = new ImportTaskCommonFormDTO();
         importFormDTO.setBizType(ImportTaskConstants.BIZ_TYPE_NEIGHBOR_HOOD);
         importFormDTO.setOperatorId(formDTO.getUserId());
-        importFormDTO.setOriginFileName(ImportErrorMsgConstants.NEIGHBORHOOD_ERROR_NAME);
+        importFormDTO.setOriginFileName(file.getOriginalFilename());
         Result<ImportTaskCommonResultDTO> importTask = epmetCommonServiceOpenFeignClient.createImportTask(importFormDTO);
         if (!importTask.success()){
             throw new EpmetException("当前存在上传任务");