From 404c509030cbb2bcf3aa5553573b0628c64843be Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Fri, 17 Jun 2022 18:00:19 +0800
Subject: [PATCH] =?UTF-8?q?=E6=88=91=E7=9A=84=E5=AE=B6=E5=BA=AD=E7=9B=B8?=
 =?UTF-8?q?=E5=85=B3=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/AppFamilyController.java           | 15 +++++++++++++++
 .../personroom/dao/EpidemicUnitOwnerDao.java      |  4 ++++
 .../service/EpidemicUnitOwnerService.java         |  8 ++++++++
 .../impl/EpidemicUnitOwnerServiceImpl.java        |  9 +++++++++
 .../mapper/personroom/EpidemicUnitOwnerDao.xml    | 13 +++++++++++++
 5 files changed, 49 insertions(+)

diff --git a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/controller/AppFamilyController.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/controller/AppFamilyController.java
index c3b39e6..9a57e15 100644
--- a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/controller/AppFamilyController.java
+++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/controller/AppFamilyController.java
@@ -147,4 +147,19 @@ public class AppFamilyController {
     }
 
 
+    /**
+     * 获取房屋编码
+     *
+     * @param formDTO
+     * @return
+     * @Author wanggongfeng
+     */
+    @GetMapping("getRoomCodeByIdCard")
+    public Result getRoomCodeByIdCard(@RequestBody IdCardFormDTO formDTO){
+        //效验数据
+        ValidatorUtils.validateEntity(formDTO, UpdateGroup.class, DefaultGroup.class);
+        return epidemicUnitOwnerService.getRoomCodeByIdCard(formDTO);
+    }
+
+
 }
diff --git a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/dao/EpidemicUnitOwnerDao.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/dao/EpidemicUnitOwnerDao.java
index 2710878..92392b4 100644
--- a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/dao/EpidemicUnitOwnerDao.java
+++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/dao/EpidemicUnitOwnerDao.java
@@ -19,7 +19,9 @@ package com.elink.esua.epdc.vaccine.personroom.dao;
 
 import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
 import com.elink.esua.epdc.dto.personroom.form.GetSkipDirectionFormDTO;
+import com.elink.esua.epdc.dto.personroom.form.IdCardFormDTO;
 import com.elink.esua.epdc.dto.personroom.result.FamilyMemberInfoResultDTO;
+import com.elink.esua.epdc.dto.personroom.result.RoomCodeResultDTO;
 import com.elink.esua.epdc.vaccine.personroom.entity.EpidemicUnitOwnerEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -86,4 +88,6 @@ public interface EpidemicUnitOwnerDao extends BaseDao<EpidemicUnitOwnerEntity> {
     Integer getCurrentBouseNum(GetSkipDirectionFormDTO formDTO);
     Integer getNotCurrentBouseNum(GetSkipDirectionFormDTO formDTO);
 
+    RoomCodeResultDTO getRoomCodeByIdCard(IdCardFormDTO formDTO);
+
 }
diff --git a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/service/EpidemicUnitOwnerService.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/service/EpidemicUnitOwnerService.java
index 32f6171..7844e83 100644
--- a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/service/EpidemicUnitOwnerService.java
+++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/service/EpidemicUnitOwnerService.java
@@ -23,6 +23,7 @@ import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.personroom.EpidemicUnitOwnerDTO;
 import com.elink.esua.epdc.dto.personroom.form.GetSkipDirectionFormDTO;
+import com.elink.esua.epdc.dto.personroom.form.IdCardFormDTO;
 import com.elink.esua.epdc.vaccine.personroom.entity.EpidemicUnitOwnerEntity;
 
 import java.util.List;
@@ -135,4 +136,11 @@ public interface EpidemicUnitOwnerService extends BaseService<EpidemicUnitOwnerE
      */
     Result getSkipDirection(GetSkipDirectionFormDTO formDTO);
 
+    /**
+     * 获取房屋编码
+     * @param formDTO
+     * @return
+     */
+    Result getRoomCodeByIdCard(IdCardFormDTO formDTO);
+
 }
diff --git a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/service/impl/EpidemicUnitOwnerServiceImpl.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/service/impl/EpidemicUnitOwnerServiceImpl.java
index d4ce3ae..15c3ae6 100644
--- a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/service/impl/EpidemicUnitOwnerServiceImpl.java
+++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/service/impl/EpidemicUnitOwnerServiceImpl.java
@@ -26,7 +26,9 @@ import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.personroom.EpidemicUnitOwnerDTO;
 import com.elink.esua.epdc.dto.personroom.form.GetSkipDirectionFormDTO;
+import com.elink.esua.epdc.dto.personroom.form.IdCardFormDTO;
 import com.elink.esua.epdc.dto.personroom.result.GetSkipDirectionResultDTO;
+import com.elink.esua.epdc.dto.personroom.result.RoomCodeResultDTO;
 import com.elink.esua.epdc.vaccine.personroom.dao.EpidemicUnitOwnerDao;
 import com.elink.esua.epdc.vaccine.personroom.entity.EpidemicUnitOwnerEntity;
 import com.elink.esua.epdc.vaccine.personroom.redis.EpidemicUnitOwnerRedis;
@@ -147,4 +149,11 @@ public class EpidemicUnitOwnerServiceImpl extends BaseServiceImpl<EpidemicUnitOw
 
         return new Result<GetSkipDirectionResultDTO>().ok(getSkipDirectionResultDTO);
     }
+
+    @Override
+    public Result<RoomCodeResultDTO> getRoomCodeByIdCard(IdCardFormDTO formDTO) {
+        RoomCodeResultDTO roomCodeResultDTO = baseDao.getRoomCodeByIdCard(formDTO);
+
+        return new Result<RoomCodeResultDTO>().ok(roomCodeResultDTO);
+    }
 }
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 34b988f..0a1b52a 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
@@ -107,4 +107,17 @@
         and un.ROOM_CODE != #{roomCode}
 
     </select>
+
+    <select id="getRoomCodeByIdCard" resultType="com.elink.esua.epdc.dto.personroom.result.RoomCodeResultDTO"
+            parameterType="com.elink.esua.epdc.dto.personroom.form.IdCardFormDTO">
+        select
+        un.ROOM_CODE
+        from epidemic_unit_owner ow
+        left join epidemic_building_unit un on ow.UNIT_ID = un.ID and un.DEL_FLAG = '0'
+        where ow.DEL_FLAG = '0'
+        and ow.ID_CARD = #{idCard}
+        order by ow.CREATED_TIME
+        limit 1
+
+    </select>
 </mapper>