|
|
|
@ -5,11 +5,9 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
|
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
|
|
|
import com.zh.project0512.mapper.UserMapper;
|
|
|
|
|
import com.zh.project0512.mapper.UserPointsRecordMapper;
|
|
|
|
|
import com.zh.project0512.model.Rank;
|
|
|
|
|
import com.zh.project0512.model.User;
|
|
|
|
|
import com.zh.project0512.model.UserPointsRecords;
|
|
|
|
|
import com.zh.project0512.model.dto.UserPointsRecordListDTO;
|
|
|
|
|
import com.zh.project0512.model.vo.RankListVo;
|
|
|
|
|
import com.zh.project0512.model.vo.UserPointsRecordListVo;
|
|
|
|
|
import com.zh.project0512.model.vo.UserPointsVo;
|
|
|
|
|
import com.zh.project0512.service.IUserPointsRecordsService;
|
|
|
|
@ -41,12 +39,12 @@ public class UserPointsRecordServiceImpl implements IUserPointsRecordsService {
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
|
public PageInfo<UserPointsRecordListVo> list(UserPointsRecordListDTO userPointsRecordListDTO) {
|
|
|
|
|
public PageInfo<UserPointsRecordListVo> list(UserPointsRecordListDTO userPointsRecordListDTO, String openid) {
|
|
|
|
|
ArrayList<UserPointsRecordListVo> userPointsRecordListVos = new ArrayList<>();
|
|
|
|
|
QueryWrapper<UserPointsRecords> queryWrapper = new QueryWrapper<>();
|
|
|
|
|
queryWrapper.eq(userPointsRecordListDTO.getYears() != null,"YEAR(createDate)",userPointsRecordListDTO.getYears());
|
|
|
|
|
queryWrapper.eq(userPointsRecordListDTO.getMonths() != null,"MONTH(createDate)",userPointsRecordListDTO.getMonths());
|
|
|
|
|
Page<UserPointsRecords> page = new Page<>(userPointsRecordListDTO.getPageNum(), userPointsRecordListDTO.getSize());
|
|
|
|
|
Page<UserPointsRecords> page = new Page<>(userPointsRecordListDTO.getPageNum(), userPointsRecordListDTO.getPageSize());
|
|
|
|
|
IPage<UserPointsRecords> userPointsRecordsIPage = userPointsRecordMapper.selectPage(page, queryWrapper);
|
|
|
|
|
List<UserPointsRecords> records = userPointsRecordsIPage.getRecords();
|
|
|
|
|
if (records != null && records.size()>0){
|
|
|
|
|