From cbfbbc6ab15b0eac96b47e7a6214bc436e58dce2 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期三, 21 五月 2025 20:35:01 +0800
Subject: [PATCH] no message
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Task.java | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 55 insertions(+), 5 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 6fe7559..b64b727 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
@@ -1,8 +1,13 @@
package com.vincent.rsf.server.manager.entity;
import java.text.SimpleDateFormat;
-import java.util.Date;
+import java.util.*;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.fasterxml.jackson.annotation.JsonFormat;
+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.springframework.format.annotation.DateTimeFormat;
import java.text.SimpleDateFormat;
@@ -30,10 +35,8 @@
@Data
@Accessors(chain = true)
@TableName("man_task")
+@ApiModel(value = "Task", description = "浠诲姟妗�")
public class Task implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
/**
* ID
*/
@@ -53,6 +56,12 @@
@ApiModelProperty(value= "浠诲姟鐘舵��")
private Short taskStatus;
+ @ApiModelProperty("涓婄骇浠诲姟ID")
+ private Long parentId;
+
+ @ApiModelProperty("浠撳簱绫诲瀷")
+ private Short warehType;
+
/**
* 浠诲姟绫诲瀷
*/
@@ -70,6 +79,18 @@
*/
@ApiModelProperty(value= "鐩爣搴撲綅")
private String targLoc;
+
+ /**
+ * 婧愮珯鐐�
+ */
+ @ApiModelProperty("婧愮珯鐐�")
+ private String orgSite;
+
+ /**
+ * 鐩爣绔欑偣
+ */
+ @ApiModelProperty("鐩爣绔欑偣")
+ private String targSite;
/**
* 鎵樼洏鐮�
@@ -131,7 +152,6 @@
* 鏄惁鍒犻櫎 1: 鏄� 0: 鍚�
*/
@ApiModelProperty(value= "鏄惁鍒犻櫎 1: 鏄� 0: 鍚� ")
- @TableLogic
private Integer deleted;
/**
@@ -151,6 +171,7 @@
*/
@ApiModelProperty(value= "娣诲姞鏃堕棿")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
private Date createTime;
/**
@@ -164,6 +185,7 @@
*/
@ApiModelProperty(value= "淇敼鏃堕棿")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
private Date updateTime;
/**
@@ -222,6 +244,34 @@
// null // 澶囨敞
// );
+ public String getTaskStatus$(){
+ if (Cools.isEmpty(this.taskStatus)) {
+ return null;
+ }
+ DictDataService dictDataService = SpringUtils.getBean(DictDataService.class);
+ DictData dictDatas = dictDataService.getOne(new LambdaQueryWrapper<DictData>()
+ .eq(DictData::getDictTypeCode, DictTypeCode.DICT_SYS_TASK_STATUS)
+ .eq(DictData::getValue, this.taskStatus));
+ if (Objects.isNull(dictDatas) || Objects.isNull(dictDatas.getLabel())) {
+ return null;
+ }
+ return dictDatas.getValue() + "." + dictDatas.getLabel();
+ }
+
+ public String getTaskType$() {
+ if (Cools.isEmpty(this.taskType)) {
+ return null;
+ }
+ DictDataService dictDataService = SpringUtils.getBean(DictDataService.class);
+ DictData dictDatas = dictDataService.getOne(new LambdaQueryWrapper<DictData>()
+ .eq(DictData::getDictTypeCode, DictTypeCode.DICT_SYS_TASK_TYPE)
+ .eq(DictData::getValue, this.taskType));
+ if (Objects.isNull(dictDatas) || Objects.isNull(dictDatas.getLabel())) {
+ return null;
+ }
+ return dictDatas.getValue() + "." + dictDatas.getLabel();
+ }
+
public String getStartTime$(){
if (Cools.isEmpty(this.startTime)){
return "";
--
Gitblit v1.9.1