From fa3e00c4d5e91613e3f2a1f2692cb68635d4ad2d Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期二, 22 七月 2025 08:31:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/mdqdasrsVersion' into mdqdasrsVersion
---
src/main/java/com/zy/asrs/entity/WaitPakin.java | 19 +++++++++++++++----
1 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/WaitPakin.java b/src/main/java/com/zy/asrs/entity/WaitPakin.java
index e7dcc1a..5739d03 100644
--- a/src/main/java/com/zy/asrs/entity/WaitPakin.java
+++ b/src/main/java/com/zy/asrs/entity/WaitPakin.java
@@ -8,6 +8,8 @@
import com.core.common.SpringUtils;
import com.zy.asrs.service.LocOwnerService;
import com.zy.common.utils.Synchro;
+import com.zy.system.entity.User;
+import com.zy.system.service.UserService;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -166,9 +168,9 @@
private Integer owner;
/**
- * 鏄惁浠樻
+ * 璐х墿褰㈡��:0锛氫唬閲囥��1锛氫粨鍌�
*/
- @ApiModelProperty(value= "鏄惁浠樻0锛氭湭浠樻銆�1锛氬凡浠樻 ")
+ @ApiModelProperty(value= "璐х墿褰㈡��:0锛氫唬閲囥��1锛氫粨鍌�")
private Integer payment;
/**
@@ -178,6 +180,15 @@
@TableId(value = "uuid", type = IdType.ID_WORKER_STR)
@TableField("uuid")
private String uuid;
+
+ public String getUserName$(){
+ UserService service = SpringUtils.getBean(UserService.class);
+ User user = service.selectById(this.modiUser);
+ if (!Cools.isEmpty(user)){
+ return String.valueOf(user.getUsername());
+ }
+ return null;
+ }
public String getOwner$(){
LocOwnerService service = SpringUtils.getBean(LocOwnerService.class);
@@ -192,9 +203,9 @@
if (null == this.payment){ return null; }
switch (this.payment){
case 1:
- return "宸蹭粯娆�";
+ return "浠撳偍";
case 0:
- return "鏈粯娆�";
+ return "浠ｉ噰";
default:
return String.valueOf(this.payment);
}
--
Gitblit v1.9.1