瀏覽代碼

新需求

傅行帆 5 年之前
父節點
當前提交
476d85c738

+ 8
- 5
src/main/java/com/huiju/estateagents/controller/TaRaiseRecordController.java 查看文件

11
 import com.huiju.estateagents.bo.request.RaiseRecordRequestBO;
11
 import com.huiju.estateagents.bo.request.RaiseRecordRequestBO;
12
 import com.huiju.estateagents.common.CommConstant;
12
 import com.huiju.estateagents.common.CommConstant;
13
 import com.huiju.estateagents.entity.*;
13
 import com.huiju.estateagents.entity.*;
14
-import com.huiju.estateagents.service.ITaHousingResourcesService;
15
-import com.huiju.estateagents.service.ITaOrderService;
16
-import com.huiju.estateagents.service.ITaRaiseHouseService;
17
-import com.huiju.estateagents.service.ITaRaiseRecordService;
14
+import com.huiju.estateagents.service.*;
18
 import jodd.util.StringUtil;
15
 import jodd.util.StringUtil;
19
 import org.apache.commons.collections.CollectionUtils;
16
 import org.apache.commons.collections.CollectionUtils;
20
 import org.apache.commons.lang3.StringUtils;
17
 import org.apache.commons.lang3.StringUtils;
56
     @Autowired
53
     @Autowired
57
     public ITaOrderService taOrderService;
54
     public ITaOrderService taOrderService;
58
 
55
 
56
+    @Autowired
57
+    public ITaBuildingImgService taBuildingImgService;
58
+
59
     /**
59
     /**
60
      * 条件查询房源认筹记录
60
      * 条件查询房源认筹记录
61
      *
61
      *
458
      * @param raiseRecordId 认筹旦id
458
      * @param raiseRecordId 认筹旦id
459
      * @return
459
      * @return
460
      */
460
      */
461
-    @RequestMapping(value = "/wx/taRaiseRecord/{raiseRecordId}", method = RequestMethod.POST)
461
+    @RequestMapping(value = "/wx/taRaiseRecord/{raiseRecordId}", method = RequestMethod.GET)
462
     public ResponseBean wxGetRaiseRecordById(@PathVariable Integer raiseRecordId, HttpServletRequest request) {
462
     public ResponseBean wxGetRaiseRecordById(@PathVariable Integer raiseRecordId, HttpServletRequest request) {
463
         ResponseBean responseBean = new ResponseBean();
463
         ResponseBean responseBean = new ResponseBean();
464
         try {
464
         try {
513
                 List<TaRaiseHouse> taRaiseHouseList = taRaiseHouseService.list(new QueryWrapper<TaRaiseHouse>().eq("raise_record_id", e.getRaiseRecordId()));
513
                 List<TaRaiseHouse> taRaiseHouseList = taRaiseHouseService.list(new QueryWrapper<TaRaiseHouse>().eq("raise_record_id", e.getRaiseRecordId()));
514
                 //房源信息
514
                 //房源信息
515
                 List<TaHousingResources> houseList = (List<TaHousingResources>) taHousingResourcesService.listByIds(taRaiseHouseList.stream().map(TaRaiseHouse::getHouseId).collect(Collectors.toList()));
515
                 List<TaHousingResources> houseList = (List<TaHousingResources>) taHousingResourcesService.listByIds(taRaiseHouseList.stream().map(TaRaiseHouse::getHouseId).collect(Collectors.toList()));
516
+                //户型图列表
517
+                List<TaBuildingImg> apartMentList = taBuildingImgService.getAparemnetList(houseList.stream().map(TaHousingResources::getApartmentId).collect(Collectors.toList()));
516
                 e.setTaHousingResourcesList(houseList);
518
                 e.setTaHousingResourcesList(houseList);
517
                 e.setTaHousingResourcesSize(houseList.size());
519
                 e.setTaHousingResourcesSize(houseList.size());
520
+                e.setApartMentList(apartMentList);
518
             });
521
             });
519
 
522
 
520
             responseBean.addSuccess(page);
523
             responseBean.addSuccess(page);

