From 72ca54b5a36818de16acf81c9c395e9f35a39a67 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期三, 11 六月 2025 09:53:27 +0800
Subject: [PATCH] 下发执行页，添加默认请求方法
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Task.java | 29 +++++++++++++++++++++++++++--
1 files changed, 27 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 7038d6b..74ec628 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,10 +5,12 @@
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;
import lombok.experimental.Accessors;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.format.annotation.DateTimeFormat;
import java.text.SimpleDateFormat;
import java.util.Date;
@@ -31,6 +33,7 @@
import com.vincent.rsf.server.system.entity.User;
import java.io.Serializable;
import java.util.Date;
+import java.util.stream.Collectors;
@Data
@Accessors(chain = true)
@@ -120,7 +123,7 @@
* 浼樺厛绾�
*/
@ApiModelProperty(value= "浼樺厛绾�")
- private Short sort;
+ private Integer sort;
/**
* 寮傚父缂栫爜
@@ -197,7 +200,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;
@@ -245,6 +248,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;
@@ -259,6 +272,18 @@
return dictDatas.getValue() + "." + dictDatas.getLabel();
}
+ public String getWarehType$(){
+ if (null == this.warehType){ return null; }
+ DictDataService dictDataService = SpringUtils.getBean(DictDataService.class);
+ DictData dictDatas = dictDataService.getOne(new LambdaQueryWrapper<DictData>()
+ .eq(DictData::getDictTypeCode, DictTypeCode.DICT_SYS_DEVICE_TYPE)
+ .eq(DictData::getValue, warehType));
+ if (Objects.isNull(dictDatas)) {
+ return null;
+ }
+ return dictDatas.getLabel();
+ }
+
public String getTaskType$() {
if (Cools.isEmpty(this.taskType)) {
return null;
--
Gitblit v1.9.1