|
|
@@ -1,20 +1,15 @@
|
|
1
|
1
|
package com.yunzhi.marketing.xlk.controller;
|
|
2
|
2
|
|
|
3
|
3
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
|
4
|
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
4
|
5
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
5
|
6
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
6
|
7
|
import com.yunzhi.marketing.base.BaseController;
|
|
7
|
8
|
import com.yunzhi.marketing.base.ResponseBean;
|
|
8
|
9
|
import com.yunzhi.marketing.common.CommConstant;
|
|
9
|
10
|
import com.yunzhi.marketing.common.StringUtils;
|
|
10
|
|
-import com.yunzhi.marketing.entity.SysOrgParams;
|
|
11
|
|
-import com.yunzhi.marketing.entity.TaBuilding;
|
|
12
|
|
-import com.yunzhi.marketing.entity.TaPerson;
|
|
13
|
|
-import com.yunzhi.marketing.entity.TdCity;
|
|
14
|
|
-import com.yunzhi.marketing.service.ISysOrgParamsService;
|
|
15
|
|
-import com.yunzhi.marketing.service.ITaBuildingService;
|
|
16
|
|
-import com.yunzhi.marketing.service.ITaPersonService;
|
|
17
|
|
-import com.yunzhi.marketing.service.ITdCityService;
|
|
|
11
|
+import com.yunzhi.marketing.entity.*;
|
|
|
12
|
+import com.yunzhi.marketing.service.*;
|
|
18
|
13
|
import com.yunzhi.marketing.xlk.dto.SearchHouseDTO;
|
|
19
|
14
|
import com.yunzhi.marketing.xlk.dto.SearchHouseReplayDTO;
|
|
20
|
15
|
import com.yunzhi.marketing.xlk.entity.Curriculum;
|
|
|
@@ -23,6 +18,7 @@ import com.yunzhi.marketing.xlk.service.ISearchHouseService;
|
|
23
|
18
|
import com.yunzhi.marketing.xlk.vo.SearchHouseVO;
|
|
24
|
19
|
import io.swagger.annotations.Api;
|
|
25
|
20
|
import io.swagger.annotations.ApiOperation;
|
|
|
21
|
+import org.apache.commons.collections.CollectionUtils;
|
|
26
|
22
|
import org.slf4j.Logger;
|
|
27
|
23
|
import org.slf4j.LoggerFactory;
|
|
28
|
24
|
import org.springframework.beans.BeanUtils;
|
|
|
@@ -65,6 +61,9 @@ public class SearchHouseController extends BaseController {
|
|
65
|
61
|
@Autowired
|
|
66
|
62
|
private ISysOrgParamsService iSysOrgParamsService;
|
|
67
|
63
|
|
|
|
64
|
+ @Autowired
|
|
|
65
|
+ private ITaBuildingImgService taBuildingImgService;
|
|
|
66
|
+
|
|
68
|
67
|
/**
|
|
69
|
68
|
* 分页查询列表
|
|
70
|
69
|
* @param pageNum
|
|
|
@@ -132,7 +131,18 @@ public class SearchHouseController extends BaseController {
|
|
132
|
131
|
if (iSearchHouseService.save(searchHouse)){
|
|
133
|
132
|
if (null != searchHouseDTO.getNeedRecommend() && searchHouseDTO.getNeedRecommend()) {
|
|
134
|
133
|
List<TaBuilding> buildingList = iSearchHouseService.getRecommendBuildings(getOrgId(request), searchHouseDTO);
|
|
|
134
|
+ if (CollectionUtils.isNotEmpty(buildingList)) {
|
|
|
135
|
+ for (TaBuilding build : buildingList) {
|
|
|
136
|
+ //查询封面当前图片
|
|
|
137
|
+ QueryWrapper<TaBuildingImg> queryListWrapper = new QueryWrapper<>();
|
|
|
138
|
+ queryListWrapper.eq("building_id", build.getBuildingId());
|
|
|
139
|
+ queryListWrapper.eq("img_type", CommConstant.BUILDING_IMG_LIST);
|
|
|
140
|
+ queryListWrapper.orderByAsc("create_date");
|
|
135
|
141
|
|
|
|
142
|
+ List<TaBuildingImg> buildingListImg = taBuildingImgService.list(queryListWrapper);
|
|
|
143
|
+ build.setBuildingListImg(buildingListImg);
|
|
|
144
|
+ }
|
|
|
145
|
+ }
|
|
136
|
146
|
SearchHouseVO searchHouseVO = new SearchHouseVO();
|
|
137
|
147
|
BeanUtils.copyProperties(searchHouse,searchHouseVO);
|
|
138
|
148
|
searchHouseVO.setTaBuildingList(buildingList);
|
