From 4757020896b56a3aa29b85b71fd64a5c43dadb51 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期五, 13 九月 2024 11:16:35 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/common/domain/PageParam.java | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/common/domain/PageParam.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/common/domain/PageParam.java
index b89922b..42a6cc7 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/common/domain/PageParam.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/common/domain/PageParam.java
@@ -184,12 +184,19 @@
return queryWrapper;
}
- public Map<String, Object> pickOutMap(boolean mergeCondition) {
+ public Map<String, Object> checkoutMap() {
Map<String, Object> map = where.getMap();
- if (mergeCondition) {
- if (!Cools.isEmpty(where.getCondition())) {
- map.put("condition", where.getCondition());
- }
+ if (!Cools.isEmpty(where.getOrderBy())) {
+ map.put("orderBy", where.getOrderBy());
+ }
+ if (!Cools.isEmpty(where.getTimeStart())) {
+ map.put("timeStart", DateUtils.convert(String.valueOf(where.getTimeStart()), DateUtils.yyyyMMdd_F));
+ }
+ if (!Cools.isEmpty(where.getTimeEnd())) {
+ map.put("timeEnd", DateUtils.convert(String.valueOf(where.getTimeEnd()), DateUtils.yyyyMMdd_F));
+ }
+ if (!Cools.isEmpty(where.getCondition())) {
+ map.put("condition", where.getCondition());
}
return map;
}
--
Gitblit v1.9.1