From 7692db6072ef569b5734d218cb11fa82e80171d1 Mon Sep 17 00:00:00 2001
From: chen.llin <1442464845@qq.comm>
Date: 星期四, 22 一月 2026 17:12:17 +0800
Subject: [PATCH] agv出库逻辑调整
---
src/main/java/com/zy/system/entity/User.java | 44 ++++++++++++++++++++++++++++++++++++--------
1 files changed, 36 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/zy/system/entity/User.java b/src/main/java/com/zy/system/entity/User.java
index f04af64..d8a463e 100644
--- a/src/main/java/com/zy/system/entity/User.java
+++ b/src/main/java/com/zy/system/entity/User.java
@@ -6,6 +6,8 @@
import com.baomidou.mybatisplus.enums.IdType;
import com.core.common.Cools;
import com.core.common.SpringUtils;
+import com.zy.asrs.entity.Department;
+import com.zy.asrs.service.DepartmentService;
import com.zy.system.service.HostService;
import com.zy.system.service.RoleService;
@@ -31,7 +33,6 @@
*/
@TableField("host_id")
private Long hostId;
-
/**
* 鎵�灞為儴闂�
@@ -76,7 +77,7 @@
private String email;
/**
- * 鎬у埆 0: 鐢� 1: 濂� 2: 鏈煡
+ * 鎬у埆 0: 鐢� 1: 濂� 2: 鏈煡
*/
private Integer sex;
@@ -87,9 +88,15 @@
private Date createTime;
/**
- * 鐘舵�� 1: 鍚敤 0: 绂佺敤
+ * 鐘舵�� 1: 鍚敤 0: 绂佺敤
*/
private Integer status;
+
+ /**
+ * AD鐧诲綍 1: 鍚敤 0: 绂佺敤
+ */
+ @TableField("ad_login")
+ private Integer adLogin;
public Long getId() {
return id;
@@ -125,11 +132,11 @@
}
public String getDeptName() {
-// DeptService service = SpringUtils.getBean(DeptService.class);
-// Dept dept = service.selectById(this.deptId);
-// if (!Cools.isEmpty(dept)){
-// return dept.getName();
-// }
+ DepartmentService service = SpringUtils.getBean(DepartmentService.class);
+ Department dept = service.selectById(this.deptId);
+ if (!Cools.isEmpty(dept)) {
+ return dept.getName();
+ }
return null;
}
@@ -259,5 +266,26 @@
this.status = status;
}
+ public Integer getAdLogin() {
+ return adLogin;
+ }
+
+ public void setAdLogin(Integer adLogin) {
+ this.adLogin = adLogin;
+ }
+
+ public String getAdLogin$() {
+ if (null == this.adLogin) {
+ return "绂佺敤";
+ }
+ switch (this.adLogin) {
+ case 1:
+ return "鍚敤";
+ case 0:
+ return "绂佺敤";
+ default:
+ return String.valueOf(this.adLogin);
+ }
+ }
}
--
Gitblit v1.9.1