|
@@ -9,10 +9,12 @@ import com.huiju.estateagents.common.CommConstant;
|
9
|
9
|
import com.huiju.estateagents.entity.TaPoster;
|
10
|
10
|
import com.huiju.estateagents.entity.TaSalesBatch;
|
11
|
11
|
import com.huiju.estateagents.entity.TaShareContent;
|
|
12
|
+import com.huiju.estateagents.entity.TdPosterTemplate;
|
12
|
13
|
import com.huiju.estateagents.mapper.TaPosterMapper;
|
13
|
14
|
import com.huiju.estateagents.mapper.TaSalesBatchMapper;
|
14
|
15
|
import com.huiju.estateagents.service.ITaSalesBatchService;
|
15
|
16
|
import org.apache.commons.collections.CollectionUtils;
|
|
17
|
+import org.checkerframework.checker.units.qual.A;
|
16
|
18
|
import org.slf4j.Logger;
|
17
|
19
|
import org.slf4j.LoggerFactory;
|
18
|
20
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
@@ -45,6 +47,12 @@ public class TaSalesBatchServiceImpl extends ServiceImpl<TaSalesBatchMapper, TaS
|
45
|
47
|
@Autowired
|
46
|
48
|
private ShareContentServiceImpl shareContentService;
|
47
|
49
|
|
|
50
|
+ @Autowired
|
|
51
|
+ private TdPosterTemplateServiceImpl tdPosterTemplateService;
|
|
52
|
+
|
|
53
|
+ @Autowired
|
|
54
|
+ private TaPosterServiceImpl taPosterService;
|
|
55
|
+
|
48
|
56
|
@Override
|
49
|
57
|
public IPage<TaSalesBatch> selectByCondition(IPage<TaSalesBatch> page, String salesBatchName, String buildingId, Integer status, Integer orgId) {
|
50
|
58
|
return taSalesBatchMapper.selectByCondition(page, salesBatchName, buildingId, status, orgId);
|
|
@@ -117,21 +125,29 @@ public class TaSalesBatchServiceImpl extends ServiceImpl<TaSalesBatchMapper, TaS
|
117
|
125
|
}
|
118
|
126
|
|
119
|
127
|
// 获取海报信息
|
120
|
|
- QueryWrapper<TaPoster>queryWrapper = new QueryWrapper<>();
|
|
128
|
+ QueryWrapper<TaPoster> queryWrapper = new QueryWrapper<>();
|
121
|
129
|
queryWrapper.eq("target_id",salesBatchId + "");
|
122
|
130
|
queryWrapper.eq("target_type","house");
|
123
|
131
|
queryWrapper.eq("status", CommConstant.STATUS_NORMAL);
|
124
|
|
- TaPoster poster =taPosterMapper.selectOne(queryWrapper);
|
|
132
|
+ List<TaPoster> posterList =taPosterService.list(queryWrapper);
|
125
|
133
|
|
126
|
134
|
// 获取分享内容信息
|
127
|
135
|
List<TaShareContent> shareContentList = shareContentService.getPostersForTarget(salesBatchId + "", "house");
|
128
|
136
|
|
129
|
|
- List<TaPoster> posterList = new ArrayList<>();
|
130
|
|
- if(poster != null){
|
131
|
|
- posterList.add(poster);
|
|
137
|
+ List<TaPoster> resultPosterList = new ArrayList<>();
|
|
138
|
+ if(CollectionUtils.isNotEmpty(posterList)){
|
|
139
|
+ for(TaPoster poster:posterList){
|
|
140
|
+ QueryWrapper<TdPosterTemplate> templateQueryWrapper = new QueryWrapper<>();
|
|
141
|
+ templateQueryWrapper.eq("status","1");
|
|
142
|
+ templateQueryWrapper.eq("type ","HousingChoice ");
|
|
143
|
+ List<TdPosterTemplate> posterTemplate = tdPosterTemplateService.list(templateQueryWrapper);
|
|
144
|
+
|
|
145
|
+ poster.setTemplates(posterTemplate);
|
|
146
|
+ resultPosterList.add(poster);
|
|
147
|
+ }
|
132
|
148
|
}
|
133
|
149
|
|
134
|
|
- result.setPosters(posterList);
|
|
150
|
+ result.setPosters(resultPosterList);
|
135
|
151
|
result.setShareContents(shareContentList);
|
136
|
152
|
responseBean.addSuccess(result);
|
137
|
153
|
return responseBean;
|