From bfe4e6e49ea341c8443d7b4b70cb66de0f1aadab Mon Sep 17 00:00:00 2001
From: ke <893754509@qq.com>
Date: Tue, 03 Dec 2024 09:53:22 +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 |   37 +++++++++++++++++++++++++++++++++++++
 1 files changed, 37 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 5a87ab9..6e68c09 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
@@ -5,6 +5,7 @@
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import org.springblade.core.secure.utils.AuthUtil;
 
 import java.util.List;
 
@@ -36,6 +37,7 @@
 	 * 工序类型
 	 */
 	private String gxType;
+	private String typeName;
 	/**
 	 * 工序名
 	 */
@@ -48,6 +50,26 @@
 	 * 用户名
 	 */
 	private Long userId;
+
+	/**
+	 * 用户所在单位
+	 */
+	private List<String>  userUnit;
+
+	/**
+	 * 县单位位
+	 */
+	private List<String> countryUnit;
+	private List<String> selfUnit;
+	/**
+	 * 设备施工单位
+	 */
+	private List<String> sgUnit;
+
+	/**
+	 * 用户角色
+	 */
+	private Long roleUnit;
 	/**
 	 *
 	 */
@@ -134,4 +156,19 @@
 	 */
 	private List<String> childTypeList;
 
+	/**
+	 * 部门ID
+	 */
+	private String deptId;
+	private String othRegCd;
+
+	/**
+	 * 是否单位过滤 1不过滤
+	 */
+	private Integer isUnit;
+	/**
+	 * 施工单位
+	 */
+//	private String selfUnit;
+
 }

--
Gitblit v1.9.3