需求

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

@@ -246,15 +246,30 @@ public class TaHousingResourcesController extends BaseController {
             taRaiseRecordQueryWrapper.eq("person_id",getPersonId(request));
             taRaiseRecordQueryWrapper.eq("status",CommConstant.STATUS_NORMAL);
             List<TaRaiseRecord> taRaiseRecordList = taRaiseRecordService.list(taRaiseRecordQueryWrapper);
-            //我认筹的房源的集合
-            List<TaRaiseHouse> taRaiseHouseList = new ArrayList<>();
-            if (taRaiseRecordList.size() > 0){
-                //认筹记录对应的有效房源,我的锁定的房源也在里面
-                QueryWrapper<TaRaiseHouse> taRaiseHouseQueryWrapper = new QueryWrapper<>();
-                taRaiseHouseQueryWrapper.in("raise_record_id",taRaiseRecordList.stream().map(TaRaiseRecord::getRaiseRecordId).collect(Collectors.toList()));
-                taRaiseHouseQueryWrapper.in("person_id",getPersonId(request));
-                taRaiseHouseList = taRaiseHouseService.list(taRaiseHouseQueryWrapper);
-            }
+
+            //认筹记录对应的有效房源,我的锁定的房源也在里面
+            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);
+
+            taHousingResourcesPOList.forEach(e -> {
+                taPreselectionRecordList.forEach(p -> {
+                    //我的预选
+                    if (e.getHouseId().equals(p.getHouseId())){
+                        e.setMinePreselection("mine");
+                    }
+                });
+                //我的认筹和锁定
+                taRaiseHouseList.forEach(r -> {
+                    //我的认筹
+                    if (e.getHouseId().equals(r.getHouseId())){
+                        e.setMineRaise("mine");
+                        if (r.getHouseLockingStatus().equals(CommConstant.HOUSE_LOCKING_STATUS_LOCKED)){
+                            e.setMineLocked("mine");
+                        }
+                    }
+                });
+            });
 
             responseBean.addSuccess(taHousingResourcesPOList);
         } catch (Exception e) {

src/main/java/com/huiju/estateagents/po/TaHousingResourcesPO.java

@@ -55,4 +55,19 @@ public class TaHousingResourcesPO extends TaHousingResources {
      * 楼盘名称
      */
     private String buildingName;
+
+    /**
+     * 我的预选
+     */
+    private String minePreselection;
+
+    /**
+     * 我的认筹
+     */
+    private String mineRaise;
+
+    /**
+     * 我的锁定
+     */
+    private String mineLocked;
 }