|
@@ -179,20 +179,11 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
|
|
|
queryWrapper.eq(ScenePro::getIsUpgrade, 0);
|
|
|
queryWrapper.eq(ScenePro::getIsObj,1);
|
|
|
Integer sceneNum = Math.toIntExact(this.count(queryWrapper));
|
|
|
-
|
|
|
List<ScenePlus> scenePlusList = scenePlusService.getCountByUserIdAndSceneSource(userId,sceneSourceList,1);
|
|
|
|
|
|
long plusCount = scenePlusList.size();
|
|
|
- long cooperNum = 0L;
|
|
|
- if(!scenePlusList.isEmpty()){
|
|
|
- List<String> numList = scenePlusList.stream().map(ScenePlus::getNum).collect(Collectors.toList());
|
|
|
- HashMap<String, User> cooNumList = sceneCooperationService.getByNumList(numList);
|
|
|
- for (String num : cooNumList.keySet()) {
|
|
|
- if(userId.equals(cooNumList.get(num).getId())){
|
|
|
- cooperNum ++;
|
|
|
- }
|
|
|
- }
|
|
|
- }
|
|
|
+ Long cooperNum = sceneCooperationService.getCooperationSceneNum(userId, sceneSourceList);
|
|
|
+
|
|
|
sceneNumVo.setCooperationSceneNum(cooperNum);
|
|
|
sceneNumVo.setSceneNum(sceneNum + plusCount);
|
|
|
sceneNumVo.setTotalNum(sceneNumVo.getSceneNum() + sceneNumVo.getCooperationSceneNum());
|