From 7a92ebbfb8227ff30ebe3300cc9db263a75b7e22 Mon Sep 17 00:00:00 2001
From: 1 <1@123>
Date: 星期四, 05 三月 2026 13:06:15 +0800
Subject: [PATCH] lsh#
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Task.java | 58 +++++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 43 insertions(+), 15 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 eb42464..82061e7 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,18 @@
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.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 +23,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 {
/**
@@ -154,6 +143,9 @@
@ApiModelProperty(value= "鐘舵�� 1: 姝ｅ父 0: 鍐荤粨 ")
private Integer status;
+ @ApiModelProperty(value = "浠诲姟鏉ユ簮锛宮es銆乪rp")
+ private String taskOrigin;
+
/**
* 鏄惁鍒犻櫎 1: 鏄� 0: 鍚�
*/
@@ -218,6 +210,11 @@
*/
@ApiModelProperty(value= "姝ュ簭缁堢偣")
private String endStep;
+
+ @TableField(typeHandler = JacksonTypeHandler.class)
+ private List<String> targSiteArea;
+
+ private String targLocArea;
public Task() {}
@@ -390,5 +387,36 @@
return null;
}
}
+ /**
+ * 鑾峰彇婧愮珯鐐瑰悕绉帮紙绔欑偣缂栧彿 + 绔欑偣鍚嶇О锛�
+ */
+ 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;
+ }
+
+ /**
+ * 鑾峰彇鐩爣绔欑偣鍚嶇О锛堢珯鐐圭紪鍙� + 绔欑偣鍚嶇О锛�
+ */
+ 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;
+ }
}
--
Gitblit v1.9.1