From 4114759a57d73661937f28a765fb8a67c017b14b Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期二, 24 六月 2025 16:28:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/devlop' into devlop
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Task.java | 18 ++++++++++++++++--
1 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Task.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Task.java
index f3fc609..0a99503 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Task.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Task.java
@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.fasterxml.jackson.annotation.JsonFormat;
+import com.vincent.rsf.server.manager.service.TaskService;
import com.vincent.rsf.server.system.constant.DictTypeCode;
import com.vincent.rsf.server.system.entity.DictData;
import com.vincent.rsf.server.system.service.DictDataService;
@@ -51,6 +52,9 @@
*/
@ApiModelProperty(value= "浠诲姟鍙�")
private String taskCode;
+
+ @ApiModelProperty("浠诲姟鏉ユ簮")
+ private Short resource;
/**
* 浠诲姟鐘舵��
@@ -122,7 +126,7 @@
* 浼樺厛绾�
*/
@ApiModelProperty(value= "浼樺厛绾�")
- private Short sort;
+ private Integer sort;
/**
* 寮傚父缂栫爜
@@ -199,7 +203,7 @@
public Task() {}
- public Task(String taskCode,Integer taskStatus,Integer taskType,String orgLoc,String targLoc,String barcode,String robotCode,Short exceStatus,String expDesc,Short sort,String expCode,Date startTime,Date endTime,Integer status,Integer deleted,Integer tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
+ public Task(String taskCode,Integer taskStatus,Integer taskType,String orgLoc,String targLoc,String barcode,String robotCode,Short exceStatus,String expDesc,Integer sort,String expCode,Date startTime,Date endTime,Integer status,Integer deleted,Integer tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
this.taskCode = taskCode;
this.taskStatus = taskStatus;
this.taskType = taskType;
@@ -247,6 +251,16 @@
// null // 澶囨敞
// );
+// public String getParentId$() {
+// if (Cools.isEmpty(this.parentId)) {
+// return null;
+// }
+// TaskService taskService = SpringUtils.getBean(TaskService.class);
+// Task task = taskService.getById(this.parentId);
+// return task.getTaskCode();
+// }
+
+
public String getTaskStatus$(){
if (Cools.isEmpty(this.taskStatus)) {
return null;
--
Gitblit v1.9.1