From 9fe1ec3afe8696c628d076d1f76686c4efc3012e Mon Sep 17 00:00:00 2001
From: zc <zyzc>
Date: 星期二, 21 十月 2025 10:49:55 +0800
Subject: [PATCH] 容器初始化功能优化

---
 rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WaitPakinItem.java |   83 +++++++++++++++++++++++++++++++++++++++--
 1 files changed, 78 insertions(+), 5 deletions(-)

diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WaitPakinItem.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WaitPakinItem.java
index 0ff1132..4cefb08 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WaitPakinItem.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WaitPakinItem.java
@@ -1,16 +1,21 @@
 package com.vincent.rsf.server.manager.entity;
 
-import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.*;
+
 import java.text.SimpleDateFormat;
-import java.util.Date;
+import java.util.*;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.fasterxml.jackson.annotation.JsonFormat;
+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;
 
-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;
@@ -22,6 +27,7 @@
 import java.util.Date;
 
 @Data
+@Accessors(chain = true)
 @TableName("man_wait_pakin_item")
 public class WaitPakinItem implements Serializable {
 
@@ -39,6 +45,54 @@
      */
     @ApiModelProperty(value= "涓诲崟ID")
     private Long pakinId;
+
+    @ApiModelProperty("璁㈠崟绫诲瀷")
+    private String type;
+
+    @ApiModelProperty("涓氬姟绫诲瀷")
+    private Short wkType;
+
+    @ApiModelProperty("缁勬嫋鏄庣粏ID")
+    private Long source;
+
+    @ApiModelProperty("璐ㄦ缁撴灉")
+    private Short isptResult;
+
+    /**
+     * 璁㈠崟ID
+     */
+    @ApiModelProperty(value= "璁㈠崟ID")
+    private Long asnId;
+
+    /**
+     * 璁㈠崟缂栫爜
+     */
+    @ApiModelProperty(value= "璁㈠崟缂栫爜")
+    private String asnCode;
+
+    /**
+     * 璁㈠崟鏄庣粏ID
+     */
+    @ApiModelProperty("璁㈠崟鏄庣粏ID")
+    private Long asnItemId;
+
+    /**
+     * 璺熻釜鐮�
+     */
+    @ApiModelProperty("鐗╂枡璺熻釜鐮�")
+    private String trackCode;
+
+    @ApiModelProperty("琛屽彿")
+    private String platItemId;
+
+    @ApiModelProperty("瀹㈡埛璁㈠崟鍙�")
+    private String platOrderCode;
+
+    @ApiModelProperty("宸ュ崟鍙�")
+    private String platWorkCode;
+
+    @ApiModelProperty("椤圭洰鍙�")
+    private String projectCode;
 
     /**
      * 鐗╂枡鍚嶇О
@@ -124,8 +178,12 @@
      */
     @ApiModelProperty(value= "娣诲姞鏃堕棿")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     private Date createTime;
 
+    @ApiModelProperty("鎵╁睍瀛楁")
+    @TableField(exist = false)
+    private Map<String, String> extendFields;
     /**
      * 淇敼浜哄憳
      */
@@ -137,6 +195,7 @@
      */
     @ApiModelProperty(value= "淇敼鏃堕棿")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     private Date updateTime;
 
     /**
@@ -226,6 +285,20 @@
         return null;
     }
 
+    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 getUpdateTime$(){
         if (Cools.isEmpty(this.updateTime)){
             return "";

--
Gitblit v1.9.1