From 91c6d603bfc528398d03a6b05228b72a1912082a Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期四, 27 七月 2023 15:56:42 +0800
Subject: [PATCH] LIMS管理系统框架-开发7-27第二次标准库完成修改
---
inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/InspectionProductListVo.java | 77 ++++++++++++
inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/dto/InspectionProductListDto.java | 58 +++++++++
inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/FinPlanVo.java | 50 ++++++++
inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/dto/InspectionMaterialListDto.java | 77 ++++++++++++
inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/PlanVo.java | 89 ++++++++++++++
5 files changed, 351 insertions(+), 0 deletions(-)
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/dto/InspectionMaterialListDto.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/dto/InspectionMaterialListDto.java
new file mode 100644
index 0000000..90f730e
--- /dev/null
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/dto/InspectionMaterialListDto.java
@@ -0,0 +1,77 @@
+package com.yuanchu.limslaboratory.pojo.dto;
+
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+//淇敼鏍峰搧淇℃伅
+@Data
+public class InspectionMaterialListDto implements Serializable {
+
+
+ /**
+ * 鎶ユ鏁伴噺-鐗╂枡鏁伴噺
+ */
+ @ApiModelProperty(value = "鎶ユ鏁伴噺-鐗╂枡鏁伴噺",required = true)
+ private Integer materialNum;
+ /**
+ * 渚涘簲鍟�
+ */
+ @ApiModelProperty(value = "渚涘簲鍟�",required = true)
+ private String materialSupplier;
+ /**
+ * 鐗╂枡鍚嶇О
+ */
+ @ApiModelProperty(value = "鐗╂枡鍚嶇О",required = true)
+ private String materialName;
+ /**
+ * 鐗╂枡瀛樻斁鍦�
+ */
+ @ApiModelProperty(value = "鐗╂枡瀛樻斁鍦�",required = true)
+ private String materialLocation;
+ /**
+ * 鐗╂枡鎵规
+ */
+ @ApiModelProperty(value = "鐗╂枡鎵规",required = true)
+ private String materialBatch;
+ /**
+ * 鐗╂枡鐩樺彿
+ */
+ @ApiModelProperty(value = "鐗╂枡鐩樺彿",required = true)
+ private String materialReelNumber;
+ /**
+ * 瑙勬牸鍚嶇О/鍨嬪彿鍚嶇О
+ */
+ @ApiModelProperty(value = "瑙勬牸鍚嶇О/鍨嬪彿鍚嶇О",required = true)
+ private String specificationsSerialNumber;
+ /**
+ * 鐢靛帇绛夌骇
+ */
+ @ApiModelProperty("鐢靛帇绛夌骇")
+ private String specificationsVoltageLevel;
+ /**
+ * 涓荤嚎蹇冩埅闈�
+ */
+ @ApiModelProperty("涓荤嚎蹇冩埅闈�")
+ private String specificationsCrossSection;
+ /**
+ * 涓荤嚎鑺姱鏁�
+ */
+ @ApiModelProperty("涓荤嚎鑺姱鏁�")
+ private String specificationsNumberOfCores;
+ /**
+ * 鐢熶骇鎸囦护鍙�
+ */
+ @ApiModelProperty("鐢熶骇鎸囦护鍙�")
+ private String specificationsInstruct;
+
+ @ApiModelProperty("澶囨敞")
+ private String notes;
+
+
+
+
+}
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/dto/InspectionProductListDto.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/dto/InspectionProductListDto.java
new file mode 100644
index 0000000..8f5ccfa
--- /dev/null
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/dto/InspectionProductListDto.java
@@ -0,0 +1,58 @@
+package com.yuanchu.limslaboratory.pojo.dto;
+
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+
+
+//(鏇存敼)鍒嗛厤妫�楠岄」鐩殑璇曢獙鍛�,璁惧,鏃堕棿,璇曢獙鏂规硶绛夊弬鏁�
+@Data
+public class InspectionProductListDto implements Serializable {
+
+
+ @ApiModelProperty(value = "椤圭洰妫�楠屽紑濮嬫棩鏈�")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private LocalDateTime startTime;
+
+ @ApiModelProperty(value = "椤圭洰妫�楠岀粨鏉熸棩鏈�")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private LocalDateTime endTime;
+
+ @ApiModelProperty(value = "椤圭洰鍚嶇О")
+ @JsonSerialize
+ private String name;
+
+ @ApiModelProperty(value = "璇曢獙鏂规硶")
+ @JsonSerialize
+ private String method;
+
+ @ApiModelProperty(value = "璇曢獙瑕佹眰")
+ @JsonSerialize
+ private String ask;
+
+ @ApiModelProperty(value = "鍗曚綅")
+ @JsonSerialize
+ private String unit;
+
+ @ApiModelProperty(value = "鎷涙爣浜鸿姹傚��")
+ @JsonSerialize
+ private String required;
+
+ @ApiModelProperty(value = "鍐呮帶鍊�")
+ @JsonSerialize
+ private String internal;
+
+
+ @ApiModelProperty(value = "鍏宠仈妫�楠岄」鐩瘯楠屽憳id")
+ @JsonSerialize
+ private Integer userId;
+
+ @ApiModelProperty(value = "鍏宠仈 璁惧id")
+ @JsonSerialize
+ private Integer instrumentId;
+}
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/FinPlanVo.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/FinPlanVo.java
new file mode 100644
index 0000000..b90fd31
--- /dev/null
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/FinPlanVo.java
@@ -0,0 +1,50 @@
+package com.yuanchu.limslaboratory.pojo.vo;
+
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+//(鍒嗛〉鏌ヨ)璁板綍鎴愬搧妫�楠�
+@Data
+public class FinPlanVo implements Serializable {
+
+ @ApiModelProperty(value = "璁″垝缂栧彿")
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+
+ @ApiModelProperty(value = "鏍峰搧缂栧彿")
+ @JsonSerialize
+ private int mid;
+
+ @ApiModelProperty(value = "鍏宠仈 鎶ユid(鐢宠鍗曠紪鍙�)")
+ @JsonSerialize
+ private String inspectionId;
+
+ @ApiModelProperty(value = "1锛氬緟璁ら锛�2锛氬緟鍒嗛厤锛�3锛氬凡鍒嗛厤锛�4锛氳秴鏈熷緟鍒嗛厤锛�5锛氬凡瀹屾垚锛�0锛氬凡浣滃簾")
+ @JsonSerialize
+ private Integer state;
+
+ @TableField(fill = FieldFill.INSERT)
+ @ApiModelProperty(value = "鐧昏鏃ユ湡", hidden = true)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createTime;
+
+
+ @ApiModelProperty(value = "璇曢獙璐熻矗浜�")
+ @JsonSerialize
+ private String userName;
+
+ @ApiModelProperty(value = "鍏宠仈 妫�楠屼汉")
+ @JsonSerialize
+ private String inspectUserName;
+
+}
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/InspectionProductListVo.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/InspectionProductListVo.java
new file mode 100644
index 0000000..d76aae2
--- /dev/null
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/InspectionProductListVo.java
@@ -0,0 +1,77 @@
+package com.yuanchu.limslaboratory.pojo.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.Date;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
+ * @since 2023-07-17
+ */
+//鏌ヨ妫�楠岄」鐩�
+@Data
+public class InspectionProductListVo implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty(value = "鎶ユ鏍峰搧id")
+ @JsonSerialize
+ private int inspectionMaterialListId;
+
+ @ApiModelProperty(value = "椤圭洰妫�楠屽紑濮嬫棩鏈�")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private LocalDateTime startTime;
+
+ @ApiModelProperty(value = "椤圭洰妫�楠岀粨鏉熸棩鏈�")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private LocalDateTime endTime;
+
+ @ApiModelProperty(value = "椤圭洰鍚嶇О")
+ @JsonSerialize
+ private String name;
+
+ @ApiModelProperty(value = "璇曢獙鏂规硶")
+ @JsonSerialize
+ private String method;
+
+ @ApiModelProperty(value = "璇曢獙瑕佹眰")
+ @JsonSerialize
+ private String ask;
+
+ @ApiModelProperty(value = "鍗曚綅")
+ @JsonSerialize
+ private String unit;
+
+ @ApiModelProperty(value = "鎷涙爣浜鸿姹傚��")
+ @JsonSerialize
+ private String required;
+
+ @ApiModelProperty(value = "鍐呮帶鍊�")
+ @JsonSerialize
+ private String internal;
+
+ @ApiModelProperty(value = "璇曢獙鍗曡瘯楠屽紑濮嬫棩鏈�", hidden = true)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date inspectStartTime;
+
+ @ApiModelProperty(value = "璇曢獙鍗曡瘯楠岀粨鏉熸棩鏈�", hidden = true)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date inspectEndTime;
+
+ @ApiModelProperty(value = "妫�楠岄」鐩瘯楠屽憳")
+ @JsonSerialize
+ private String userName;
+
+ @ApiModelProperty(value = "鍏宠仈 璁惧鍚�")
+ @JsonSerialize
+ private String instrumentName;
+}
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/PlanVo.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/PlanVo.java
new file mode 100644
index 0000000..e68fea1
--- /dev/null
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/PlanVo.java
@@ -0,0 +1,89 @@
+package com.yuanchu.limslaboratory.pojo.vo;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+//(鍒嗛〉鏌ヨ)妫�楠岃鍒掑垎閰�
+@Data
+public class PlanVo implements Serializable {
+
+
+ @ApiModelProperty(value = "鏍峰搧缂栧彿")
+ @JsonSerialize
+ private Integer mid;
+
+ @ApiModelProperty(value = "鎶ユ鍗曠紪鍙�")
+ @JsonSerialize
+ private String inspectionId;
+
+ @ApiModelProperty(value = "瀹屾垚鎯呭喌 1锛氬緟璁ら锛�2锛氬緟鍒嗛厤锛�3锛氬凡鍒嗛厤锛�4锛氳秴鏈熷緟鍒嗛厤锛�5锛氬凡瀹屾垚锛�0锛氬凡浣滃簾")
+ @JsonSerialize
+ private Integer state;
+
+ @TableField(fill = FieldFill.INSERT)
+ @ApiModelProperty(value = "鐧昏鏃ユ湡", hidden = true)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createTime;
+
+ @ApiModelProperty(value = "璇曢獙璐熻矗浜�")
+ @JsonSerialize
+ private String name;
+
+ @ApiModelProperty(value = "鏍峰搧鍚嶇О")
+ @JsonSerialize
+ private String materialName;
+
+ @ApiModelProperty(value = "瑙勬牸鍨嬪彿")
+ @JsonSerialize
+ private String specificationsSerialNumber;
+
+ @ApiModelProperty(value = "鐗╂枡缂栧彿")
+ @JsonSerialize
+ private String materialId;
+
+ @ApiModelProperty(value = "鏉ユ簮")
+ @JsonSerialize
+ private String materialSupplier;
+
+ @ApiModelProperty(value = "椤圭洰璇曢獙寮�濮嬫棩鏈�", hidden = true)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date startTime;
+
+ @ApiModelProperty(value = "椤圭洰璇曢獙缁撴潫鏃ユ湡", hidden = true)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date endTime;
+
+ @ApiModelProperty(value = "璇曢獙缁撹")
+ @JsonSerialize
+ private String results;
+
+ @ApiModelProperty(value = "瀵硅薄浣嶇疆")
+ @JsonSerialize
+ private String materialLocation;
+
+ @ApiModelProperty(value = "妫�娴嬬瓥鐣�")
+ @JsonSerialize
+ private String method;
+
+ @ApiModelProperty(value = "鎵规")
+ @JsonSerialize
+ private String materialBatch;
+
+ @ApiModelProperty(value = "鐩樺彿")
+ @JsonSerialize
+ private String materialReelNumber;
+
+ @ApiModelProperty(value = "鏍峰搧鏁伴噺")
+ @JsonSerialize
+ private String materialNum;
+
+}
--
Gitblit v1.9.3