From 47a751cb301d05276ae5d75145d57b2d090fe4e1 Mon Sep 17 00:00:00 2001
From: kongzy <kongzy>
Date: 星期一, 01 七月 2024 10:58:35 +0800
Subject: [PATCH] change
---
src/main/java/com/nanometer/smartlab/entity/OpeUseFlow.java | 229 +++++++-------------------------------------------------
1 files changed, 30 insertions(+), 199 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/entity/OpeUseFlow.java b/src/main/java/com/nanometer/smartlab/entity/OpeUseFlow.java
index 108a403..1408ef6 100644
--- a/src/main/java/com/nanometer/smartlab/entity/OpeUseFlow.java
+++ b/src/main/java/com/nanometer/smartlab/entity/OpeUseFlow.java
@@ -1,232 +1,63 @@
package com.nanometer.smartlab.entity;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
import com.nanometer.smartlab.entity.enumtype.ArrivalStatus;
import com.nanometer.smartlab.entity.enumtype.RealStatus;
import com.nanometer.smartlab.entity.enumtype.StoreType;
import com.nanometer.smartlab.entity.enumtype.ValidFlag;
+import lombok.Getter;
+import lombok.Setter;
import java.io.Serializable;
import java.math.BigDecimal;
import java.sql.Timestamp;
+import static com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL;
+
/**
* Created by johnny on 17/11/23.
*/
+@Setter
+@Getter
+@JsonInclude(NON_NULL)
+@JsonIgnoreProperties(value = {"handler"})
public class OpeUseFlow implements Serializable {
- private String id;
+ private Long id;
private String reagentCode;
- private ArrivalStatus status;
- private RealStatus realstatus;
- private String houseId;
- private String containerId;
- private String userId;
- private ValidFlag validFlag;
+ private Integer status;
+ private Integer realstatus;
+ private Long houseId;
+ private Long containerId;
+ private Long userId;
+ private Integer validFlag;
private Timestamp createTime;
private BigDecimal remainder;
private String place;
- private StoreType storeType;
+ private Integer operateState;
+ private Integer storeType;
+ private String receiptNumber;
+ private String note;
+ private BigDecimal volume;
+
+ //非数据库字段
private SysReagent reagent;
private String userName;
private String articleNumber;
-
private String laboratoryName;
private String warehouseName;
-
private String warehouseContainerName;
private String laboratoryContainerName;
private String warehouseContainerCode;
private String laboratoryContainerCode;
-
private String operatestateName;
- private String operateState;
-
-
- public String getWarehouseContainerCode() {
- return warehouseContainerCode;
- }
-
- public void setWarehouseContainerCode(String warehouseContainerCode) {
- this.warehouseContainerCode = warehouseContainerCode;
- }
-
- public String getLaboratoryContainerCode() {
- return laboratoryContainerCode;
- }
-
- public void setLaboratoryContainerCode(String laboratoryContainerCode) {
- this.laboratoryContainerCode = laboratoryContainerCode;
- }
-
- public String getOperatestateName() {
- return operatestateName;
- }
-
- public void setOperatestateName(String operatestateName) {
- this.operatestateName = operatestateName;
- }
-
- public RealStatus getRealstatus() {
- return realstatus;
- }
-
- public void setRealstatus(RealStatus realstatus) {
- this.realstatus = realstatus;
- }
-
-
-
- public String getOperateState() {
- return operateState;
- }
-
- public void setOperateState(String operateState) {
- this.operateState = operateState;
- }
-
- public String getId() {
- return id;
- }
-
- public void setId(String id) {
- this.id = id;
- }
-
- public String getReagentCode() {
- return reagentCode;
- }
-
- public void setReagentCode(String reagentCode) {
- this.reagentCode = reagentCode;
- }
-
- public ArrivalStatus getStatus() {
- return status;
- }
-
- public void setStatus(ArrivalStatus status) {
- this.status = status;
- }
-
- public String getHouseId() {
- return houseId;
- }
-
- public void setHouseId(String houseId) {
- this.houseId = houseId;
- }
-
- public String getContainerId() {
- return containerId;
- }
-
- public void setContainerId(String containerId) {
- this.containerId = containerId;
- }
-
- public String getUserId() {
- return userId;
- }
-
- public void setUserId(String userId) {
- this.userId = userId;
- }
-
- public ValidFlag getValidFlag() {
- return validFlag;
- }
-
- public void setValidFlag(ValidFlag validFlag) {
- this.validFlag = validFlag;
- }
-
- public Timestamp getCreateTime() {
- return createTime;
- }
-
- public void setCreateTime(Timestamp createTime) {
- this.createTime = createTime;
- }
-
- public BigDecimal getRemainder() {
- return remainder;
- }
-
- public void setRemainder(BigDecimal remainder) {
- this.remainder = remainder;
- }
-
- public String getPlace() {
- return place;
- }
-
- public void setPlace(String place) {
- this.place = place;
- }
-
- public SysReagent getReagent() {
- return reagent;
- }
-
- public void setReagent(SysReagent reagent) {
- this.reagent = reagent;
- }
-
- public String getUserName() {
- return userName;
- }
-
- public void setUserName(String userName) {
- this.userName = userName;
- }
-
- public String getArticleNumber() {
- return articleNumber;
- }
-
- public void setArticleNumber(String articleNumber) {
- this.articleNumber = articleNumber;
- }
-
- public String getLaboratoryName() {
- return laboratoryName;
- }
-
- public void setLaboratoryName(String laboratoryName) {
- this.laboratoryName = laboratoryName;
- }
-
- public String getWarehouseName() {
- return warehouseName;
- }
-
- public void setWarehouseName(String warehouseName) {
- this.warehouseName = warehouseName;
- }
-
- public String getWarehouseContainerName() {
- return warehouseContainerName;
- }
-
- public void setWarehouseContainerName(String warehouseContainerName) {
- this.warehouseContainerName = warehouseContainerName;
- }
-
- public String getLaboratoryContainerName() {
- return laboratoryContainerName;
- }
-
- public void setLaboratoryContainerName(String laboratoryContainerName) {
- this.laboratoryContainerName = laboratoryContainerName;
- }
-
- public StoreType getStoreType() {
- return storeType;
- }
-
- public void setStoreType(StoreType storeType) {
- this.storeType = storeType;
- }
+ //人员信息
+ private Long projectId;
+ private String projectName;
+ private String phone;
+ private String department;
+ private Integer applyNum;
}
--
Gitblit v1.9.2