Merge branch 'dev' of http://git.ycjcjy.com/zhiyuxing/estateagents into dev

src/main/java/com/huiju/estateagents/controller/TaHousingResourcesController.java

@@ -55,6 +55,9 @@ public class TaHousingResourcesController extends BaseController {
     @Autowired
     public ITaBuildingImgService taBuildingImgService;
 
+    @Autowired
+    public ITaSalesBatchService taSalesBatchService;
+
     /**
      * 分页查询列表
      *
@@ -262,7 +265,7 @@ public class TaHousingResourcesController extends BaseController {
             QueryWrapper<TaRaiseHouse> taRaiseHouseQueryWrapper = new QueryWrapper<>();
             taRaiseHouseQueryWrapper.in(taRaiseRecordList.size() > 0, "raise_record_id", taRaiseRecordList.stream().map(TaRaiseRecord::getRaiseRecordId).collect(Collectors.toList()));
             List<TaRaiseHouse> taRaiseHouseList = taRaiseHouseService.list(taRaiseHouseQueryWrapper);
-
+            TaSalesBatch taSalesBatch = taSalesBatchService.getById(salesBatchId);
             taHousingResourcesPOList.forEach(e -> {
                 taPreselectionRecordList.forEach(p -> {
                     //我的预选
@@ -293,6 +296,8 @@ public class TaHousingResourcesController extends BaseController {
                     List<TaBuildingImg> apartMentList = taBuildingImgService.getAparemnetList(apartMentIds);
                     e.setApartmentImgList(apartMentList);
                 }
+
+                e.setDisplayHousePrice(taSalesBatch.getDisplayHousePrice());
             });
 
             responseBean.addSuccess(taHousingResourcesPOList);

src/main/java/com/huiju/estateagents/service/impl/TaPreselectionRecordServiceImpl.java

@@ -16,6 +16,7 @@ import com.huiju.estateagents.mapper.TaHousingResourcesMapper;
 import com.huiju.estateagents.mapper.TaPreselectionRecordMapper;
 import com.huiju.estateagents.po.TaHousingResourcesPO;
 import com.huiju.estateagents.po.TaPreselectionRecordPO;
+import com.huiju.estateagents.service.ITaBuildingApartmentService;
 import com.huiju.estateagents.service.ITaHousingResourcesService;
 import com.huiju.estateagents.service.ITaPreselectionRecordService;
 import org.apache.commons.collections.CollectionUtils;
@@ -66,6 +67,9 @@ public class TaPreselectionRecordServiceImpl extends ServiceImpl<TaPreselectionR
     @Autowired
     private ITaHousingResourcesService taHousingResourcesService;
 
+    @Autowired
+    public ITaBuildingApartmentService taBuildingApartmentService;
+
 
     @Override
     public IPage<TaPreselectionRecordPO> listPreselectionRecord(Integer pageNum, Integer pageSize, Integer orgId, String personId, String buildingId,
@@ -107,7 +111,13 @@ public class TaPreselectionRecordServiceImpl extends ServiceImpl<TaPreselectionR
             housingQueryWrapper.eq("org_id", record.getOrgId());
             housingQueryWrapper.eq("house_id", record.getHouseId());
             housingQueryWrapper.ne("status", -1);
-            record.setHousingInfo(taHousingResourcesService.getOne(housingQueryWrapper));
+            TaHousingResources housingResources = taHousingResourcesService.getOne(housingQueryWrapper);
+            //户型图name
+            TaBuildingApartment buildingApartment = taBuildingApartmentService.getById(housingResources.getApartmentId());
+            housingResources.setApartmentName(buildingApartment.getApartmentName());
+            housingResources.setBuildingArea(buildingApartment.getBuildingArea());
+            housingResources.setInsideArea(buildingApartment.getInsideArea());
+            record.setHousingInfo(housingResources);
         });
 
         iPage.setRecords(resultList);

src/main/java/com/huiju/estateagents/third/controller/TaThirdPartyMiniappConfigController.java

@@ -192,7 +192,7 @@ public class TaThirdPartyMiniappConfigController extends BaseController {
         // 埋點流程, 不影響主流程
 
         try {
-            if (!StringUtils.isEmpty(personId)) {
+            if (StringUtils.isEmpty(personId)) {
                 return res;
             }