From 3b75c8cf561035c41d25d5b8765a7c89375ca264 Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期日, 12 五月 2024 08:00:32 +0800
Subject: [PATCH] 各bug修复；
---
inspect-server/src/main/java/com/yuanchu/mom/pojo/InsProduct.java | 74 ++++++++++++++++++++++++++----------
1 files changed, 53 insertions(+), 21 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 1051f71..a4e7677 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,7 +65,11 @@
*/
private String model;
- @ApiModelProperty("瀛愬疄楠屽")
+ private String methodS;
+
+ /**
+ * 瀛愬疄楠屽
+ */
private String sonLaboratory;
/**
@@ -80,7 +85,7 @@
/**
* 宸ユ椂(H)
*/
- private Integer manHour;
+ private Double manHour;
/**
* 宸ユ椂鍒嗙粍
@@ -137,35 +142,62 @@
*/
private String ask;
+ /**瑕佹眰鎻忚堪*/
+ private String tell;
+
+ /**
+ * 鏈�缁堝��
+ */
+ @TableField("`last_value`")
+ private String lastValue;
+
+ /**
+ * 1锛氬悎鏍� 0锛氫笉鍚堟牸
+ */
+ private Integer insResult;
+
/**
* 1锛氭湁鏁� 0锛氭棤鏁�
*/
private Integer state;
- @ApiModelProperty("鍨嬪彿")
- private Integer templateId;
+ /**
+ * 澶栭敭锛歩ns_sample琛╥d
+ */
+ private Integer insSampleId;
- @ApiModelProperty("")
@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;
+
+ private String dic;
}
\ No newline at end of file
--
Gitblit v1.9.3