修改信息

air/src/main/java/com/air/applets/controller/BlocksController.java

@@ -48,8 +48,8 @@ public class BlocksController {
      */
     @ApiOperation(value = "查询预售明细列表", notes = "查询预售明细列表")
     @GetMapping("getPreSaleDetailList")
-    public R<List<BlocksPreSaleTotalDto>> getPreSaleDetailList(@RequestParam String landListedId) {
-        return R.ok(blocksService.getPreSaleDetailList(landListedId));
+    public R<List<BlocksPreSaleTotalDto>> getPreSaleDetailList(@RequestParam String landListedId,@RequestParam String buildingName) {
+        return R.ok(blocksService.getPreSaleDetailList(landListedId,buildingName));
     }
 
 }

air/src/main/java/com/air/applets/controller/ReportController.java

@@ -38,7 +38,7 @@ public class ReportController {
      * 报告分页查询
      *
      * @param page       分页对象
-     * @param reportType
+     * @param reportType 报告类型
      * @return
      */
     @ApiOperation(value = "报告分页查询", notes = "报告分页查询(reportType:)")

air/src/main/java/com/air/applets/dto/BlocksPreSaleTotalDto.java

@@ -12,7 +12,7 @@ import lombok.Data;
  **/
 @Data
 @ApiModel(value = "房屋销售合计")
-public class BlocksPreSaleTotalDto {
+public class    BlocksPreSaleTotalDto {
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty(value = "合计预售（统计地块上楼盘中所有的房屋）")

air/src/main/java/com/air/housing/service/BlocksService.java

@@ -27,7 +27,7 @@ public interface BlocksService extends IService<Blocks> {
 
     BlocksPreSaleTotalDto getPreSaleTotal(String landListId);
 
-    List<BlocksPreSaleTotalDto> getPreSaleDetailList(String landListedId);
+    List<BlocksPreSaleTotalDto> getPreSaleDetailList(String landListedId,String buildingName);
 
     /**
      * 根据id查询业态信息

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

@@ -71,10 +71,12 @@ public class BlocksServiceImpl extends ServiceImpl<BlocksMapper, Blocks> impleme
     }
 
     @Override
-    public List<BlocksPreSaleTotalDto> getPreSaleDetailList(String landListedId) {
+    public List<BlocksPreSaleTotalDto> getPreSaleDetailList(String landListedId, String buildingName) {
         //获取楼盘id
         AnnoBlocksRel annoBlocksRel = annoBlocksRelMapper.selectOne(Wrappers.<AnnoBlocksRel>query().lambda()
                 .eq(AnnoBlocksRel::getLandListedId, landListedId).eq(AnnoBlocksRel::getMainLand, 1));
+//        List<HousingEstates> housingEstates = housingEstatesMapper.selectList(Wrappers.<HousingEstates>query().lambda().eq(HousingEstates::getName, buildingName));
+
         if (annoBlocksRel == null) {
             return null;
         }

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

@@ -314,6 +314,7 @@ public class HousingEstatesServiceImpl extends ServiceImpl<HousingEstatesMapper,
                 housesList.add(houses);
                 //计算成交的数量,面积
                 if(StrUtil.isNotBlank(housesOrigin.getSubscribeStatus()) || StrUtil.isNotBlank(housesOrigin.getNetSignStatus()) ) {
+ //                   log.info("{}==={}",housesOrigin.getSubscribeStatus(),housesOrigin.getNetSignStatus());
                     housesOriginList.add(housesOrigin);
                 }
 
@@ -327,6 +328,7 @@ public class HousingEstatesServiceImpl extends ServiceImpl<HousingEstatesMapper,
         Format format = new Format();
         format.setFormatId(formatId);
         format.setSupplyCount(housesList.size()); //供应总套数
+ //       log.info("成交套数==={}",housesOriginList.size());
         format.setDealtCount(housesOriginList.size()); //成交套数
         //已售面积
         BigDecimal bigDecimal = new BigDecimal(0);

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

@@ -53,7 +53,8 @@
         SELECT
             b.block_id,
             b.housing_estate_id,
-            b.pre_sale_permit_no preSaleLicenseNo,
+            b.pre_sale_permit_no ,
+            b.block_name    preSaleLicenseNo,
             date_format(b.create_date,'%Y/%m/%d') evidenceDate,
             count( h.house_id ) preSaleTotal,
             count(h.sale_status = '已售') destroyTotal