From 34981c30a78e8bbd7791131059a9210f9928b62c Mon Sep 17 00:00:00 2001
From: 刘光辉 <347230014@qq.com>
Date: 星期四, 17 九月 2026 09:24:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master

---
 jnpf-lims/jnpf-lims-entity/src/main/java/jnpf/limsEntity/LimsJianyanJinduDetailVo.java |   68 ++++++++++++++++++++++++++++++++++
 1 files changed, 68 insertions(+), 0 deletions(-)

diff --git a/jnpf-lims/jnpf-lims-entity/src/main/java/jnpf/limsEntity/LimsJianyanJinduDetailVo.java b/jnpf-lims/jnpf-lims-entity/src/main/java/jnpf/limsEntity/LimsJianyanJinduDetailVo.java
new file mode 100644
index 0000000..bd3602a
--- /dev/null
+++ b/jnpf-lims/jnpf-lims-entity/src/main/java/jnpf/limsEntity/LimsJianyanJinduDetailVo.java
@@ -0,0 +1,68 @@
+package jnpf.limsEntity;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 妫�楠岃繘搴﹁鎯呭搷搴斻��
+ */
+@Data
+public class LimsJianyanJinduDetailVo {
+
+    private SampleInfo sampleInfo;
+
+    private List<InspectionProgressItem> inspectionProgress = new ArrayList<>();
+
+    private List<ProjectDetailItem> projectDetail = new ArrayList<>();
+
+    /**
+     * 鏍峰搧鍩烘湰淇℃伅銆�
+     */
+    @Data
+    public static class SampleInfo {
+        private String id;
+        private String name;
+        private String code;
+        private String batchNo;
+        private String specification;
+    }
+
+    /**
+     * 璇烽獙鍗曟暣浣撹繘搴﹁妭鐐广��
+     */
+    @Data
+    public static class InspectionProgressItem {
+        private String id;
+        private String title;
+        private String operator;
+        private String department;
+        private String operatedAt;
+        private String status;
+        private String xiangmuMingcheng;
+    }
+
+    /**
+     * 鍗曚釜妫�楠岄」鐩強鍏跺鐞嗛樁娈点��
+     */
+    @Data
+    public static class ProjectDetailItem {
+        private String id;
+        private String name;
+        private List<ProjectStage> stages = new ArrayList<>();
+    }
+
+    /**
+     * 妫�楠岄」鐩鐞嗛樁娈点��
+     */
+    @Data
+    @JsonInclude(JsonInclude.Include.NON_NULL)
+    public static class ProjectStage {
+        private String title;
+        private String status;
+        private String operator;
+        private String operatedAt;
+    }
+}

--
Gitblit v1.8.0