diff --git a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/impl/EpidemicUserInfoServiceImpl.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/impl/EpidemicUserInfoServiceImpl.java index 3dd23eb..23ec561 100644 --- a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/impl/EpidemicUserInfoServiceImpl.java +++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/impl/EpidemicUserInfoServiceImpl.java @@ -1703,6 +1703,7 @@ public class EpidemicUserInfoServiceImpl extends CrudServiceImpl { */ List getFamilyMemberInfoByUnitId(@Param("unitId") Long unitId); + Integer getCurrentBouseNum(GetSkipDirectionFormDTO formDTO); + Integer getNotCurrentBouseNum(GetSkipDirectionFormDTO formDTO); + } diff --git a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/service/EpidemicBuildingUnitService.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/service/EpidemicBuildingUnitService.java index 80e9073..b791624 100644 --- a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/service/EpidemicBuildingUnitService.java +++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/service/EpidemicBuildingUnitService.java @@ -23,6 +23,7 @@ import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dto.epidemic.DictOptionDTO; import com.elink.esua.epdc.dto.personroom.EpidemicBuildingUnitDTO; import com.elink.esua.epdc.dto.personroom.form.GetHouseInfoFormDTO; +import com.elink.esua.epdc.dto.personroom.form.GetSkipDirectionFormDTO; import com.elink.esua.epdc.dto.personroom.form.HouseInfoFormDTO; import com.elink.esua.epdc.dto.personroom.form.HouseQrcodeZipFormDTO; import com.elink.esua.epdc.dto.personroom.result.EpidemicBuildingUnitDetailResultDTO; @@ -210,4 +211,6 @@ public interface EpidemicBuildingUnitService extends CrudService getSkipDirection(GetSkipDirectionFormDTO formDTO) { + /** + * 1. 留在当前页面,进行注册、绑定 + * 2. 跳转到 该房屋信息的页面 + * 3. 显示 无权访问 + */ + GetSkipDirectionResultDTO getSkipDirectionResultDTO = new GetSkipDirectionResultDTO(); + // 获取是否绑定当前房屋 + Integer isCurrentBouse = baseDao.getCurrentBouseNum(formDTO); + // 获取是否绑定非当前房屋 + Integer isNotCurrentBouse = baseDao.getNotCurrentBouseNum(formDTO); + if(isCurrentBouse > 0){ + getSkipDirectionResultDTO.setType("2"); + }else if(isNotCurrentBouse > 0){ + getSkipDirectionResultDTO.setType("3"); + }else{ + getSkipDirectionResultDTO.setType("1"); + } + + return new Result().ok(getSkipDirectionResultDTO); + } } diff --git a/epdc-cloud-vim-yushan/src/main/resources/mapper/personroom/EpidemicUnitOwnerDao.xml b/epdc-cloud-vim-yushan/src/main/resources/mapper/personroom/EpidemicUnitOwnerDao.xml index 3c0e968..34b988f 100644 --- a/epdc-cloud-vim-yushan/src/main/resources/mapper/personroom/EpidemicUnitOwnerDao.xml +++ b/epdc-cloud-vim-yushan/src/main/resources/mapper/personroom/EpidemicUnitOwnerDao.xml @@ -83,4 +83,28 @@ where ui.DEL_FLAG = '0' and ui.ID_CARD in (select euo.ID_CARD from epidemic_unit_owner euo where euo.DEL_FLAG = '0' and euo.UNIT_ID = #{unitId}) + + + +