From bed735aae42b6e0c75bf3fd63d9cd0996fba9355 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期三, 21 五月 2025 14:21:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/devlop' into devlop

---
 rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/TaskItem.java |   35 +++++++++++++++++++++++++++++++++++
 1 files changed, 35 insertions(+), 0 deletions(-)

diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/TaskItem.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/TaskItem.java
index 5954226..ea87c01 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/TaskItem.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/TaskItem.java
@@ -3,6 +3,7 @@
 import java.text.SimpleDateFormat;
 import java.util.Date;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.vincent.rsf.server.system.constant.DictTypeCode;
@@ -22,6 +23,7 @@
 import com.vincent.rsf.server.system.service.UserService;
 import com.vincent.rsf.server.system.entity.User;
 import java.io.Serializable;
+import java.util.Map;
 import java.util.Objects;
 
 @Data
@@ -65,6 +67,18 @@
 
     @ApiModelProperty("鍗曟嵁ID")
     private Long orderId;
+
+    @ApiModelProperty("琛屽彿")
+    private String platItemId;
+
+    @ApiModelProperty("瀹㈡埛璁㈠崟鍙�")
+    private String platOrderCode;
+
+    @ApiModelProperty("宸ュ崟鍙�")
+    private String platWorkCode;
+
+    @ApiModelProperty("椤圭洰鍙�")
+    private String projectCode;
 
     @ApiModelProperty("鍗曟嵁绫诲瀷")
     private String orderType;
@@ -130,11 +144,18 @@
     @ApiModelProperty(value= "鍨嬪彿")
     private String model;
 
+    @ApiModelProperty("璐ㄦ鐘舵��")
+    private Short isptResult;
+
     /**
      * 瀛楁绱㈠紩
      */
     @ApiModelProperty(value= "瀛楁绱㈠紩")
     private String fieldsIndex;
+
+    @ApiModelProperty("鎵╁睍瀛楁")
+    @TableField(exist = false)
+    private Map<String, String> extendFields;
 
     /**
      * 鐘舵�� 1: 姝e父  0: 鍐荤粨  
@@ -244,6 +265,20 @@
         return dictDatas.getLabel();
     }
 
+    public String getIsptResult$(){
+        if (Cools.isEmpty(this.isptResult)){
+            return null;
+        }
+        DictDataService dictDataService = SpringUtils.getBean(DictDataService.class);
+        DictData dictData = dictDataService.getOne(new LambdaQueryWrapper<DictData>()
+                .eq(DictData::getDictTypeCode, DictTypeCode.DICT_INSPECT_RESULT)
+                .eq(DictData::getValue, this.isptResult));
+        if (Objects.isNull(dictData)) {
+            return null;
+        }
+        return dictData.getLabel();
+    }
+
     public String getStatus$(){
         if (null == this.status){ return null; }
         switch (this.status){

--
Gitblit v1.9.1