From 96d8cb69f2ddcb012fe40c8ad57932dec0b17d69 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期五, 13 九月 2024 11:13:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/web/pagemodel/BaseQueryObject.java | 30 +++++++++++++++---------------
1 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/web/pagemodel/BaseQueryObject.java b/Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/web/pagemodel/BaseQueryObject.java
index d7a4d34..221f804 100644
--- a/Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/web/pagemodel/BaseQueryObject.java
+++ b/Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/web/pagemodel/BaseQueryObject.java
@@ -1,6 +1,5 @@
package com.vci.starter.web.pagemodel;
-
import com.alibaba.fastjson.annotation.JSONField;
import org.apache.commons.lang3.StringUtils;
@@ -56,32 +55,32 @@
/**
* 鏌ヨ鏉′欢鐨勬槧灏勫叧绯�
*/
- @JSONField()
- private Map<String,String> conditionMap = new HashMap<String, String>();
+ @JSONField
+ private Map<String,String> conditionMap = new HashMap<>();
/**
* 褰撳墠椤�
*/
- @JSONField()
+ @JSONField
private int page = 1;
// 褰撳墠椤�
/**
* 鎺掑簭瀛楁
*/
- @JSONField()
+ @JSONField
private String sort;
// 鎺掑簭瀛楁 ---鍓嶇鍙敮鎸佷娇鐢ㄤ竴涓瓧娈垫潵鎺掑簭锛屼絾鏄悗鍙板疄闄呭彲浠ヤ娇鐢ㄥ涓瓧娈垫潵鎺掑簭锛屾墍浠ュ彲浠ヤ娇鐢ㄩ�楀彿鍒嗗壊
/**
* 鎺掑簭绫诲瀷
*/
- @JSONField()
+ @JSONField
private String order;
// asc/desc,濡傛灉鏈夊涓帓搴忓瓧娈垫椂锛岃繖閲屼篃闇�瑕佺敤閫楀彿鍒嗗壊锛屼笖涓巗ort鐨勪綅缃搴�
/**
* 姣忛〉鏄剧ず椤垫暟
*/
- @JSONField()
+ @JSONField
private int limit = 25;//姣忛〉鏄剧ず鐨勬潯鏁�
/**
@@ -90,6 +89,14 @@
*/
public Map<String, String> getConditionMap() {
return conditionMap;
+ }
+
+ /**
+ * 璁剧疆鏌ヨ鏉′欢
+ * @param conditionMap 鏌ヨ鏉′欢鐨勬槧灏勫叧绯�
+ */
+ public void setConditionMap(Map<String, String> conditionMap) {
+ this.conditionMap = conditionMap;
}
/**
@@ -110,14 +117,6 @@
return conditionMapHasNick;
}
return null;
- }
-
- /**
- * 璁剧疆鏌ヨ鏉′欢
- * @param conditionMap 鏌ヨ鏉′欢鐨勬槧灏勫叧绯�
- */
- public void setConditionMap(Map<String, String> conditionMap) {
- this.conditionMap = conditionMap;
}
public int getPage() {
@@ -236,4 +235,5 @@
", limit=" + limit +
'}';
}
+
}
--
Gitblit v1.9.3