From f679ac0947417416900ab28308dd3bf235336078 Mon Sep 17 00:00:00 2001
From: chen.lin <1442464845@qq.com>
Date: 星期一, 02 三月 2026 13:00:57 +0800
Subject: [PATCH] 描述修改
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Task.java | 29 +++++++++++++++++++++++------
1 files changed, 23 insertions(+), 6 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..dd29650 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;
@@ -52,6 +53,9 @@
@ApiModelProperty(value= "浠诲姟鍙�")
private String taskCode;
+ @ApiModelProperty("浠诲姟鏉ユ簮")
+ private Short resource;
+
/**
* 浠诲姟鐘舵��
*/
@@ -64,10 +68,13 @@
@ApiModelProperty("浠撳簱绫诲瀷")
private String warehType;
+// @ApiModelProperty("鏄惁涓婃姤")
+// private Integer flagReport;
+
/**
* 浠诲姟绫诲瀷
*/
- @ApiModelProperty(value= "浠诲姟绫诲瀷")
+ @ApiModelProperty(value= "浠诲姟绫诲瀷")
private Integer taskType;
/**
@@ -95,9 +102,9 @@
private String targSite;
/**
- * 鎵樼洏鐮�
+ * 鏂欑鐮�
*/
- @ApiModelProperty(value= "鎵樼洏鐮�")
+ @ApiModelProperty(value= "鏂欑鐮�")
private String barcode;
/**
@@ -122,7 +129,7 @@
* 浼樺厛绾�
*/
@ApiModelProperty(value= "浼樺厛绾�")
- private Short sort;
+ private Integer sort;
/**
* 寮傚父缂栫爜
@@ -199,7 +206,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;
@@ -229,7 +236,7 @@
// null, // 浠诲姟绫诲瀷
// null, // 婧愬簱浣�
// null, // 鐩爣搴撲綅
-// null, // 鎵樼洏鐮�
+// null, // 鏂欑鐮�
// null, // 鏈哄櫒浜虹紪鐮�
// null, // 鎵ц鐘舵��
// null, // 寮傚父鎻忚堪
@@ -247,6 +254,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