From 1dcfa3702505f0c431757312b5304531029f90f6 Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期四, 09 四月 2026 18:57:38 +0800
Subject: [PATCH] #getter$摘出entity
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/TaskLog.java | 94 +++++++++++++++++++++++++---------------------
1 files changed, 51 insertions(+), 43 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/TaskLog.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/TaskLog.java
index 1dec3f3..d9c6f48 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/TaskLog.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/TaskLog.java
@@ -22,6 +22,7 @@
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.TableField;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -62,13 +63,13 @@
* 浠诲姟鐘舵��
*/
@ApiModelProperty(value= "浠诲姟鐘舵��")
- private Short taskStatus;
+ private Integer taskStatus;
/**
* 浠诲姟绫诲瀷
*/
@ApiModelProperty(value= "浠诲姟绫诲瀷")
- private Short taskType;
+ private Integer taskType;
/**
* 婧愬簱浣�
@@ -81,6 +82,19 @@
*/
@ApiModelProperty(value= "鐩爣搴撲綅")
private String targLoc;
+
+
+ /**
+ * 婧愮珯鐐�
+ */
+ @ApiModelProperty("婧愮珯鐐�")
+ private String orgSite;
+
+ /**
+ * 鐩爣绔欑偣
+ */
+ @ApiModelProperty("鐩爣绔欑偣")
+ private String targSite;
/**
* 鎵樼洏鐮�
@@ -142,6 +156,7 @@
* 鏄惁鍒犻櫎 1: 鏄� 0: 鍚�
*/
@ApiModelProperty(value= "鏄惁鍒犻櫎 1: 鏄� 0: 鍚� ")
+ @TableLogic
private Integer deleted;
/**
@@ -155,6 +170,9 @@
*/
@ApiModelProperty(value= "娣诲姞浜哄憳")
private Long createBy;
+
+ @TableField(exist = false)
+ private String createBy$;
/**
* 娣诲姞鏃堕棿
@@ -170,6 +188,9 @@
@ApiModelProperty(value= "淇敼浜哄憳")
private Long updateBy;
+ @TableField(exist = false)
+ private String updateBy$;
+
/**
* 淇敼鏃堕棿
*/
@@ -184,9 +205,34 @@
@ApiModelProperty(value= "澶囨敞")
private String memo;
+ /**
+ * 璺緞ID
+ */
+ @ApiModelProperty(value= "璺緞ID")
+ private Long deviceSiteId;
+
+ /**
+ * 姝ュ簭璧风偣
+ */
+ @ApiModelProperty(value= "姝ュ簭璧风偣")
+ private String souStep;
+
+ /**
+ * 姝ュ簭缁堢偣
+ */
+ @ApiModelProperty(value= "姝ュ簭缁堢偣")
+ private String endStep;
+ @TableField(exist = false)
+ private String taskStatus$;
+
+ @TableField(exist = false)
+ private String taskType$;
+
+
+
public TaskLog() {}
- public TaskLog(Long taskId,String taskCode,Short taskStatus,Short 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 TaskLog(Long taskId,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) {
this.taskId = taskId;
this.taskCode = taskCode;
this.taskStatus = taskStatus;
@@ -237,31 +283,11 @@
// );
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();
+ return this.taskStatus$;
}
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 (Cools.isEmpty(dictDatas)) {
- return null;
- }
- return dictDatas.getLabel();
+ return this.taskType$;
}
public String getStartTime$(){
@@ -290,29 +316,11 @@
}
}
- public String getCreateBy$(){
- UserService service = SpringUtils.getBean(UserService.class);
- User user = service.getById(this.createBy);
- if (!Cools.isEmpty(user)){
- return String.valueOf(user.getNickname());
- }
- return null;
- }
-
public String getCreateTime$(){
if (Cools.isEmpty(this.createTime)){
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
- }
-
- public String getUpdateBy$(){
- UserService service = SpringUtils.getBean(UserService.class);
- User user = service.getById(this.updateBy);
- if (!Cools.isEmpty(user)){
- return String.valueOf(user.getNickname());
- }
- return null;
}
public String getUpdateTime$(){
--
Gitblit v1.9.1