Merge remote-tracking branch 'origin/develop' into develop

gather-app/src/main/java/com/ruoyi/business/controller/BigScreenController.java

@@ -328,10 +328,25 @@ public class BigScreenController extends BaseController {
     public AjaxResult buildRealEstate(@ApiParam("楼栋地址")  @RequestParam String para) {
         try {
 
+            int index = para.indexOf("幢");
+            String buildName = null;
+            if (index != -1 && index > 0 ){
+                buildName = String.valueOf(para.charAt(index-1));
+                para = para.substring(index - 1);
+            }
             QueryWrapper<MetaRealEstateInfo> queryWrapper = new QueryWrapper<>();
             queryWrapper.like("real_estate_address", para);
+            queryWrapper.eq("building_name",buildName);
             int a = realEstateInfoService.count(queryWrapper);
-
+            List<MetaRealEstateInfo> list = realEstateInfoService.list(queryWrapper);
+            int spCount = 0;
+            for (MetaRealEstateInfo metaRealEstateInfo : list){
+                int index1 = metaRealEstateInfo.getRealEstateAddress().indexOf("商铺");
+                if (index1 != -1){
+                    spCount++;
+                }
+            }
+            int zzCount = a-spCount;
             //todo  目前都是写死的
             BuildInformationVo buildInformationVo = new BuildInformationVo();
             buildInformationVo.setCount(StringKit.toString(a));
@@ -341,8 +356,8 @@ public class BigScreenController extends BaseController {
             int countRental = realEstateInfoService.countRentalHousing(metaPara);
             buildInformationVo.setCzfCount(StringKit.toString(countRental));
             buildInformationVo.setQzfCount("0");
-            buildInformationVo.setZzCount("0");
-            buildInformationVo.setSpCount("0");
+            buildInformationVo.setZzCount(StringKit.toString(zzCount));
+            buildInformationVo.setSpCount(StringKit.toString(spCount));
             buildInformationVo.setSzlyCount("0");
             buildInformationVo.setKzCount("0");