工单模块

urbanLifelineServ/common/common-dto/src/main/java/org/xyzh/common/dto/BaseDTO.java

@@ -2,6 +2,8 @@ package org.xyzh.common.dto;
 
 import java.io.Serializable;
 import java.util.Date;
+import java.util.List;
+
 import com.alibaba.fastjson2.annotation.JSONField;
 import io.swagger.v3.oas.annotations.media.Schema;
 
@@ -41,4 +43,19 @@ public class BaseDTO implements Serializable {
     
     @Schema(description = "是否已删除", defaultValue = "false")
     private Boolean deleted = false;
+
+
+    // =============== 下方为筛选字段，非数据库字段 ================
+
+    @Schema(description = "数量限制")
+    private Integer limit;
+    
+    @Schema(description = "开始时间")
+    private Date startTime;
+
+    @Schema(description = "结束时间")
+    private Date endTime;
+
+    @Schema(description = "排序字段")
+    private List<OrderField> orderFields;
 }

urbanLifelineServ/common/common-dto/src/main/java/org/xyzh/common/dto/OrderField.java

@@ -0,0 +1,22 @@
+package org.xyzh.common.dto;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+@Data
+@Schema(description = "排序方式对象")
+public class OrderField {
+    public static final String ASC = "ASC";
+    public static final String DESC = "DESC";
+    
+    @Schema(description = "排序字段")
+    private String field;
+    
+    @Schema(description = "排序方式")
+    private String order;
+
+    public OrderField(String field, String order) {
+        this.field = field;
+        this.order = order;
+    }
+}

urbanLifelineServ/common/common-dto/src/main/java/org/xyzh/common/dto/sys/TbSysUserDTO.java

@@ -4,8 +4,6 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.xyzh.common.dto.BaseDTO;
 import org.xyzh.common.utils.crypto.AesEncryptUtil;
-import org.xyzh.common.utils.crypto.EncryptedStringTypeHandler;
-import com.baomidou.mybatisplus.annotation.TableField;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 
@@ -33,7 +31,6 @@ public class TbSysUserDTO extends BaseDTO {
     @Schema(description = "邮箱")
     private String email;
 
-    @TableField(typeHandler = EncryptedStringTypeHandler.class)
     @Schema(description = "手机（加密）")
     private String phone;