|
|
|
@ -13,8 +13,6 @@ import com.zh.project0512.utils.page.PageInfo;
|
|
|
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
|
|
|
|
|
import javax.annotation.Resource;
|
|
|
|
|
import java.time.LocalDate;
|
|
|
|
|
import java.time.LocalDateTime;
|
|
|
|
|
import java.util.ArrayList;
|
|
|
|
|
import java.util.Calendar;
|
|
|
|
|
import java.util.Date;
|
|
|
|
@ -28,20 +26,19 @@ public class RankServiceImpl implements IRankService {
|
|
|
|
|
@Override
|
|
|
|
|
public PageInfo<RankListVo> rankList(RankListDTO rankListDTO) {
|
|
|
|
|
ArrayList<RankListVo> rankListVoList = new ArrayList<>();
|
|
|
|
|
// Calendar cal = Calendar.getInstance();
|
|
|
|
|
// cal.setTime(new Date());
|
|
|
|
|
// cal.add(Calendar.MONTH,-1);
|
|
|
|
|
// cal.set(Calendar.DAY_OF_MONTH,1);
|
|
|
|
|
// cal.set(Calendar.HOUR_OF_DAY, 0);
|
|
|
|
|
// cal.set(Calendar.MINUTE, 0);
|
|
|
|
|
// cal.set(Calendar.SECOND, 0);
|
|
|
|
|
// cal.set(Calendar.MILLISECOND,0);
|
|
|
|
|
// Date time = cal.getTime();
|
|
|
|
|
LocalDate now = LocalDate.now().minusMonths(1);
|
|
|
|
|
Calendar cal = Calendar.getInstance();
|
|
|
|
|
cal.setTime(new Date());
|
|
|
|
|
cal.add(Calendar.MONTH,-1);
|
|
|
|
|
cal.set(Calendar.DAY_OF_MONTH,1);
|
|
|
|
|
cal.set(Calendar.HOUR_OF_DAY, 0);
|
|
|
|
|
cal.set(Calendar.MINUTE, 0);
|
|
|
|
|
cal.set(Calendar.SECOND, 0);
|
|
|
|
|
cal.set(Calendar.MILLISECOND,0);
|
|
|
|
|
Date time = cal.getTime();
|
|
|
|
|
|
|
|
|
|
QueryWrapper<Rank> queryWrapper = new QueryWrapper<>();
|
|
|
|
|
queryWrapper.eq("type",rankListDTO.getType());
|
|
|
|
|
queryWrapper.eq("dateStart", now.atStartOfDay());
|
|
|
|
|
queryWrapper.eq("dateStart",time);
|
|
|
|
|
Page<Rank> page = new Page<>(rankListDTO.getPageNum(), rankListDTO.getPageSize());
|
|
|
|
|
IPage<Rank> rankIPage = rankMapper.selectPage(page, queryWrapper);
|
|
|
|
|
List<Rank> records = rankIPage.getRecords();
|
|
|
|
|