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/Task.java | 142 +++++++++++++++++------------------------------
1 files changed, 51 insertions(+), 91 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 c5c7be2..45752c9 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
@@ -3,27 +3,19 @@
import java.text.SimpleDateFormat;
import java.util.*;
+import com.baomidou.mybatisplus.annotation.*;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
import com.fasterxml.jackson.annotation.JsonFormat;
-import com.vincent.rsf.server.manager.service.TaskService;
+import com.vincent.rsf.server.manager.enums.TaskType;
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;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.text.SimpleDateFormat;
import java.util.Date;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -32,12 +24,10 @@
import com.vincent.rsf.server.system.service.UserService;
import com.vincent.rsf.server.system.entity.User;
import java.io.Serializable;
-import java.util.Date;
-import java.util.stream.Collectors;
import com.vincent.rsf.server.manager.service.BasStationService;
@Data
@Accessors(chain = true)
-@TableName("man_task")
+@TableName(value = "man_task", autoResultMap = true)
@ApiModel(value = "Task", description = "浠诲姟妗�")
public class Task implements Serializable {
/**
@@ -61,6 +51,16 @@
*/
@ApiModelProperty(value= "浠诲姟鐘舵��")
private Integer taskStatus;
+
+ /** 鏄惁瀛樺湪鍙墽琛岀殑褰撳墠娴佺▼姝ラ锛岀敤浜庡垪琛ㄦ槸鍚﹀睍绀哄畬鎴愭寜閽� */
+ @TableField(exist = false,select = false)
+ @ApiModelProperty(value = "鏄惁鍙偣鍑诲畬鎴愶紙鏈夊綋鍓嶆楠や笖闈炵粓鎬侊級")
+ private Boolean canComplete;
+
+ /** 鏄惁鍙彇娑堬細娴佺▼姝ラ鑳藉搴斾笂 taskStatus 涓旀湭鍒版渶鍚庝竴姝�(9999) 鏃朵负 true */
+ @TableField(exist = false, select = false)
+ @ApiModelProperty(value = "鏄惁鍙彇娑�")
+ private Boolean canCancel;
@ApiModelProperty("涓婄骇浠诲姟ID")
private Long parentId;
@@ -154,6 +154,9 @@
@ApiModelProperty(value= "鐘舵�� 1: 姝ｅ父 0: 鍐荤粨 ")
private Integer status;
+ @ApiModelProperty(value = "浠诲姟鏉ユ簮锛宮es銆乪rp")
+ private String taskOrigin;
+
/**
* 鏄惁鍒犻櫎 1: 鏄� 0: 鍚�
*/
@@ -173,6 +176,9 @@
@ApiModelProperty(value= "娣诲姞浜哄憳")
private Long createBy;
+ @TableField(exist = false)
+ private String createBy$;
+
/**
* 娣诲姞鏃堕棿
*/
@@ -187,6 +193,9 @@
@ApiModelProperty(value= "淇敼浜哄憳")
private Long updateBy;
+ @TableField(exist = false)
+ private String updateBy$;
+
/**
* 淇敼鏃堕棿
*/
@@ -194,6 +203,9 @@
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
private Date updateTime;
+
+ @Version
+ private Integer version;
/**
* 澶囨敞
@@ -218,6 +230,26 @@
*/
@ApiModelProperty(value= "姝ュ簭缁堢偣")
private String endStep;
+
+ @TableField(typeHandler = JacksonTypeHandler.class)
+ private List<String> targSiteArea;
+
+ private String targLocArea;
+
+ private String targSiteAreaNow;
+ @TableField(exist = false)
+ private String taskStatus$;
+
+ @TableField(exist = false)
+ private String warehType$;
+
+ @TableField(exist = false)
+ private String orgSite$;
+
+ @TableField(exist = false)
+ private String targSite$;
+
+
public Task() {}
@@ -269,54 +301,18 @@
// 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;
- }
- 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();
+ return this.taskStatus$;
}
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();
+ return this.warehType$;
}
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();
+ return TaskType.getTypeDesc(taskType);
}
public String getStartTime$(){
@@ -345,29 +341,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$(){
@@ -394,32 +372,14 @@
* 鑾峰彇婧愮珯鐐瑰悕绉帮紙绔欑偣缂栧彿 + 绔欑偣鍚嶇О锛�
*/
public String getOrgSite$(){
- if (Cools.isEmpty(this.orgSite)) {
- return this.orgSite;
- }
- BasStationService basStationService = SpringUtils.getBean(BasStationService.class);
- BasStation station = basStationService.getOne(new LambdaQueryWrapper<BasStation>()
- .eq(BasStation::getStationName, this.orgSite));
- if (!Cools.isEmpty(station) && !Cools.isEmpty(station.getStationId())) {
- return this.orgSite + "(" + station.getStationId() + ")";
- }
- return this.orgSite;
+ return this.orgSite$;
}
/**
* 鑾峰彇鐩爣绔欑偣鍚嶇О锛堢珯鐐圭紪鍙� + 绔欑偣鍚嶇О锛�
*/
public String getTargSite$(){
- if (Cools.isEmpty(this.targSite)) {
- return this.targSite;
- }
- BasStationService basStationService = SpringUtils.getBean(BasStationService.class);
- BasStation station = basStationService.getOne(new LambdaQueryWrapper<BasStation>()
- .eq(BasStation::getStationName, this.targSite));
- if (!Cools.isEmpty(station) && !Cools.isEmpty(station.getStationId())) {
- return this.targSite + "(" + station.getStationId() + ")";
- }
- return this.targSite;
+ return this.targSite$;
}
}
--
Gitblit v1.9.1