From f7a95fddddb0efd60abdab7550ae636c379a2a20 Mon Sep 17 00:00:00 2001
From: 李林 <z1292839451@163.com>
Date: 星期五, 08 三月 2024 12:44:49 +0800
Subject: [PATCH] 功能调整
---
inspect-server/src/main/java/com/yuanchu/mom/pojo/InsOrder.java | 92 ++++++++++++++++++---------------------------
1 files changed, 37 insertions(+), 55 deletions(-)
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsOrder.java b/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsOrder.java
index 74ccaf5..3bdd0e9 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsOrder.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsOrder.java
@@ -1,13 +1,14 @@
package com.yuanchu.mom.pojo;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
+import com.baomidou.mybatisplus.annotation.*;
import java.io.Serializable;
+import java.time.LocalDateTime;
import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
/**
* 妫�楠屼笅鍗�
@@ -35,17 +36,17 @@
/**
* 涓嬪崟瀹㈡埛
*/
- private String orderingCustomers;
+ private String custom;
/**
* 涓嬪崟鍗曚綅
*/
- private String orderingUnit;
+ private String company;
/**
* 绱ф�ョ▼搴�
*/
- private String urgency;
+ private Integer type;
/**
* 绾﹀畾鏃堕棿
@@ -55,12 +56,12 @@
/**
* 瀹為獙瀹ゅ悕绉�
*/
- private String laboratoryName;
+ private String laboratory;
/**
- * 鏍峰搧鍒嗙被
+ * 鏍峰搧绫诲瀷
*/
- private String sampleClassification;
+ private String smapleType;
/**
* 瑙勬牸鍨嬪彿
@@ -75,77 +76,58 @@
/**
* 鏍峰搧鏁伴噺
*/
- private Integer numberSamples;
+ private Double sampleNum;
/**
* 鏄惁鐣欐牱
*/
- private String leaveSample;
+ private Integer isLeave;
/**
* 鐣欐牱鏁伴噺
*/
- private Integer retainedSamples;
-
- /**
- * 鏍峰搧绫诲瀷
- */
- private String smapleType;
-
- /**
- * 濮旀墭鍏徃
- */
- private String entrustCompany;
-
- /**
- * 濮旀墭浜�
- */
- private String entrustName;
-
- /**
- * 鍒跺崟鏃堕棿
-
- */
- private Date documentTime;
-
- /**
- * 濮旀墭鏃堕棿
-
- */
- private Date entrustmentTime;
+ private Integer leaveNum;
/**
* 妫�娴嬭繘搴�
*/
- private String inspectionProgress;
+ private String insProgress;
/**
* 妫�娴嬬粨鏋�
*/
- private String inspectionResult;
+ private String insResult;
/**
- *
+ * 1锛氭楠屽鐞� 0锛氬緟瀹℃牳 2锛氶��鍥� 3锛氭挙閿�
*/
+ private Integer state;
+
+ private String remark;
+
+ @ApiModelProperty("")
+ @TableField(fill = FieldFill.INSERT)
private Integer createUser;
-
/**
- *
+ *
*/
- private Date createTime;
-
+ @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;
-
/**
- *
+ *
*/
- private Date updateTime;
-
- @TableField(exist = false)
- private static final long serialVersionUID = 1L;
+ @ApiModelProperty("淇敼鏃堕棿")
+ @TableField(fill = FieldFill.INSERT_UPDATE)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime updateTime;
}
\ No newline at end of file
--
Gitblit v1.9.3