From 0878c49058d5f11858a03738208b7c37c82a1591 Mon Sep 17 00:00:00 2001
From: Administrator <1144154118@qq.com>
Date: 星期一, 07 八月 2023 11:35:17 +0800
Subject: [PATCH] 巡检计划查询优化
---
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java | 36 ++++++++++++++++++++++++++++++++++--
1 files changed, 34 insertions(+), 2 deletions(-)
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java
index f45644c..0903dc2 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java
@@ -4,6 +4,8 @@
import java.util.Date;
import java.util.HashMap;
import java.util.Map;
+
+import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonInclude;
@@ -14,7 +16,7 @@
*
* @author ruoyi
*/
-@JsonInclude(JsonInclude.Include.NON_NULL)//璇ユ敞瑙ｈ繃婊や负绌虹殑瀛楁
+//@JsonInclude(JsonInclude.Include.NON_NULL)//璇ユ敞瑙ｈ繃婊や负绌虹殑瀛楁
public class BaseEntity implements Serializable
{
private static final long serialVersionUID = 1L;
@@ -22,35 +24,65 @@
/** 鎼滅储鍊� */
@JsonIgnore
@ApiModelProperty(hidden = true)
+ @TableField(exist = false)
private String searchValue;
/** 鍒涘缓鑰� */
@ApiModelProperty(hidden = true)
+ @TableField(exist = false)
private String createBy;
/** 鍒涘缓鏃堕棿 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(hidden = true)
+ @TableField(exist = false)
private Date createTime;
/** 鏇存柊鑰� */
@ApiModelProperty(hidden = true)
+ @TableField(exist = false)
private String updateBy;
/** 鏇存柊鏃堕棿 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(hidden = true)
+ @TableField(exist = false)
private Date updateTime;
/** 澶囨敞 */
@ApiModelProperty(hidden = true)
+ @TableField(exist = false)
private String remark;
/** 璇锋眰鍙傛暟 */
@JsonInclude(JsonInclude.Include.NON_EMPTY)
- @ApiModelProperty(value = "鍔ㄦ�佸弬鏁�", name = "params", notes = "鏍规嵁涓嶅悓鐨勬煡璇㈠瓧娈佃嚜鐢遍厤缃弬鏁�", required = true)
+ @TableField(exist = false)
private Map<String, Object> params;
+ @TableField(exist = false)
+ @JsonInclude(JsonInclude.Include.NON_DEFAULT )
+ private Integer pageNum;
+
+ @TableField(exist = false)
+ @JsonInclude(JsonInclude.Include.NON_DEFAULT )
+ private Integer pageSize;
+
+ public Integer getPageNum() {
+ return pageNum;
+ }
+
+ public void setPageNum(Integer pageNum) {
+ this.pageNum = pageNum;
+ }
+
+ public Integer getPageSize() {
+ return pageSize;
+ }
+
+ public void setPageSize(Integer pageSize) {
+ this.pageSize = pageSize;
+ }
+
public String getSearchValue()
{
return searchValue;
--
Gitblit v1.9.3