|
|
@@ -8,12 +8,12 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
8
|
8
|
import com.huiju.estateagents.base.ResponseBean;
|
|
9
|
9
|
import com.huiju.estateagents.common.CommConstant;
|
|
10
|
10
|
import com.huiju.estateagents.common.StringUtils;
|
|
11
|
|
-import com.huiju.estateagents.entity.TaPersonBuilding;
|
|
12
|
|
-import com.huiju.estateagents.entity.TaRaise;
|
|
13
|
|
-import com.huiju.estateagents.entity.TaRaiseRecord;
|
|
14
|
|
-import com.huiju.estateagents.entity.TaSalesBatch;
|
|
|
11
|
+import com.huiju.estateagents.entity.*;
|
|
|
12
|
+import com.huiju.estateagents.mapper.TaHousingResourcesMapper;
|
|
|
13
|
+import com.huiju.estateagents.mapper.TaRaiseHouseMapper;
|
|
15
|
14
|
import com.huiju.estateagents.mapper.TaRaiseMapper;
|
|
16
|
15
|
import com.huiju.estateagents.mapper.TaRaiseRecordMapper;
|
|
|
16
|
+import com.huiju.estateagents.service.ITaHousingResourcesService;
|
|
17
|
17
|
import com.huiju.estateagents.service.ITaRaiseService;
|
|
18
|
18
|
import org.apache.commons.collections.CollectionUtils;
|
|
19
|
19
|
import org.apache.commons.collections4.QueueUtils;
|
|
|
@@ -24,6 +24,7 @@ import org.springframework.stereotype.Service;
|
|
24
|
24
|
|
|
25
|
25
|
import javax.servlet.http.HttpServletRequest;
|
|
26
|
26
|
import java.util.List;
|
|
|
27
|
+import java.util.stream.Collectors;
|
|
27
|
28
|
|
|
28
|
29
|
/**
|
|
29
|
30
|
* <p>
|
|
|
@@ -44,6 +45,12 @@ public class TaRaiseServiceImpl extends ServiceImpl<TaRaiseMapper, TaRaise> impl
|
|
44
|
45
|
@Autowired
|
|
45
|
46
|
private TaRaiseMapper taRaiseMapper;
|
|
46
|
47
|
|
|
|
48
|
+ @Autowired
|
|
|
49
|
+ private TaRaiseHouseMapper taRaiseHouseMapper;
|
|
|
50
|
+
|
|
|
51
|
+ @Autowired
|
|
|
52
|
+ private ITaHousingResourcesService taHousingResourcesService;
|
|
|
53
|
+
|
|
47
|
54
|
@Override
|
|
48
|
55
|
public ResponseBean listRaiseByCondition(Integer pageSize, Integer pageNum, String salesBatchName, String buildingId, Integer orgId, Integer status, List<TaPersonBuilding> taPersonBuildingListByUserId) {
|
|
49
|
56
|
logger.info("listSalesBatchForRaise 接收参数：pageSize:{},pageNum:{},salesBatchName:{},buildilgId:{},orgId:{},status:{},taPersonBuildingListByUserId:{}",
|
|
|
@@ -130,6 +137,16 @@ public class TaRaiseServiceImpl extends ServiceImpl<TaRaiseMapper, TaRaise> impl
|
|
130
|
137
|
wrapper.last("limit 1");
|
|
131
|
138
|
taRaiseRecord = taRaiseRecordMapper.selectOne(wrapper);
|
|
132
|
139
|
|
|
|
140
|
+ //加入房源信息
|
|
|
141
|
+ if (null != taRaiseRecord){
|
|
|
142
|
+ //房源与认筹单关系图
|
|
|
143
|
+ List<TaRaiseHouse> taRaiseHouseList = taRaiseHouseMapper.selectList(new QueryWrapper<TaRaiseHouse>().eq("raise_record_id", taRaiseRecord.getRaiseRecordId()));
|
|
|
144
|
+ if (taRaiseHouseList.size() > 0){
|
|
|
145
|
+ //房源信息
|
|
|
146
|
+ List<TaHousingResources> houseList = (List<TaHousingResources>) taHousingResourcesService.listByIds(taRaiseHouseList.stream().map(TaRaiseHouse::getHouseId).collect(Collectors.toList()));
|
|
|
147
|
+ taRaiseRecord.setTaHousingResourcesList(houseList);
|
|
|
148
|
+ }
|
|
|
149
|
+ }
|
|
133
|
150
|
if (taRaise == null && taRaiseRecord != null) {
|
|
134
|
151
|
taRaise = this.getById(taRaiseRecord.getRaiseId());
|
|
135
|
152
|
}
|
