fix:修改代理商活动操作日志按时间倒序排序
This commit is contained in:
parent
f683e7caa7
commit
067dbdd58c
@ -30,32 +30,13 @@ public class AdminAgentActivityLogServiceImpl implements IAdminAgentActivityLogS
|
|||||||
@Override
|
@Override
|
||||||
public PageListBean<AdminAgentActivityLogResp> pageList(AgentActivityLogQueryReq query) {
|
public PageListBean<AdminAgentActivityLogResp> pageList(AgentActivityLogQueryReq query) {
|
||||||
Page<MpAgentActivityLogEntity> page = new Page<>(query.getPageNum(), query.getPageSize());
|
Page<MpAgentActivityLogEntity> page = new Page<>(query.getPageNum(), query.getPageSize());
|
||||||
|
|
||||||
LambdaQueryWrapper<MpAgentActivityLogEntity> wrapper = new LambdaQueryWrapper<>();
|
LambdaQueryWrapper<MpAgentActivityLogEntity> wrapper = new LambdaQueryWrapper<>();
|
||||||
|
wrapper.eq(query.getActivityId() != null, MpAgentActivityLogEntity::getActivityId, query.getActivityId())
|
||||||
// 根据活动ID查询
|
.eq(query.getOperatorId() != null, MpAgentActivityLogEntity::getOperatorId, query.getOperatorId())
|
||||||
if (query.getActivityId() != null) {
|
.eq(query.getOperationType() != null, MpAgentActivityLogEntity::getOperationType, query.getOperationType())
|
||||||
wrapper.eq(MpAgentActivityLogEntity::getActivityId, query.getActivityId());
|
.ge(query.getStartTime() != null, MpAgentActivityLogEntity::getCreateTime, query.getStartTime())
|
||||||
}
|
.le(query.getEndTime() != null, MpAgentActivityLogEntity::getCreateTime, query.getEndTime())
|
||||||
|
.orderByDesc(MpAgentActivityLogEntity::getUpdateTime);
|
||||||
// 根据操作人ID查询
|
|
||||||
if (query.getOperatorId() != null) {
|
|
||||||
wrapper.eq(MpAgentActivityLogEntity::getOperatorId, query.getOperatorId());
|
|
||||||
}
|
|
||||||
|
|
||||||
// 根据操作类型查询
|
|
||||||
if (query.getOperationType() != null && !query.getOperationType().isEmpty()) {
|
|
||||||
wrapper.eq(MpAgentActivityLogEntity::getOperationType, query.getOperationType());
|
|
||||||
}
|
|
||||||
|
|
||||||
// 根据创建时间范围查询
|
|
||||||
if (query.getStartTime() != null) {
|
|
||||||
wrapper.ge(MpAgentActivityLogEntity::getCreateTime, query.getStartTime());
|
|
||||||
}
|
|
||||||
if (query.getEndTime() != null) {
|
|
||||||
wrapper.le(MpAgentActivityLogEntity::getCreateTime, query.getEndTime());
|
|
||||||
}
|
|
||||||
wrapper.orderByDesc(MpAgentActivityLogEntity::getUpdateTime);
|
|
||||||
|
|
||||||
IPage<MpAgentActivityLogEntity> result = mpAgentActivityLogService.page(page, wrapper);
|
IPage<MpAgentActivityLogEntity> result = mpAgentActivityLogService.page(page, wrapper);
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user