傅行帆 5 лет назад
Родитель
Сommit
560a4ba48b

+ 24
- 9
src/main/java/com/huiju/estateagents/controller/TaHousingResourcesController.java Просмотреть файл

246
             taRaiseRecordQueryWrapper.eq("person_id",getPersonId(request));
246
             taRaiseRecordQueryWrapper.eq("person_id",getPersonId(request));
247
             taRaiseRecordQueryWrapper.eq("status",CommConstant.STATUS_NORMAL);
247
             taRaiseRecordQueryWrapper.eq("status",CommConstant.STATUS_NORMAL);
248
             List<TaRaiseRecord> taRaiseRecordList = taRaiseRecordService.list(taRaiseRecordQueryWrapper);
248
             List<TaRaiseRecord> taRaiseRecordList = taRaiseRecordService.list(taRaiseRecordQueryWrapper);
249
-            //我认筹的房源的集合
250
-            List<TaRaiseHouse> taRaiseHouseList = new ArrayList<>();
251
-            if (taRaiseRecordList.size() > 0){
252
-                //认筹记录对应的有效房源,我的锁定的房源也在里面
253
-                QueryWrapper<TaRaiseHouse> taRaiseHouseQueryWrapper = new QueryWrapper<>();
254
-                taRaiseHouseQueryWrapper.in("raise_record_id",taRaiseRecordList.stream().map(TaRaiseRecord::getRaiseRecordId).collect(Collectors.toList()));
255
-                taRaiseHouseQueryWrapper.in("person_id",getPersonId(request));
256
-                taRaiseHouseList = taRaiseHouseService.list(taRaiseHouseQueryWrapper);
257
-            }
249
+
250
+            //认筹记录对应的有效房源,我的锁定的房源也在里面
251
+            QueryWrapper<TaRaiseHouse> taRaiseHouseQueryWrapper = new QueryWrapper<>();
252
+            taRaiseHouseQueryWrapper.in(taRaiseRecordList.size() > 0,"raise_record_id",taRaiseRecordList.stream().map(TaRaiseRecord::getRaiseRecordId).collect(Collectors.toList()));
253
+            List<TaRaiseHouse> taRaiseHouseList = taRaiseHouseService.list(taRaiseHouseQueryWrapper);
254
+
255
+            taHousingResourcesPOList.forEach(e -> {
256
+                taPreselectionRecordList.forEach(p -> {
257
+                    //我的预选
258
+                    if (e.getHouseId().equals(p.getHouseId())){
259
+                        e.setMinePreselection("mine");
260
+                    }
261
+                });
262
+                //我的认筹和锁定
263
+                taRaiseHouseList.forEach(r -> {
264
+                    //我的认筹
265
+                    if (e.getHouseId().equals(r.getHouseId())){
266
+                        e.setMineRaise("mine");
267
+                        if (r.getHouseLockingStatus().equals(CommConstant.HOUSE_LOCKING_STATUS_LOCKED)){
268
+                            e.setMineLocked("mine");
269
+                        }
270
+                    }
271
+                });
272
+            });
258
 
273
 
259
             responseBean.addSuccess(taHousingResourcesPOList);
274
             responseBean.addSuccess(taHousingResourcesPOList);
260
         } catch (Exception e) {
275
         } catch (Exception e) {

+ 15
- 0
src/main/java/com/huiju/estateagents/po/TaHousingResourcesPO.java Просмотреть файл

55
      * 楼盘名称
55
      * 楼盘名称
56
      */
56
      */
57
     private String buildingName;
57
     private String buildingName;
58
+
59
+    /**
60
+     * 我的预选
61
+     */
62
+    private String minePreselection;
63
+
64
+    /**
65
+     * 我的认筹
66
+     */
67
+    private String mineRaise;
68
+
69
+    /**
70
+     * 我的锁定
71
+     */
72
+    private String mineLocked;
58
 }
73
 }