+ 6
- 0
src/main/java/com/huiju/estateagents/entity/TaRaiseRecord.java 查看文件

215
      */
215
      */
216
     @TableField(exist = false)
216
     @TableField(exist = false)
217
     private String apartmentName;
217
     private String apartmentName;
218
+
219
+    /**
220
+     * 户型图列表列表
221
+     */
222
+    @TableField(exist = false)
223
+    private List<TaBuildingImg> apartMentList = new ArrayList<>();
218
 }
224
 }

+ 7
- 0
src/main/java/com/huiju/estateagents/service/ITaBuildingImgService.java 查看文件

15
  */
15
  */
16
 public interface ITaBuildingImgService extends IService<TaBuildingImg> {
16
 public interface ITaBuildingImgService extends IService<TaBuildingImg> {
17
     int insertBatch(List<TaBuildingImg> imgs, String buildingId);
17
     int insertBatch(List<TaBuildingImg> imgs, String buildingId);
18
+
19
+    /**
20
+     * 获取户型图的图片集合
21
+     * @param apartMentIds
22
+     * @return
23
+     */
24
+    List<TaBuildingImg> getAparemnetList(List<String> apartMentIds);
18
 }
25
 }

+ 25
- 0
src/main/java/com/huiju/estateagents/service/impl/TaBuildingImgServiceImpl.java 查看文件

1
 package com.huiju.estateagents.service.impl;
1
 package com.huiju.estateagents.service.impl;
2
 
2
 
3
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
4
+import com.huiju.estateagents.entity.TaApartmentImg;
5
+import com.huiju.estateagents.entity.TaBuildingApartment;
3
 import com.huiju.estateagents.entity.TaBuildingImg;
6
 import com.huiju.estateagents.entity.TaBuildingImg;
7
+import com.huiju.estateagents.mapper.TaApartmentImgMapper;
8
+import com.huiju.estateagents.mapper.TaBuildingApartmentMapper;
4
 import com.huiju.estateagents.mapper.TaBuildingImgMapper;
9
 import com.huiju.estateagents.mapper.TaBuildingImgMapper;
5
 import com.huiju.estateagents.service.ITaBuildingImgService;
10
 import com.huiju.estateagents.service.ITaBuildingImgService;
6
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
11
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
8
 import org.springframework.stereotype.Service;
13
 import org.springframework.stereotype.Service;
9
 
14
 
10
 import java.time.LocalDateTime;
15
 import java.time.LocalDateTime;
16
+import java.util.ArrayList;
11
 import java.util.List;
17
 import java.util.List;
18
+import java.util.stream.Collectors;
12
 
19
 
13
 /**
20
 /**
14
  * <p>
21
  * <p>
24
     @Autowired
31
     @Autowired
25
     TaBuildingImgMapper taBuildingImgMapper;
32
     TaBuildingImgMapper taBuildingImgMapper;
26
 
33
 
34
+    @Autowired
35
+    TaApartmentImgMapper taApartmentImgMapper;
36
+
27
     @Override
37
     @Override
28
     public int insertBatch(List<TaBuildingImg> imgs, String buildingId) {
38
     public int insertBatch(List<TaBuildingImg> imgs, String buildingId) {
29
         int rows = 0;
39
         int rows = 0;
42
 
52
 
43
         return rows;
53
         return rows;
44
     }
54
     }
55
+
56
+    /**
57
+     * 获取户型图的图片集合
58
+     *
59
+     * @param apartMentIds
60
+     * @return
61
+     */
62
+    @Override
63
+    public List<TaBuildingImg> getAparemnetList(List<String> apartMentIds) {
64
+        List<TaApartmentImg> apartmentList = taApartmentImgMapper.selectList(new QueryWrapper<TaApartmentImg>().in("apartment_id", apartMentIds));
65
+        if (apartmentList.size() > 0){
66
+            return taBuildingImgMapper.selectList(new QueryWrapper<TaBuildingImg>().in("img_id",apartmentList.stream().map(TaApartmentImg::getImgId).collect(Collectors.toList())));
67
+        }
68
+        return new ArrayList<>();
69
+    }
45
 }
70
 }