新需求

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

@@ -11,10 +11,7 @@ import com.huiju.estateagents.bo.request.RaiseOrderRequestBO;
 import com.huiju.estateagents.bo.request.RaiseRecordRequestBO;
 import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.entity.*;
-import com.huiju.estateagents.service.ITaHousingResourcesService;
-import com.huiju.estateagents.service.ITaOrderService;
-import com.huiju.estateagents.service.ITaRaiseHouseService;
-import com.huiju.estateagents.service.ITaRaiseRecordService;
+import com.huiju.estateagents.service.*;
 import jodd.util.StringUtil;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -56,6 +53,9 @@ public class TaRaiseRecordController extends BaseController {
     @Autowired
     public ITaOrderService taOrderService;
 
+    @Autowired
+    public ITaBuildingImgService taBuildingImgService;
+
     /**
      * 条件查询房源认筹记录
      *
@@ -458,7 +458,7 @@ public class TaRaiseRecordController extends BaseController {
      * @param raiseRecordId 认筹旦id
      * @return
      */
-    @RequestMapping(value = "/wx/taRaiseRecord/{raiseRecordId}", method = RequestMethod.POST)
+    @RequestMapping(value = "/wx/taRaiseRecord/{raiseRecordId}", method = RequestMethod.GET)
     public ResponseBean wxGetRaiseRecordById(@PathVariable Integer raiseRecordId, HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         try {
@@ -513,8 +513,11 @@ public class TaRaiseRecordController extends BaseController {
                 List<TaRaiseHouse> taRaiseHouseList = taRaiseHouseService.list(new QueryWrapper<TaRaiseHouse>().eq("raise_record_id", e.getRaiseRecordId()));
                 //房源信息
                 List<TaHousingResources> houseList = (List<TaHousingResources>) taHousingResourcesService.listByIds(taRaiseHouseList.stream().map(TaRaiseHouse::getHouseId).collect(Collectors.toList()));
+                //户型图列表
+                List<TaBuildingImg> apartMentList = taBuildingImgService.getAparemnetList(houseList.stream().map(TaHousingResources::getApartmentId).collect(Collectors.toList()));
                 e.setTaHousingResourcesList(houseList);
                 e.setTaHousingResourcesSize(houseList.size());
+                e.setApartMentList(apartMentList);
             });
 
             responseBean.addSuccess(page);

src/main/java/com/huiju/estateagents/entity/TaRaiseRecord.java

@@ -215,4 +215,10 @@ public class TaRaiseRecord implements Serializable {
      */
     @TableField(exist = false)
     private String apartmentName;
+
+    /**
+     * 户型图列表列表
+     */
+    @TableField(exist = false)
+    private List<TaBuildingImg> apartMentList = new ArrayList<>();
 }

src/main/java/com/huiju/estateagents/service/ITaBuildingImgService.java

@@ -15,4 +15,11 @@ import java.util.List;
  */
 public interface ITaBuildingImgService extends IService<TaBuildingImg> {
     int insertBatch(List<TaBuildingImg> imgs, String buildingId);
+
+    /**
+     * 获取户型图的图片集合
+     * @param apartMentIds
+     * @return
+     */
+    List<TaBuildingImg> getAparemnetList(List<String> apartMentIds);
 }

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

@@ -1,6 +1,11 @@
 package com.huiju.estateagents.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.huiju.estateagents.entity.TaApartmentImg;
+import com.huiju.estateagents.entity.TaBuildingApartment;
 import com.huiju.estateagents.entity.TaBuildingImg;
+import com.huiju.estateagents.mapper.TaApartmentImgMapper;
+import com.huiju.estateagents.mapper.TaBuildingApartmentMapper;
 import com.huiju.estateagents.mapper.TaBuildingImgMapper;
 import com.huiju.estateagents.service.ITaBuildingImgService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -8,7 +13,9 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
+import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -24,6 +31,9 @@ public class TaBuildingImgServiceImpl extends ServiceImpl<TaBuildingImgMapper, T
     @Autowired
     TaBuildingImgMapper taBuildingImgMapper;
 
+    @Autowired
+    TaApartmentImgMapper taApartmentImgMapper;
+
     @Override
     public int insertBatch(List<TaBuildingImg> imgs, String buildingId) {
         int rows = 0;
@@ -42,4 +52,19 @@ public class TaBuildingImgServiceImpl extends ServiceImpl<TaBuildingImgMapper, T
 
         return rows;
     }
+
+    /**
+     * 获取户型图的图片集合
+     *
+     * @param apartMentIds
+     * @return
+     */
+    @Override
+    public List<TaBuildingImg> getAparemnetList(List<String> apartMentIds) {
+        List<TaApartmentImg> apartmentList = taApartmentImgMapper.selectList(new QueryWrapper<TaApartmentImg>().in("apartment_id", apartMentIds));
+        if (apartmentList.size() > 0){
+            return taBuildingImgMapper.selectList(new QueryWrapper<TaBuildingImg>().in("img_id",apartmentList.stream().map(TaApartmentImg::getImgId).collect(Collectors.toList())));
+        }
+        return new ArrayList<>();
+    }
 }