|
@@ -7,10 +7,7 @@ import com.zanxiang.game.data.serve.pojo.dto.GameDataDayDTO;
|
|
import com.zanxiang.game.data.serve.pojo.dto.GameDataH5DTO;
|
|
import com.zanxiang.game.data.serve.pojo.dto.GameDataH5DTO;
|
|
import com.zanxiang.game.data.serve.pojo.dto.GameDataTotalDTO;
|
|
import com.zanxiang.game.data.serve.pojo.dto.GameDataTotalDTO;
|
|
import com.zanxiang.game.data.serve.pojo.dto.GameDataWaterDTO;
|
|
import com.zanxiang.game.data.serve.pojo.dto.GameDataWaterDTO;
|
|
-import com.zanxiang.game.data.serve.pojo.entity.AdsEverydayWater;
|
|
|
|
-import com.zanxiang.game.data.serve.pojo.entity.AdsGameDayAgain;
|
|
|
|
-import com.zanxiang.game.data.serve.pojo.entity.AdsGameDayAgainBuy;
|
|
|
|
-import com.zanxiang.game.data.serve.pojo.entity.AdsGameDayAgainNature;
|
|
|
|
|
|
+import com.zanxiang.game.data.serve.pojo.entity.*;
|
|
import com.zanxiang.game.data.serve.pojo.enums.OrderByEnum;
|
|
import com.zanxiang.game.data.serve.pojo.enums.OrderByEnum;
|
|
import com.zanxiang.game.data.serve.pojo.vo.*;
|
|
import com.zanxiang.game.data.serve.pojo.vo.*;
|
|
import com.zanxiang.game.data.serve.service.IGameDataService;
|
|
import com.zanxiang.game.data.serve.service.IGameDataService;
|
|
@@ -114,7 +111,7 @@ public class GameDataServiceImpl implements IGameDataService {
|
|
//得到结果集list
|
|
//得到结果集list
|
|
List<GameDataDayVO> list = sql.getList(GameDataDayVO.class);
|
|
List<GameDataDayVO> list = sql.getList(GameDataDayVO.class);
|
|
//设置查询总数
|
|
//设置查询总数
|
|
- pager.setRecordCount(list.size());
|
|
|
|
|
|
+ pager.setRecordCount(dao.count(AdsGameDay.class,cri));
|
|
|
|
|
|
List<GameDataDayVO> gameDataDayVOList = list.stream().map(vo -> {
|
|
List<GameDataDayVO> gameDataDayVOList = list.stream().map(vo -> {
|
|
//买量数据
|
|
//买量数据
|
|
@@ -458,7 +455,8 @@ public class GameDataServiceImpl implements IGameDataService {
|
|
//得到结果集list
|
|
//得到结果集list
|
|
List<GameDataTotalVO> list = sql.getList(GameDataTotalVO.class);
|
|
List<GameDataTotalVO> list = sql.getList(GameDataTotalVO.class);
|
|
//设置查询总数
|
|
//设置查询总数
|
|
- pager.setRecordCount(list.size());
|
|
|
|
|
|
+ Sql sqlCount = Sqls.queryEntity("select count(*) from ads_game_day a " + cri);
|
|
|
|
+ pager.setRecordCount((int) Daos.queryCount(dao, sqlCount));
|
|
|
|
|
|
//根据充值时间修改值
|
|
//根据充值时间修改值
|
|
List<GameDataTotalVO> gameDataTotalVOList = list.stream().map(vo -> {
|
|
List<GameDataTotalVO> gameDataTotalVOList = list.stream().map(vo -> {
|