From 3b1c197425ac8c2c3b5addd21e4ab68e032d3e02 Mon Sep 17 00:00:00 2001 From: robin <850379744@qq.com> Date: Thu, 30 Nov 2023 17:57:42 +0800 Subject: [PATCH] operation order desc --- .../api/param/operation/OperationPageQueryParam.java | 7 ++++++- .../server/domain/core/impl/OperationServiceImpl.java | 7 ++++--- .../operation/saved/request/OperationQueryRequest.java | 5 +++++ 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/chat2db-server/chat2db-server-domain/chat2db-server-domain-api/src/main/java/ai/chat2db/server/domain/api/param/operation/OperationPageQueryParam.java b/chat2db-server/chat2db-server-domain/chat2db-server-domain-api/src/main/java/ai/chat2db/server/domain/api/param/operation/OperationPageQueryParam.java index 4de4d19a..d0232b30 100644 --- a/chat2db-server/chat2db-server-domain/chat2db-server-domain-api/src/main/java/ai/chat2db/server/domain/api/param/operation/OperationPageQueryParam.java +++ b/chat2db-server/chat2db-server-domain/chat2db-server-domain-api/src/main/java/ai/chat2db/server/domain/api/param/operation/OperationPageQueryParam.java @@ -40,7 +40,12 @@ public class OperationPageQueryParam extends PageQueryParam { /** * orderBy modify time desc */ - private boolean orderByDesc; + private Boolean orderByDesc; + + /** + * orderBy create time desc + */ + private Boolean orderByCreateDesc; /** * operation type diff --git a/chat2db-server/chat2db-server-domain/chat2db-server-domain-core/src/main/java/ai/chat2db/server/domain/core/impl/OperationServiceImpl.java b/chat2db-server/chat2db-server-domain/chat2db-server-domain-core/src/main/java/ai/chat2db/server/domain/core/impl/OperationServiceImpl.java index 135508df..93652f0d 100644 --- a/chat2db-server/chat2db-server-domain/chat2db-server-domain-core/src/main/java/ai/chat2db/server/domain/core/impl/OperationServiceImpl.java +++ b/chat2db-server/chat2db-server-domain/chat2db-server-domain-core/src/main/java/ai/chat2db/server/domain/core/impl/OperationServiceImpl.java @@ -143,10 +143,11 @@ public class OperationServiceImpl implements OperationService { Integer offset = param.getPageSize(); Page page = new Page<>(start, offset); page.setOptimizeCountSql(false); - if (param.isOrderByDesc()) { + if (Objects.nonNull(param.getOrderByDesc()) && param.getOrderByDesc()) { queryWrapper.orderByDesc("gmt_modified"); - } else { - queryWrapper.orderByAsc("gmt_modified"); + } + if (Objects.nonNull(param.getOrderByCreateDesc()) && param.getOrderByCreateDesc()) { + queryWrapper.orderByDesc("gmt_create"); } IPage iPage = operationSavedMapper.selectPage(page, queryWrapper); List userSavedDdlDOS = operationConverter.do2dto(iPage.getRecords()); diff --git a/chat2db-server/chat2db-server-web/chat2db-server-web-api/src/main/java/ai/chat2db/server/web/api/controller/operation/saved/request/OperationQueryRequest.java b/chat2db-server/chat2db-server-web/chat2db-server-web-api/src/main/java/ai/chat2db/server/web/api/controller/operation/saved/request/OperationQueryRequest.java index 31dd7702..0723d47a 100644 --- a/chat2db-server/chat2db-server-web/chat2db-server-web-api/src/main/java/ai/chat2db/server/web/api/controller/operation/saved/request/OperationQueryRequest.java +++ b/chat2db-server/chat2db-server-web/chat2db-server-web-api/src/main/java/ai/chat2db/server/web/api/controller/operation/saved/request/OperationQueryRequest.java @@ -42,6 +42,11 @@ public class OperationQueryRequest extends PageQueryRequest { */ private Boolean orderByDesc; + /** + * orderBy create time desc + */ + private Boolean orderByCreateDesc; + /** * operation type */