From 8018e564729067b0b61a5c992b5667dbcad39c70 Mon Sep 17 00:00:00 2001
From: aix <vip_xiaobin810@163.com>
Date: Fri, 13 Sep 2024 23:12:15 +0800
Subject: [PATCH] Merge branch 'jtdev' of https://hbsl-code.gistack.cn/hbwri/manager into jtdev
---
skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sg/DTO/ProjectSearchDTO.java | 64 ++++++++++++++++++++++++++++++++
1 files changed, 64 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 84774cc..5a87ab9 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
@@ -16,22 +16,73 @@
@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;
/**
* 工程规模
@@ -59,6 +110,11 @@
*/
private String reportTime;
+ /**
+ * 标段
+ */
+ private String lot;
+
/**
* 项目排序 0状态 ， 1进度 ，2注册码
@@ -68,6 +124,14 @@
private Boolean isPage;
private List<String> sgCodeS;
+ /**
+ * 建设期次
+ */
+ private String buildStage;
+ /**
+ * 子类型
+ */
+ private List<String> childTypeList;
}
--
Gitblit v1.9.3