From d107c1cca034fb6cdde077656fa1776d09a4442f Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期三, 02 四月 2025 14:24:52 +0800
Subject: [PATCH] no message
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Task.java | 50 ++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 48 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 d43295f..7d2e4a6 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,7 +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.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;
import java.util.Date;
@@ -26,6 +32,7 @@
import java.util.Date;
@Data
+@Accessors(chain = true)
@TableName("man_task")
public class Task implements Serializable {
@@ -67,6 +74,18 @@
*/
@ApiModelProperty(value= "鐩爣搴撲綅")
private String targLoc;
+
+ /**
+ * 婧愮珯鐐�
+ */
+ @ApiModelProperty("婧愮珯鐐�")
+ private String orgSite;
+
+ /**
+ * 鐩爣绔欑偣
+ */
+ @ApiModelProperty("鐩爣绔欑偣")
+ private String targSite;
/**
* 鎵樼洏鐮�
@@ -128,7 +147,6 @@
* 鏄惁鍒犻櫎 1: 鏄� 0: 鍚�
*/
@ApiModelProperty(value= "鏄惁鍒犻櫎 1: 鏄� 0: 鍚� ")
- @TableLogic
private Integer deleted;
/**
@@ -219,6 +237,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.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.getLabel();
+ }
+
public String getStartTime$(){
if (Cools.isEmpty(this.startTime)){
return "";
--
Gitblit v1.9.1