同时匹配所有情况

epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/controller/PlotBuildingController.java

@@ -134,8 +134,8 @@ public class PlotBuildingController {
      * @params [file]
      */
     @PostMapping("importBuilding")
-    public Result importBuilding(@RequestParam("file") MultipartFile file) {
-        return epidemicPlotBuildingService.importBuilding(file);
+    public Result importBuilding(@RequestParam("file") MultipartFile file, String gridId) {
+        return epidemicPlotBuildingService.importBuilding(file,gridId);
     }
 
     @PostMapping("updateMaCode")

epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/service/EpidemicPlotBuildingService.java

@@ -72,7 +72,7 @@ public interface EpidemicPlotBuildingService extends CrudService<EpidemicPlotBui
      * @date 2022/4/25 17:03
      * @params [file]
      */
-    Result importBuilding(MultipartFile file);
+    Result importBuilding(MultipartFile file, String gridId);
 
     /**
      * 列出所有楼栋信息

epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/service/impl/EpidemicPlotBuildingServiceImpl.java

@@ -225,9 +225,9 @@ public class EpidemicPlotBuildingServiceImpl extends CrudServiceImpl<EpidemicPlo
     }
 
     @Override
-    public Result importBuilding(MultipartFile file) {
+    public Result importBuilding(MultipartFile file, String gridId) {
         // 文件基本信息检查
-        AllDeptDTO allDeptInfo = checkInfo(file);
+        AllDeptDTO allDeptInfo = checkInfo(file, gridId);
 
         //读取文件内容，处理数据
         File f = StreamUtils.conversionFile(file);
@@ -520,7 +520,7 @@ public class EpidemicPlotBuildingServiceImpl extends CrudServiceImpl<EpidemicPlo
      * @date 2022/4/25 18:14
      * @params [file]
      */
-    private AllDeptDTO checkInfo(MultipartFile file) {
+    private AllDeptDTO checkInfo(MultipartFile file, String gridId) {
         // 防止多次重复导入导致内存无意义消耗
         String originalFilename = file.getOriginalFilename();
         if (StringUtils.isBlank(originalFilename)) {
@@ -540,7 +540,12 @@ public class EpidemicPlotBuildingServiceImpl extends CrudServiceImpl<EpidemicPlo
         String[] fileNameArr = fileName.split(StrConstant.HYPHEN);
         String gridName = fileNameArr[0];
         //19位370124
-        AllDeptDTO allDeptInfo = adminFeignClient.getAllDeptInfoByGridName(gridName).getData();
+        AllDeptDTO allDeptInfo;
+        if (StringUtils.isBlank(gridId)) {
+            allDeptInfo = adminFeignClient.getAllDeptInfoByGridName(gridName).getData();
+        } else {
+            allDeptInfo = adminFeignClient.getAllDeptInfoByGridName(gridId).getData();
+        }
         if (null == allDeptInfo) {
             throw new RenException("网格信息不存在");
         }