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/dto/InsOrderPlanDTO.java |   17 +++++++++--------
 1 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/inspect-server/src/main/java/com/yuanchu/mom/dto/InsOrderPlanDTO.java b/inspect-server/src/main/java/com/yuanchu/mom/dto/InsOrderPlanDTO.java
index 9db96c1..60c7548 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/dto/InsOrderPlanDTO.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/dto/InsOrderPlanDTO.java
@@ -1,14 +1,15 @@
 package com.yuanchu.mom.dto;
 
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.yuanchu.mom.annotation.ValueTableShow;
 import com.yuanchu.mom.common.OrderBy;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-@Data
-public class InsOrderPlanDTO extends OrderBy {
+import java.io.Serializable;
 
-    @ApiModelProperty("鏄惁鍙湅鑷繁鐨勪换鍔�")
-    private Boolean viewSelf;
+@Data
+public class InsOrderPlanDTO extends OrderBy implements Serializable {
 
     @ApiModelProperty("妫�楠屼换鍔′富閿甶d")
     private Long insSampleId;
@@ -20,12 +21,12 @@
     private Integer state;
 
     @ApiModelProperty("瀛愬疄楠屽")
-    private String childrenLaboratory;
-
-    @ApiModelProperty("鏍峰搧鍚嶇О")
-    private String sampleName;
+    private String sonLaboratory;
 
     @ApiModelProperty("妫�楠岀姸鎬�")
     private String insState;
 
+    @ApiModelProperty("濮旀墭缂栧彿")
+    private String entrustCode;
+
 }

--
Gitblit v1.9.3