x

src/main/resources/sql/house/create-index-query.sql

@@ -48,7 +48,6 @@ FROM #__tmp a, (
     AND a.nItem = b.nItem
 
 SELECT
-       id = r.nRoomID,
        PropertyID = a.nPropertyID,
        PropertyName = p.sPropertyName,
        HouseID = a.nHouseID,
@@ -58,11 +57,15 @@ SELECT
        RoomTypeName = rt.sRoomTypeName,
        HouseNO = a.sHouseNO,
        HouseName = a.sHouseName,
+       RoomNO = r.sRoomNO,
+       RoomName = r.sRoomName,
        HouseAddress = a.sHouseAddress,
-       RentTypeID = a.sRentTypeID,   --出租类型：1.整租;2.合租;3.不限
-       RentType = a.sRentType,
+       RentTypeID = case when isnull(a.sRentTypeID,'') <> '' then a.sRentTypeID else
+                    case when r.nTag&4=4 then '1' else '2' end end,             --出租类型：整租、合租
+       RentType = case when isnull(a.sRentTypeID,'') <> '' then a.sRentType else
+                  case when r.nTag&4=4 then '整租' else '合租' end end,
        TripDesc = p.sTripDesc,       --出行描述
-       RentArea = a.nRentArea,       --出租面积
+       RentArea = r.nUseArea,        --出租面积
        TotalFloorsNum = a.nTotalFloorsNum, --总层数
        Building = a.sBuilding,  --楼栋
        Cell = a.sCell,          --单元
@@ -72,7 +75,7 @@ SELECT
        LivingRooms = a.nLivingRooms, --客厅
        Toilets = a.nToilets,         --厕所
        Balconys = a.nBalconys,       --阳台
-       HousePrice = r.nHousePrice,   --房价
+       HousePrice = isnull(r.nHousePrice,0),   --房价
        Unit = '月',
        AdultCount = r.nAdultCount,
        ChildCount = r.nChildCount,
@@ -87,7 +90,8 @@ SELECT
        BrandType = (SELECT DISTINCT sComDesc FROM tCommon WHERE sLangID = @LangID AND sCommonNO = 'Brand' AND sComID = a.sBrandTypeID),
        URL = @HttpUrl + CASE WHEN LEFT(f.sURL,1) = '/' THEN RIGHT(f.sURL,len(f.sURL) - 1) ELSE f.sURL END,
        RoomStatusTypeID = r.sStatus,     --当前房态
-       RoomStatusType = (SELECT DISTINCT sComDesc FROM tCommon where sCommonNO = 'RoomStatusType' AND sLangID = @LangID and sComID = r.sStatus),
+       RoomStatusType = (SELECT DISTINCT sComDesc FROM tCommon where sCommonNO = 'RoomStatusType'
+                                           AND sLangID = @LangID and sComID = r.sStatus),
        CreateDate = a.dCreateDate,
        ChangeDate = a.dChangeDate,
        LastUpdateTime = a.dLastUpdateTime

src/main/resources/sql/house/delete-index-query.sql

@@ -48,7 +48,6 @@ FROM #__tmp a, (
     AND a.nItem = b.nItem
 
 SELECT
-       id = r.nRoomID,
        PropertyID = a.nPropertyID,
        PropertyName = p.sPropertyName,
        HouseID = a.nHouseID,
@@ -58,11 +57,15 @@ SELECT
        RoomTypeName = rt.sRoomTypeName,
        HouseNO = a.sHouseNO,
        HouseName = a.sHouseName,
+       RoomNO = r.sRoomNO,
+       RoomName = r.sRoomName,
        HouseAddress = a.sHouseAddress,
-       RentTypeID = a.sRentTypeID,   --出租类型：1.整租;2.合租;3.不限
-       RentType = a.sRentType,
+       RentTypeID = case when isnull(a.sRentTypeID,'') <> '' then a.sRentTypeID else
+                    case when r.nTag&4=4 then '1' else '2' end end,             --出租类型：整租、合租
+       RentType = case when isnull(a.sRentTypeID,'') <> '' then a.sRentType else
+                  case when r.nTag&4=4 then '整租' else '合租' end end,
        TripDesc = p.sTripDesc,       --出行描述
-       RentArea = a.nRentArea,       --出租面积
+       RentArea = r.nUseArea,        --出租面积
        TotalFloorsNum = a.nTotalFloorsNum, --总层数
        Building = a.sBuilding,  --楼栋
        Cell = a.sCell,          --单元
@@ -72,7 +75,7 @@ SELECT
        LivingRooms = a.nLivingRooms, --客厅
        Toilets = a.nToilets,         --厕所
        Balconys = a.nBalconys,       --阳台
-       HousePrice = r.nHousePrice,   --房价
+       HousePrice = isnull(r.nHousePrice,0),   --房价
        Unit = '月',
        AdultCount = r.nAdultCount,
        ChildCount = r.nChildCount,

src/main/resources/sql/house/update-index-query.sql

@@ -48,7 +48,6 @@ FROM #__tmp a, (
     AND a.nItem = b.nItem
 
 SELECT
-       id = r.nRoomID,
        PropertyID = a.nPropertyID,
        PropertyName = p.sPropertyName,
        HouseID = a.nHouseID,
@@ -58,11 +57,15 @@ SELECT
        RoomTypeName = rt.sRoomTypeName,
        HouseNO = a.sHouseNO,
        HouseName = a.sHouseName,
+       RoomNO = r.sRoomNO,
+       RoomName = r.sRoomName,
        HouseAddress = a.sHouseAddress,
-       RentTypeID = a.sRentTypeID,   --出租类型：1.整租;2.合租;3.不限
-       RentType = a.sRentType,
+       RentTypeID = case when isnull(a.sRentTypeID,'') <> '' then a.sRentTypeID else
+                    case when r.nTag&4=4 then '1' else '2' end end,             --出租类型：整租、合租
+       RentType = case when isnull(a.sRentTypeID,'') <> '' then a.sRentType else
+                  case when r.nTag&4=4 then '整租' else '合租' end end,
        TripDesc = p.sTripDesc,       --出行描述
-       RentArea = a.nRentArea,       --出租面积
+       RentArea = r.nUseArea,        --出租面积
        TotalFloorsNum = a.nTotalFloorsNum, --总层数
        Building = a.sBuilding,  --楼栋
        Cell = a.sCell,          --单元
@@ -72,7 +75,7 @@ SELECT
        LivingRooms = a.nLivingRooms, --客厅
        Toilets = a.nToilets,         --厕所
        Balconys = a.nBalconys,       --阳台
-       HousePrice = r.nHousePrice,   --房价
+       HousePrice = isnull(r.nHousePrice,0),   --房价
        Unit = '月',
        AdultCount = r.nAdultCount,
        ChildCount = r.nChildCount,