From 203223860baa19deb6860eb2ba3181910d662980 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期四, 17 四月 2025 14:22:59 +0800
Subject: [PATCH] 1. 轮灌组被终止时灌溉时长为实际数值。2. 计划历史表按照创建时间倒排序。3. 发布计划时判断是否同项目下未完成计划，是否其他项目下使用了本计划的轮灌组且计划未完成。4. 根据计划ID获取计划最新状态。
---
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voBa/VoUserInfo.java | 20 +++++++++++++++++---
1 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voBa/VoUserInfo.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voBa/VoUserInfo.java
index 1638417..f2373d2 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voBa/VoUserInfo.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voBa/VoUserInfo.java
@@ -18,13 +18,28 @@
@Data
@Schema(title = "鐢ㄦ埛淇℃伅瑙嗗浘瀵硅薄")
public class VoUserInfo implements BaseEntity {
- private static final long serialVersionUID = 1L;
+ private static final long serialVersionUID = 202401241704002L;
@Schema(title = "鐢ㄦ埛ID")
- private Long userId;
+ private String id;
@Schema(title = "鐢ㄦ埛濮撳悕")
private String userName;
+
+ @Schema(title = "鎵嬫満鍙�")
+ private String phone;
+
+ @Schema(title = "鐗囧尯ID")
+ private String blockId;
+
+ @Schema(title = "鐗囧尯鍚嶇О")
+ private String blockName;
+
+ @Schema(title = "鐘舵�佺紪鍙�")
+ private Integer stateId;
+
+ @Schema(title = "鐘舵�佸悕绉�")
+ private String stateName;
@Schema(title = "瑙掕壊缂栧彿鍒楄〃")
private List<Map<String, Object>> roleIds;
@@ -33,7 +48,6 @@
private List<Map<String, Object>> roleNames;
@Schema(title = "鏉冮檺鍒楄〃")
- //private List<Map<String, Object>> permissions;
private JSONArray permissions;
}
\ No newline at end of file
--
Gitblit v1.8.0