|
@@ -16,6 +16,7 @@ import org.springframework.transaction.annotation.Transactional;
|
|
|
import javax.annotation.Resource;
|
|
import javax.annotation.Resource;
|
|
|
import java.util.Date;
|
|
import java.util.Date;
|
|
|
import java.util.List;
|
|
import java.util.List;
|
|
|
|
|
+import java.util.Map;
|
|
|
import com.etotem.cfc.util.SortUtil;
|
|
import com.etotem.cfc.util.SortUtil;
|
|
|
|
|
|
|
|
@Slf4j
|
|
@Slf4j
|
|
@@ -95,7 +96,8 @@ public class UserOperationLogService {
|
|
|
*/
|
|
*/
|
|
|
public Page<UserOperationLog> queryLogs(Long userId, String operationType,
|
|
public Page<UserOperationLog> queryLogs(Long userId, String operationType,
|
|
|
Date startDate, Date endDate,
|
|
Date startDate, Date endDate,
|
|
|
- Integer page, Integer size) {
|
|
|
|
|
|
|
+ Integer page, Integer size,
|
|
|
|
|
+ List<Map<String, String>> sortSpecs) {
|
|
|
Page<UserOperationLog> pageParam = new Page<>(page, size);
|
|
Page<UserOperationLog> pageParam = new Page<>(page, size);
|
|
|
LambdaQueryWrapper<UserOperationLog> wrapper = new LambdaQueryWrapper<>();
|
|
LambdaQueryWrapper<UserOperationLog> wrapper = new LambdaQueryWrapper<>();
|
|
|
|
|
|
|
@@ -114,7 +116,7 @@ public class UserOperationLogService {
|
|
|
|
|
|
|
|
wrapper.orderByDesc(UserOperationLog::getCreatedAt);
|
|
wrapper.orderByDesc(UserOperationLog::getCreatedAt);
|
|
|
|
|
|
|
|
- SortUtil.applySort(wrapper);
|
|
|
|
|
|
|
+ SortUtil.applySort(wrapper, sortSpecs, null);
|
|
|
return logMapper.selectPage(pageParam, wrapper);
|
|
return logMapper.selectPage(pageParam, wrapper);
|
|
|
}
|
|
}
|
|
|
|
|
|