1.1.0 修改小程序销售统计接口

air/src/main/java/com/air/housing/mapper/BlocksMapper.java

@@ -35,7 +35,7 @@ public interface BlocksMapper extends BaseMapper<Blocks> {
     @SqlParser(filter = true)
     BlocksPreSaleTotalDto getSaleInfo(@Param("landListedId") String landListedId);
 
-    BigDecimal getHouseAvgPrice(@Param("propertyType") Integer propertyType);
+    BigDecimal getHouseAvgPrice(@Param("propertyType") String propertyType);
 
     @SqlParser(filter = true)
     List<BlocksPreSaleTotalDto> getHouseSaleInfo(Long housingEstatesId);

air/src/main/java/com/air/housing/service/impl/BlocksServiceImpl.java

@@ -48,9 +48,9 @@ public class BlocksServiceImpl extends ServiceImpl<BlocksMapper, Blocks> impleme
         }
 
         // 住宅均价
-        BigDecimal preSaleHousePrice = baseMapper.getHouseAvgPrice(1);
+        BigDecimal preSaleHousePrice = baseMapper.getHouseAvgPrice("住宅");
         //商业均价
-        BigDecimal preSaleBusinessPrice = baseMapper.getHouseAvgPrice(2);
+        BigDecimal preSaleBusinessPrice = baseMapper.getHouseAvgPrice("商业");
         saleInfo.setPreSaleHousePrice(preSaleHousePrice.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
         saleInfo.setPreSaleBusinessPrice(preSaleBusinessPrice.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
         return saleInfo;

air/src/main/resources/mapper/BlocksMapper.xml

@@ -44,8 +44,9 @@
             anno_blocks_rel ab
                 JOIN blocks b ON ab.housing_estates_id = b.housing_estate_id
                 JOIN houses h ON h.block_id = b.block_id
+                join `format` f on f.format_id = b.format_id
         WHERE
-            ab.main_land = 1 and b.property_type = #{propertyType}
+            ab.main_land = 1 and f.property_type = #{propertyType}
     </select>
     <select id="getHouseSaleInfo" resultType="com.air.applets.dto.BlocksPreSaleTotalDto">
         SELECT
@@ -62,5 +63,4 @@
         GROUP BY b.block_id
     </select>
 
-
 </mapper>

air/src/main/resources/mapper/LandListedMapper.xml

@@ -129,7 +129,7 @@
                         like concat('%',#{landVo.landCode},'%')
             </if>
         </where>
-        order by ll.land_listed desc
+        order by ll.land_listed_id desc
     </select>
 
     <select id="appletsCalendarToAnnoDate" resultType="com.air.land.dto.LandListedStatisticsDto">