From 75cca9bd19cc7fad3744c82dcfdc3c56a98694f6 Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期三, 08 五月 2024 11:26:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspect-server/src/main/java/com/yuanchu/mom/pojo/InsProduct.java | 68 +++++++++++++++++++++++++---------
1 files changed, 50 insertions(+), 18 deletions(-)
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsProduct.java b/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsProduct.java
index e290565..d669ecf 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsProduct.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsProduct.java
@@ -1,15 +1,16 @@
package com.yuanchu.mom.pojo;
+import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
import java.io.Serializable;
import java.math.BigDecimal;
import java.time.LocalDateTime;
-import java.util.Date;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
+import java.util.List;
+import java.util.Map;
/**
* 妫�楠岄」鐩�
@@ -35,7 +36,7 @@
private String inspectionItemClassify;
/**
- * 妫�楠岄」灏忕被
+ * 妫�楠岄」瀛愮被
*/
private String inspectionItemSubclass;
@@ -64,6 +65,13 @@
*/
private String model;
+ private String methodS;
+
+ /**
+ * 瀛愬疄楠屽
+ */
+ private String sonLaboratory;
+
/**
* 璁￠噺鍗曚綅
*/
@@ -77,7 +85,7 @@
/**
* 宸ユ椂(H)
*/
- private Integer manHour;
+ private Double manHour;
/**
* 宸ユ椂鍒嗙粍
@@ -135,31 +143,55 @@
private String ask;
/**
+ * 鏈�缁堝��
+ */
+ private String lastValue;
+
+ /**
+ * 1锛氬悎鏍� 0锛氫笉鍚堟牸
+ */
+ private Integer insResult;
+
+ /**
* 1锛氭湁鏁� 0锛氭棤鏁�
*/
private Integer state;
- @ApiModelProperty("")
+ /**
+ * 澶栭敭锛歩ns_sample琛╥d
+ */
+ private Integer insSampleId;
+
@TableField(fill = FieldFill.INSERT)
private Integer createUser;
- /**
- *
- */
+
@ApiModelProperty("鍒涘缓鏃堕棿")
@TableField(fill = FieldFill.INSERT)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime createTime;
- /**
- *
- */
- @ApiModelProperty("")
+
@TableField(fill = FieldFill.INSERT_UPDATE)
private Integer updateUser;
- /**
- *
- */
+
@ApiModelProperty("淇敼鏃堕棿")
@TableField(fill = FieldFill.INSERT_UPDATE)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime updateTime;
+
+ /**
+ * 澶栭敭锛歴tandard_template琛╥d
+ */
+ private Integer templateId;
+
+ @TableField(exist = false)
+ private List<JSONObject> template;
+
+ @TableField(exist = false)
+ private Map<String, Object> style;
+
+ @TableField(exist = false)
+ private InsProductResult insProductResult;
+
+ @TableField(exist = false)
+ private String templateName;
}
\ No newline at end of file
--
Gitblit v1.9.3