From d2cb36959b65ece32cec7e2db4d6764f5c788b1d Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期三, 30 四月 2025 08:33:24 +0800
Subject: [PATCH] 1. 波次删除判断是否有子任务列表 2. 任务明细添加字段：执行数量，完成数量， 源单据号，源单据ID
---
rsf-server/src/main/java/com/vincent/rsf/server/system/entity/Tenant.java | 25 +++++++++++++++++++++++--
1 files changed, 23 insertions(+), 2 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/system/entity/Tenant.java b/rsf-server/src/main/java/com/vincent/rsf/server/system/entity/Tenant.java
index a0e33de..1e05343 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/system/entity/Tenant.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/system/entity/Tenant.java
@@ -5,6 +5,8 @@
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
import com.vincent.rsf.framework.common.Cools;
+import com.vincent.rsf.framework.common.SpringUtils;
+import com.vincent.rsf.server.system.service.UserService;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -30,6 +32,18 @@
*/
@ApiModelProperty(value= "鍚嶇О")
private String name;
+
+ /**
+ * 浠ｇ爜
+ */
+ @ApiModelProperty(value= "浠ｇ爜")
+ private String flag;
+
+ /**
+ * 绠＄悊鍛�
+ */
+ @ApiModelProperty(value= "绠＄悊鍛�")
+ private Long root;
/**
* 鐘舵�� 1: 姝ｅ父 0: 绂佺敤
@@ -62,6 +76,15 @@
@ApiModelProperty(value= "澶囨敞")
private String memo;
+ public String getRoot$(){
+ UserService service = SpringUtils.getBean(UserService.class);
+ User user = service.getById(this.root);
+ if (!Cools.isEmpty(user)){
+ return String.valueOf(user.getUsername());
+ }
+ return null;
+ }
+
public Boolean getStatusBool(){
if (null == this.status){ return null; }
switch (this.status){
@@ -73,8 +96,6 @@
return null;
}
}
-
-
public String getCreateTime$(){
if (Cools.isEmpty(this.createTime)){
--
Gitblit v1.9.1