From f142d48409503dfd6b11d7d414c0ee7ffa85eed5 Mon Sep 17 00:00:00 2001
From: aix <vip_xiaobin810@163.com>
Date: Wed, 28 Aug 2024 14:28:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sg/DTO/ProjectSearchDTO.java | 61 ++++++++++++++++++++++++++++++
1 files changed, 61 insertions(+), 0 deletions(-)
diff --git a/skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sg/DTO/ProjectSearchDTO.java b/skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sg/DTO/ProjectSearchDTO.java
index 43dc59f..84774cc 100644
--- a/skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sg/DTO/ProjectSearchDTO.java
+++ b/skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sg/DTO/ProjectSearchDTO.java
@@ -1,12 +1,73 @@
package cn.gistack.sm.sg.DTO;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
/**
* 查询类
*/
@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
public class ProjectSearchDTO {
private String projectName;
+ private String adCode;
+ private String deviceName;
private String skName;
+ private String gxType;
+ private String gxName;
+ private String createUser;
+ private Long userId;
+ private String gxInfoId;
+ private String gxStepNum;
+ private String projectId;
+ private Integer approvalStatus;
+ private Integer status;
+ private Long reportPerson;
+ private List<Long> projectIds;
+ private String startTime;
+ private String endTime;
+ /**
+ * 工程规模
+ */
+ private String engScal;
+
+ /**
+ * 水库编码
+ */
+ private String resCd;
+
+ /**
+ * 是否开工 1开工 2未开工
+ */
+ private Integer isBegin;
+
+
+ @ApiModelProperty("当前页")
+ private Integer current;
+ @ApiModelProperty("每页的数量")
+ private Integer size;
+
+ /**
+ * 上报时间
+ */
+ private String reportTime;
+
+
+ /**
+ * 项目排序 0状态 ， 1进度 ，2注册码
+ */
+ private Integer projectSort;
+ private String auditPerson;
+ private Boolean isPage;
+ private List<String> sgCodeS;
+
+
+
}
--
Gitblit v1.9.3