|
@@ -69,6 +69,13 @@ public class FusionService implements IFusionService {
|
|
|
resourceList = Arrays.asList(1,2,12,13,14);
|
|
|
}else if(param.getType()!= null && param.getType() == 1){ //看见
|
|
|
resourceList = Collections.singletonList(3);
|
|
|
+ }else if(param.getType()!=null && param.getType() == 4){
|
|
|
+ resourceList = Collections.singletonList(4);
|
|
|
+ List<ScenePlusExt> plusExtList = scenePlusExtService.getSsObj();
|
|
|
+ List<Long> plusIds = plusExtList.stream().map(ScenePlusExt::getPlusId).collect(Collectors.toList());
|
|
|
+ if(plusIds.size() >0){
|
|
|
+ wrapper.in(ScenePlus::getId,plusIds);
|
|
|
+ }
|
|
|
}
|
|
|
if(param.getStatus() !=null && param.getStatus() == 2){
|
|
|
wrapper.eq(ScenePlus::getSceneStatus,-2); //计算成功
|