|
@@ -140,13 +140,11 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
|
|
SceneNumVo sceneNumVoSS = fdkkLaserService.getLaserSceneNumByUser(token);
|
|
SceneNumVo sceneNumVoSS = fdkkLaserService.getLaserSceneNumByUser(token);
|
|
|
|
|
|
SceneNumVo sceneNumVoSSObj = getSceneNumVoByObjType(Arrays.asList(4), user.getId());
|
|
SceneNumVo sceneNumVoSSObj = getSceneNumVoByObjType(Arrays.asList(4), user.getId());
|
|
- sceneNumVoSS.setSceneNum(sceneNumVoSSObj.getSceneNum() + sceneNumVoSS.getSceneNum());
|
|
|
|
- sceneNumVoSS.setCooperationSceneNum(sceneNumVoSSObj.getCooperationSceneNum() + sceneNumVoSS.getCooperationSceneNum());
|
|
|
|
- sceneNumVoSS.setTotalNum(sceneNumVoSSObj.getTotalNum() + sceneNumVoSS.getTotalNum());
|
|
|
|
HashMap<String, SceneNumVo> hashMap = new HashMap<>();
|
|
HashMap<String, SceneNumVo> hashMap = new HashMap<>();
|
|
hashMap.put("kk",sceneNumVoKk);
|
|
hashMap.put("kk",sceneNumVoKk);
|
|
hashMap.put("kJ",sceneNumVoKj);
|
|
hashMap.put("kJ",sceneNumVoKj);
|
|
hashMap.put("SS",sceneNumVoSS);
|
|
hashMap.put("SS",sceneNumVoSS);
|
|
|
|
+ hashMap.put("SS_OBJ",sceneNumVoSSObj);
|
|
return hashMap;
|
|
return hashMap;
|
|
}
|
|
}
|
|
|
|
|