From 19b6160823c407902c9f93bc6b9c75a851b0036d Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期二, 07 一月 2025 09:18:50 +0800
Subject: [PATCH] 添加入库人员字段及关联用户信息

---
 src/main/webapp/views/waitPakinLog/waitPakinLog.html   |    2 +-
 src/main/java/com/zy/asrs/entity/WaitPakinLog.java     |   14 ++++++++++++++
 src/main/webapp/static/js/waitPakinLog/waitPakinLog.js |    1 +
 3 files changed, 16 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/zy/asrs/entity/WaitPakinLog.java b/src/main/java/com/zy/asrs/entity/WaitPakinLog.java
index 94d795b..e5a02fa 100644
--- a/src/main/java/com/zy/asrs/entity/WaitPakinLog.java
+++ b/src/main/java/com/zy/asrs/entity/WaitPakinLog.java
@@ -3,6 +3,9 @@
 import com.baomidou.mybatisplus.annotations.TableField;
 import com.baomidou.mybatisplus.annotations.TableName;
 import com.core.common.Cools;
+import com.core.common.SpringUtils;
+import com.zy.system.entity.User;
+import com.zy.system.service.UserService;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -149,6 +152,9 @@
     @TableField("appe_user")
     private Long appeUser;
 
+    @TableField(exist = false)
+    private String appeUser$;
+
     @ApiModelProperty(value= "澶囨敞")
     private String memo;
 
@@ -220,4 +226,12 @@
         return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
     }
 
+    public String getAppeUser$(){
+        UserService service = SpringUtils.getBean(UserService.class);
+        User user = service.selectById(this.appeUser);
+        if (!Cools.isEmpty(user)){
+            return String.valueOf(user.getUsername());
+        }
+        return null;
+    }
 }
diff --git a/src/main/webapp/static/js/waitPakinLog/waitPakinLog.js b/src/main/webapp/static/js/waitPakinLog/waitPakinLog.js
index 54fc129..2aab92a 100644
--- a/src/main/webapp/static/js/waitPakinLog/waitPakinLog.js
+++ b/src/main/webapp/static/js/waitPakinLog/waitPakinLog.js
@@ -15,6 +15,7 @@
                 html += ">";
                 return html;
             }}
+        ,{field: 'appeUser$', align: 'center',title: '鍏ュ簱浜哄憳'}
         ,{field: 'modiUser$', align: 'center',title: '淇敼浜哄憳', hide:true}
         ,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿', hide:true})
     return cols;
diff --git a/src/main/webapp/views/waitPakinLog/waitPakinLog.html b/src/main/webapp/views/waitPakinLog/waitPakinLog.html
index 3fb3aea..90c09bf 100644
--- a/src/main/webapp/views/waitPakinLog/waitPakinLog.html
+++ b/src/main/webapp/views/waitPakinLog/waitPakinLog.html
@@ -54,7 +54,7 @@
 <script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
 <script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
 <script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
-<script type="text/javascript" src="../../static/js/waitPakinLog/waitPakinLog.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/waitPakinLog/waitPakinLog.js?v=1" charset="utf-8"></script>
 
 <iframe id="detail-iframe" scrolling="auto" style="display:none;"></iframe>
 

--
Gitblit v1.9.1