This commit is contained in:
GYJ
2025-01-02 21:12:22 +08:00
parent 2025b4c397
commit b9c4c25537
9 changed files with 20 additions and 17 deletions

View File

@@ -35,7 +35,7 @@ public class AppUpgradeController {
PageHelper.startPage(page,limit);
List<App> list = iAppService.list();
PageInfo<App> pageInfo = new PageInfo<>(list);
return Result.success().put("data", PageUtils.page(pageInfo));
return Result.success().put("data", PageUtils.page(pageInfo, true));
}

View File

@@ -270,10 +270,8 @@ public class UserController {
@GetMapping("/courseMessage")
@ApiOperation("短剧分析")
public Result courseMessage(Long page, Long limit, String date, int type, Long sysUserId) {
PageHelper.startPage(page.intValue(), limit.intValue());
List<Map<String, Object>> list = userService.queryCourseOrder(type, TimeCompleteUtils.completeStartTime(date), sysUserId);
PageInfo<Map<String, Object>> pageInfo = new PageInfo<>(list);
return Result.success().put("data", PageUtils.page(pageInfo));
PageUtils pageUtils = userService.queryCourseOrder(page, limit, type, TimeCompleteUtils.completeStartTime(date), sysUserId);
return Result.success().put("data", pageUtils);
}
/**

View File

@@ -2,6 +2,7 @@ package com.sqx.modules.app.service;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.sqx.common.utils.PageUtils;
import com.sqx.common.utils.Result;
@@ -212,7 +213,7 @@ public interface UserService extends IService<UserEntity> {
Double queryPayMoney(int type,String qdCode);
List<Map<String, Object>> queryCourseOrder(int type, String date,Long sysUserId);
PageUtils queryCourseOrder(Long page, Long limit, int type, String date,Long sysUserId);
int userMessage( String date, int type,String qdCode,Integer vipType);

View File

@@ -1384,7 +1384,7 @@ public class UserServiceImpl extends ServiceImpl<UserDao, UserEntity> implements
}
@Override
public List<Map<String, Object>> queryCourseOrder(int type, String date, Long sysUserId) {
public PageUtils queryCourseOrder(Long page, Long limit, int type, String date, Long sysUserId) {
DateTime parse = DateUtil.parse(date, "yyyy-MM-dd");
String startTime = DateUtil.format(parse, "yyyy-MM-dd 00:00:00");
@@ -1396,7 +1396,12 @@ public class UserServiceImpl extends ServiceImpl<UserDao, UserEntity> implements
startTime = DateUtil.format(DateUtil.beginOfYear(parse), "yyyy-MM-dd 00:00:00");
endTime = DateUtil.format(DateUtil.endOfYear(parse), "yyyy-MM-dd 23:59:59");
}
return baseMapper.queryCourseOrder(type, startTime, endTime, sysUserId);
PageHelper.startPage(page.intValue(), limit.intValue());
List<Map<String, Object>> list = baseMapper.queryCourseOrder(type, startTime, endTime, sysUserId);
PageInfo<Map<String, Object>> pageInfo = new PageInfo<>(list);
return PageUtils.page(pageInfo, true);
}
@Override