From 7f70cb15d035f0c233b9e62b9e43aa985317c908 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 04 十一月 2024 10:22:45 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/common/domain/PageParam.java | 72 +++++++++++++++++++-----------------
1 files changed, 38 insertions(+), 34 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..973c24e 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
@@ -65,39 +65,16 @@
}
- public QueryWrapper<T> buildWrapper() {
- return this.buildWrapper(false);
- }
-
- public QueryWrapper<T> buildWrapper(Consumer<QueryWrapper<T>> consumer) {
- return this.buildWrapper(false, consumer);
- }
-
public QueryWrapper<T> buildWrapper(boolean like) {
- return this.buildWrapper(like, null);
+ return this.buildWrapper(like, null, "create_time");
}
- private boolean sortIsSQL(String sort) {
- return sort != null && (sort.contains(",") || sort.trim().contains(" "));
- }
-
- private List<OrderItem> parseOrderSQL(String orderSQL) {
- List<OrderItem> orders = new ArrayList<>();
- if (!Cools.isEmpty(orderSQL)) {
- for (String item : orderSQL.split(",")) {
- String[] temp = item.trim().split(" ");
- if (!temp[0].isEmpty()) {
- String column = this.isToUnderlineCase ? Utils.toSymbolCase(temp[0], '_') : temp[0];
- boolean asc = temp.length == 1 || !temp[temp.length - 1].toLowerCase().equals(ORDER_DESC_VALUE);
- orders.add(new OrderItem(column, asc));
- }
- }
- }
- return orders;
+ public QueryWrapper<T> buildWrapper(boolean like, String timeField) {
+ return this.buildWrapper(like, null, timeField);
}
@SuppressWarnings("all")
- public QueryWrapper<T> buildWrapper(boolean like, Consumer<QueryWrapper<T>> consumer) {
+ public QueryWrapper<T> buildWrapper(boolean like, Consumer<QueryWrapper<T>> consumer, String timeField) {
QueryWrapper<T> queryWrapper = new QueryWrapper<>();
Map<String, Object> map = where.getMap();
for (String key : map.keySet()) {
@@ -134,11 +111,12 @@
if (!Cools.isEmpty(where.getTimeStart())) {
Date timeStart = DateUtils.convert(String.valueOf(where.getTimeStart()), DateUtils.yyyyMMdd_F);
- queryWrapper.ge("create_time", timeStart);
+ queryWrapper.ge(timeField, timeStart);
+
}
if (!Cools.isEmpty(where.getTimeEnd())) {
Date timeStart = DateUtils.convert(String.valueOf(where.getTimeEnd()), DateUtils.yyyyMMdd_F);
- queryWrapper.le("create_time", timeStart);
+ queryWrapper.le(timeField, timeStart);
}
if (!Cools.isEmpty(where.getOrderBy())) {
@@ -184,13 +162,39 @@
return queryWrapper;
}
- public Map<String, Object> pickOutMap(boolean mergeCondition) {
- Map<String, Object> map = where.getMap();
- if (mergeCondition) {
- if (!Cools.isEmpty(where.getCondition())) {
- map.put("condition", where.getCondition());
+ private boolean sortIsSQL(String sort) {
+ return sort != null && (sort.contains(",") || sort.trim().contains(" "));
+ }
+
+ private List<OrderItem> parseOrderSQL(String orderSQL) {
+ List<OrderItem> orders = new ArrayList<>();
+ if (!Cools.isEmpty(orderSQL)) {
+ for (String item : orderSQL.split(",")) {
+ String[] temp = item.trim().split(" ");
+ if (!temp[0].isEmpty()) {
+ String column = this.isToUnderlineCase ? Utils.toSymbolCase(temp[0], '_') : temp[0];
+ boolean asc = temp.length == 1 || !temp[temp.length - 1].toLowerCase().equals(ORDER_DESC_VALUE);
+ orders.add(new OrderItem(column, asc));
+ }
}
}
+ return orders;
+ }
+
+ public Map<String, Object> checkoutMap() {
+ Map<String, Object> map = where.getMap();
+ 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