From 788b1abbdc75d6bc727be65fc107fb10eaa484b6 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 30 七月 2024 20:04:10 +0800
Subject: [PATCH] 模版变更,下单的界面设置区间,如果填写0.48*0.5的时候筛选条件用0.48,下单的模版查看根据委托单位进行筛选,如果委托单位为空就可以查看所有
---
inspect-server/src/main/java/com/yuanchu/mom/dto/SampleOrderDto.java | 30 ++++++++++++++++++++++++------
1 files changed, 24 insertions(+), 6 deletions(-)
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/dto/SampleOrderDto.java b/inspect-server/src/main/java/com/yuanchu/mom/dto/SampleOrderDto.java
index 2960fa8..cb779c8 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/dto/SampleOrderDto.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/dto/SampleOrderDto.java
@@ -1,13 +1,10 @@
package com.yuanchu.mom.dto;
-import com.fasterxml.jackson.annotation.JsonFormat;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.yuanchu.mom.annotation.ValueTableShow;
import com.yuanchu.mom.pojo.InsOrder;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-
-import java.time.LocalDate;
-import java.time.LocalDateTime;
/**
* @author gaoaoy
@@ -17,9 +14,23 @@
@Data
public class SampleOrderDto extends InsOrder {
- @ValueTableShow(5)
- @ApiModelProperty("鏍峰搧绫诲瀷")
+ @ApiModelProperty("妫�楠屽璞�")
private String sampleType;
+
+ @ValueTableShow(3)
+ @ApiModelProperty("鏍峰搧鍚嶇О")
+ private String sampleName;
+
+ @ValueTableShow(4)
+ @ApiModelProperty("鏍峰搧鍨嬪彿")
+ private String sampleModel;
+
+ @ValueTableShow(5)
+ @ApiModelProperty("鏍峰搧鏁伴噺")
+ private Integer sampleNum;
+
+ @ApiModelProperty("鏍峰搧缂栧彿")
+ private String sampleCode;
@ValueTableShow(7)
@ApiModelProperty("妫�楠岃繘搴�%")
@@ -28,4 +39,11 @@
@ApiModelProperty("鎶ュ憡id")
private String reportId;
+ @TableField("`url`")
+ private String url;
+
+ private String urlS;
+
+ private String name;
+
}
--
Gitblit v1.9.3