From bc7d9c98bc1b23ef6ef29ed4a6313753f6900640 Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期二, 14 五月 2024 02:25:01 +0800
Subject: [PATCH] 费用统计查询修复; 检验下单字段调整; 下单进度查询修改; 执行优化去掉多余模板内容; 报告生成删除试验方法; 修改报告表格列宽; 修改报告删除列的统计方法

---
 inspect-server/src/main/java/com/yuanchu/mom/vo/InsOrderPlanVO.java |   34 ++++++++++++++++++++++++++++++++++
 1 files changed, 34 insertions(+), 0 deletions(-)

diff --git a/inspect-server/src/main/java/com/yuanchu/mom/vo/InsOrderPlanVO.java b/inspect-server/src/main/java/com/yuanchu/mom/vo/InsOrderPlanVO.java
index e4d9342..c91ca7b 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/vo/InsOrderPlanVO.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/vo/InsOrderPlanVO.java
@@ -1,5 +1,6 @@
 package com.yuanchu.mom.vo;
 
+import com.yuanchu.mom.annotation.ValueTableShow;
 import com.yuanchu.mom.common.OrderBy;
 import lombok.Data;
 
@@ -7,5 +8,38 @@
 public class InsOrderPlanVO extends OrderBy {
 
 
+    private String id;
+
+    @ValueTableShow(value = 1,name = "濮旀墭缂栧彿")
+    private String entrustCode;
+
+    @ValueTableShow(value = 2,name = "妫�楠屽璞�")
+    private String sampleType;
+
+    @ValueTableShow(value = 4,name = "绱ф�ョ▼搴�")
+    private String type;
+
+    @ValueTableShow(value = 5,name = "鐘舵��")
+    private String insState;
+
+    @ValueTableShow(value = 8,name = "妫�楠岀粨鏋�")
+    private Integer insResult;
+
+    @ValueTableShow(value = 6,name = "绾﹀畾鏃堕棿")
+    private String appointed;
+
+    @ValueTableShow(value = 7,name = "涓嬪彂鏃堕棿")
+    private String sendTime;
+
+    @ValueTableShow(value = 8,name = "鐞嗙敱")
+    private String verifyTell;
+
+    private Integer userId;
+
+    private String sonLaboratory;
+
+    private Integer orderUserId;
+
+    private Integer verifyUser;
 
 }

--
Gitblit v1.9.3