From 599b942446bb8bfc1f6d12c1fcb22a5e95398b37 Mon Sep 17 00:00:00 2001
From: 李林 <z1292839451@163.com>
Date: 星期三, 13 三月 2024 16:12:39 +0800
Subject: [PATCH] 功能调整
---
inspect-server/src/main/resources/mapper/InsOrderMapper.xml | 4 ++--
inspect-server/src/main/java/com/yuanchu/mom/pojo/InsOrder.java | 11 +++++++----
2 files changed, 9 insertions(+), 6 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 b1ce9bc..7ace92b 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
@@ -8,6 +8,7 @@
import lombok.Data;
import java.io.Serializable;
+import java.time.LocalDate;
import java.time.LocalDateTime;
/**
@@ -43,7 +44,7 @@
*/
@ValueTableShow(3)
@ApiModelProperty(value = "鏍峰搧绫诲瀷")
- private String smapleType;
+ private String sampleType;
/**
@@ -66,8 +67,8 @@
@ValueTableShow(6)
@ApiModelProperty(value = "绾﹀畾鏃堕棿")
@TableField(fill = FieldFill.INSERT)
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private LocalDateTime appointedTime;
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private LocalDate appointedTime;
/**
* 妫�娴嬭繘搴�
@@ -123,7 +124,7 @@
*/
@ValueTableShow(14)
@ApiModelProperty(value = "鐣欐牱鏁伴噺")
- private Integer leaveNum;
+ private Double leaveNum;
/**
* 1锛氭楠屽鐞� 0锛氬緟瀹℃牳 2锛氶��鍥� 3锛氭挙閿�
@@ -164,4 +165,6 @@
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime updateTime;
+ private Integer userId;
+
}
\ No newline at end of file
diff --git a/inspect-server/src/main/resources/mapper/InsOrderMapper.xml b/inspect-server/src/main/resources/mapper/InsOrderMapper.xml
index 66b992d..05b5572 100644
--- a/inspect-server/src/main/resources/mapper/InsOrderMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InsOrderMapper.xml
@@ -89,9 +89,9 @@
company,
code,
type,
- appointed_time,
+ appointed,
laboratory,
- smaple_type,
+ sample_type,
model,
sample,
sample_num,
--
Gitblit v1.9.3