Merge branch 'feature/user_house_import'

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

@@ -202,6 +202,7 @@ public class EpidemicUserInfoServiceImpl extends CrudServiceImpl<EpidemicUserInf
         // 查询房屋关联信息
         EpidemicBuildingUnitDTO formDTO = new EpidemicBuildingUnitDTO();
         formDTO.setIdCard(result.getIdCard());
+        formDTO.setGridId(result.getDeptId().toString());
         EpidemicBuildingUnitDetailResultDTO unitInfo = epidemicBuildingUnitService.getUnitInfo(formDTO);
         if (unitInfo != null) {
             result.setUnitId(unitInfo.getId());

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

@@ -143,12 +143,6 @@ public class BuildingUnitController {
         return new Result<List<DictOptionDTO>>().ok(list);
     }
 
-    @GetMapping("getUnitInfo")
-    public Result<EpidemicBuildingUnitDetailResultDTO> getUnitInfo(EpidemicBuildingUnitDTO formDTO) {
-        EpidemicBuildingUnitDetailResultDTO dto = epidemicBuildingUnitService.getUnitInfo(formDTO);
-        return new Result<EpidemicBuildingUnitDetailResultDTO>().ok(dto);
-    }
-
     /**
      * 房间号下拉框
      *

epdc-cloud-vim-yushan/src/main/resources/mapper/personroom/EpidemicBuildingUnitDao.xml

@@ -292,6 +292,7 @@
             LEFT JOIN epidemic_plot_coordinate pc ON pb.PLOT_ID = pc.ID
         WHERE
             o.ID_CARD = #{idCard}
+            AND pc.GRID_ID = #{gridId}
         ORDER BY
             CREATED_TIME DESC
             LIMIT 1