From e38c6c178707b0e8e40949919919ec985bb58169 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B2=E6=A0=91=E9=80=9A?= <1976590620@qq.com>
Date: Tue, 6 Jun 2023 16:57:20 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=B0=8F=E5=8C=BA=20?=
 =?UTF-8?q?=E7=BC=96=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 epdc-cloud-client-yushan                         |  2 +-
 .../personroom/dao/EpidemicBuildingUnitDao.java  |  9 +++++++++
 .../entity/EpidemicPlotCoordinateEntity.java     |  5 +++++
 .../impl/EpidemicBuildingUnitServiceImpl.java    |  5 ++++-
 .../personroom/EpidemicBuildingUnitDao.xml       | 16 ++++++++++++++++
 .../personroom/EpidemicPlotCoordinateDao.xml     |  2 ++
 6 files changed, 37 insertions(+), 2 deletions(-)

diff --git a/epdc-cloud-client-yushan b/epdc-cloud-client-yushan
index 4f4f6d4..45422f8 160000
--- a/epdc-cloud-client-yushan
+++ b/epdc-cloud-client-yushan
@@ -1 +1 @@
-Subproject commit 4f4f6d4e560bc4d246505399cd7c5aa86f335cca
+Subproject commit 45422f80613968a587767917ae241ca4b8c0bee6
diff --git a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/dao/EpidemicBuildingUnitDao.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/dao/EpidemicBuildingUnitDao.java
index d826743..7190578 100644
--- a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/dao/EpidemicBuildingUnitDao.java
+++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/dao/EpidemicBuildingUnitDao.java
@@ -151,6 +151,15 @@ public interface EpidemicBuildingUnitDao extends BaseDao<EpidemicBuildingUnitEnt
      */
     HouseInfoResultDTO getHouseInfo(GetHouseInfoFormDTO formDTO);
 
+    /***
+     * 获取房屋编码
+     * @param formDTO
+     * @return java.lang.String
+     * @author qushutong
+     * @date 2023/6/6 15:42
+     */
+    String getHouseCoding(GetHouseInfoFormDTO formDTO);
+
     EpidemicBuildingUnitDetailResultDTO getUnitInfo(EpidemicBuildingUnitDTO formDTO);
 
     /**
diff --git a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/entity/EpidemicPlotCoordinateEntity.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/entity/EpidemicPlotCoordinateEntity.java
index 7154d29..af90352 100644
--- a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/entity/EpidemicPlotCoordinateEntity.java
+++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/entity/EpidemicPlotCoordinateEntity.java
@@ -107,4 +107,9 @@ public class EpidemicPlotCoordinateEntity extends BasePingyinEntity {
 	 */
 	private Integer plotMaCode;
 
+	/**
+	 * 小区编码
+	 */
+	private Integer coding;
+
 }
diff --git a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/service/impl/EpidemicBuildingUnitServiceImpl.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/service/impl/EpidemicBuildingUnitServiceImpl.java
index 9969b93..e2f6c1c 100644
--- a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/service/impl/EpidemicBuildingUnitServiceImpl.java
+++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/service/impl/EpidemicBuildingUnitServiceImpl.java
@@ -933,7 +933,10 @@ public class EpidemicBuildingUnitServiceImpl extends CrudServiceImpl<EpidemicBui
     @Override
     public Result<HouseInfoResultDTO> getHouseInfo(GetHouseInfoFormDTO formDTO) {
         HouseInfoResultDTO houseInfoResultDTO = baseDao.getHouseInfo(formDTO);
-
+        String houseCoding = baseDao.getHouseCoding(formDTO);
+        if(StringUtils.isNotBlank(houseCoding)){
+            houseInfoResultDTO.setRoomCodeShow(houseCoding);
+        }
         if (houseInfoResultDTO != null) {
             List<FamilyMemberInfoResultDTO> members = epidemicUnitOwnerDao.getFamilyMemberInfoByUnitId(houseInfoResultDTO.getId());
 
diff --git a/epdc-cloud-vim-yushan/src/main/resources/mapper/personroom/EpidemicBuildingUnitDao.xml b/epdc-cloud-vim-yushan/src/main/resources/mapper/personroom/EpidemicBuildingUnitDao.xml
index fcbf48e..b4ac25e 100644
--- a/epdc-cloud-vim-yushan/src/main/resources/mapper/personroom/EpidemicBuildingUnitDao.xml
+++ b/epdc-cloud-vim-yushan/src/main/resources/mapper/personroom/EpidemicBuildingUnitDao.xml
@@ -324,6 +324,22 @@
         </if>
     </select>
 
+    <select id="getHouseCoding" resultType="java.lang.String"
+            parameterType="com.elink.esua.epdc.dto.personroom.form.GetHouseInfoFormDTO">
+        SELECT
+        CONCAT('3701024',c.CODING ,LPAD (REPLACE (b.BUILDING_NAME,'号楼',''),2,0),LPAD(u.UNIT,2,0),LPAD(u.ROOM_NO,4,0))
+        FROM
+        epidemic_building_unit u
+        LEFT JOIN epidemic_plot_building b ON u.BUILDING_ID = b.ID
+        LEFT JOIN epidemic_plot_coordinate c ON b.PLOT_ID = c.ID
+        WHERE
+        u.DEL_FLAG = '0'
+        <if test="roomCode != null and roomCode !=''">
+            and u.ROOM_CODE = #{roomCode}
+        </if>
+    </select>
+
+
     <select id="getUnitInfo" resultType="com.elink.esua.epdc.dto.personroom.result.EpidemicBuildingUnitDetailResultDTO">
         SELECT
             bu.*,
diff --git a/epdc-cloud-vim-yushan/src/main/resources/mapper/personroom/EpidemicPlotCoordinateDao.xml b/epdc-cloud-vim-yushan/src/main/resources/mapper/personroom/EpidemicPlotCoordinateDao.xml
index 22cb03c..cd380ed 100644
--- a/epdc-cloud-vim-yushan/src/main/resources/mapper/personroom/EpidemicPlotCoordinateDao.xml
+++ b/epdc-cloud-vim-yushan/src/main/resources/mapper/personroom/EpidemicPlotCoordinateDao.xml
@@ -21,6 +21,7 @@
         <result property="gridName" column="GRID_NAME"/>
         <result property="gridId" column="GRID_ID"/>
         <result property="plotName" column="PLOT_NAME"/>
+        <result property="coding" column="CODING"/>
     </resultMap>
 
     <resultMap type="com.elink.esua.epdc.dto.personroom.EpidemicPlotCoordinateDTO" id="epidemicPlotCoordinateDTOMap">
@@ -41,6 +42,7 @@
         <result property="gridName" column="GRID_NAME"/>
         <result property="gridId" column="GRID_ID"/>
         <result property="plotName" column="PLOT_NAME"/>
+        <result property="coding" column="CODING"/>
     </resultMap>
 
     <select id="getPlotPage" resultMap="epidemicPlotCoordinateDTOMap">