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/SysReagent.java | 304 +++-----------------------------------------------
1 files changed, 21 insertions(+), 283 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/entity/SysReagent.java b/src/main/java/com/nanometer/smartlab/entity/SysReagent.java
index 7431bd2..c90a369 100644
--- a/src/main/java/com/nanometer/smartlab/entity/SysReagent.java
+++ b/src/main/java/com/nanometer/smartlab/entity/SysReagent.java
@@ -1,8 +1,11 @@
package com.nanometer.smartlab.entity;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.nanometer.smartlab.entity.enumtype.DangerousFlag;
import com.nanometer.smartlab.entity.enumtype.ValidFlag;
+import lombok.Getter;
+import lombok.Setter;
import sun.awt.SunHints;
import java.io.Serializable;
@@ -15,15 +18,18 @@
/**
* Created by johnny on 17/11/23.
*/
+@Getter
+@Setter
@JsonInclude(NON_NULL)
+@JsonIgnoreProperties(value = {"handler"})
public class SysReagent implements Serializable {
- private String id;
+ private Long id;
private String name;
private String cas;
private String reagentType;
private String reagentCharacter;
- private String supplierId;
+ private Long supplierId;
private String reagentFormat;
private BigDecimal mainMetering;
private String reagentUnit;
@@ -33,29 +39,34 @@
private ValidFlag validFlag;
private Timestamp createTime;
private Timestamp updateTime;
- private String supplierName;
private Integer deadline;
- private Integer reserve;
private String productSn;
private DangerousFlag dangerousFlag;
private String controlProducts;
- private String controlProductsName;
private String productHome;
- private String productHomeName;
private Integer type;
+ private Integer safetynum;
+ private BigDecimal originprice;
+ private BigDecimal density;
+
+
+
+
+ //非数据库字段
+ private String supplierName;
+ private Integer reserve;
+ private String controlProductsName;
+ private String productHomeName;
private String firstUser;
private String firName;
private String unitName;
private String formatName;
-
private String favor;
- private Integer safetynum;
private Integer actualnum;
-
private ValidFlag supplierFlag;
- private BigDecimal density;
+
public void change(){
@@ -64,278 +75,5 @@
}else{
favor = "1";
}
- }
-
- public String getFavor() {
- return favor;
- }
-
- public void setFavor(String favor) {
- this.favor = favor;
- }
-
- public String getUnitName() {
- return unitName;
- }
-
- public void setUnitName(String unitName) {
- this.unitName = unitName;
- }
-
- public String getFormatName() {
- return formatName;
- }
-
- public void setFormatName(String formatName) {
- this.formatName = formatName;
- }
-
- public String getFirstUser() {
- return firstUser;
- }
-
- public void setFirstUser(String firstUser) {
- this.firstUser = firstUser;
- }
-
- public String getFirName() {
- return firName;
- }
-
- public void setFirName(String firName) {
- this.firName = firName;
- }
-
- public Integer getType() {
- return type;
- }
-
- public void setType(Integer type) {
- this.type = type;
- }
-
- public String getId() {
- return id;
- }
-
- public void setId(String id) {
- this.id = id;
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public String getCas() {
- return cas;
- }
-
- public void setCas(String cas) {
- this.cas = cas;
- }
-
- public String getReagentType() {
- return reagentType;
- }
-
- public void setReagentType(String reagentType) {
- this.reagentType = reagentType;
- }
-
- public String getReagentCharacter() {
- return reagentCharacter;
- }
-
- public void setReagentCharacter(String reagentCharacter) {
- this.reagentCharacter = reagentCharacter;
- }
-
- public String getSupplierId() {
- return supplierId;
- }
-
- public void setSupplierId(String supplierId) {
- this.supplierId = supplierId;
- }
-
- public String getReagentFormat() {
- return reagentFormat;
- }
-
- public void setReagentFormat(String reagentFormat) {
- this.reagentFormat = reagentFormat;
- }
-
- public BigDecimal getMainMetering() {
- return mainMetering;
- }
-
- public void setMainMetering(BigDecimal mainMetering) {
- this.mainMetering = mainMetering;
- }
-
- public String getReagentUnit() {
- return reagentUnit;
- }
-
- public void setReagentUnit(String reagentUnit) {
- this.reagentUnit = reagentUnit;
- }
-
- public BigDecimal getPrice() {
- return price;
- }
-
- public void setPrice(BigDecimal price) {
- this.price = price;
- }
-
- public Integer getPerBox() {
- return perBox;
- }
-
- public void setPerBox(Integer perBox) {
- this.perBox = perBox;
- }
-
- public String getMemo() {
- return memo;
- }
-
- public void setMemo(String memo) {
- this.memo = memo;
- }
-
- 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 Timestamp getUpdateTime() {
- return updateTime;
- }
-
- public void setUpdateTime(Timestamp updateTime) {
- this.updateTime = updateTime;
- }
-
- public String getSupplierName() {
- return supplierName;
- }
-
- public void setSupplierName(String supplierName) {
- this.supplierName = supplierName;
- }
-
- public Integer getDeadline() {
- return deadline;
- }
-
- public void setDeadline(Integer deadline) {
- this.deadline = deadline;
- }
-
- public Integer getReserve() {
- return reserve;
- }
-
- public void setReserve(Integer reserve) {
- this.reserve = reserve;
- }
-
- public String getProductSn() {
- return productSn;
- }
-
- public void setProductSn(String productSn) {
- this.productSn = productSn;
- }
-
- public DangerousFlag getDangerousFlag() {
- return dangerousFlag;
- }
-
- public void setDangerousFlag(DangerousFlag dangerousFlag) {
- this.dangerousFlag = dangerousFlag;
- }
-
- public String getControlProductsName() {
- return controlProductsName;
- }
-
- public void setControlProductsName(String controlProductsName) {
- this.controlProductsName = controlProductsName;
- }
-
- public String getProductHome() {
- return productHome;
- }
-
- public void setProductHome(String productHome) {
- this.productHome = productHome;
- }
-
- public String getProductHomeName() {
- return productHomeName;
- }
-
- public void setProductHomeName(String productHomeName) {
- this.productHomeName = productHomeName;
- }
-
- public String getControlProducts() {
- return controlProducts;
- }
-
- public void setControlProducts(String controlProducts) {
- this.controlProducts = controlProducts;
- }
-
- public Integer getSafetynum() {
- return safetynum;
- }
-
- public void setSafetynum(Integer safetynum) {
- this.safetynum = safetynum;
- }
-
- public Integer getActualnum() {
- return actualnum;
- }
-
- public void setActualnum(Integer actualnum) {
- this.actualnum = actualnum;
- }
-
-
- public ValidFlag getSupplierFlag() {
- return supplierFlag;
- }
-
- public void setSupplierFlag(ValidFlag supplierFlag) {
- this.supplierFlag = supplierFlag;
- }
-
- public BigDecimal getDensity() {
- return density;
- }
-
- public void setDensity(BigDecimal density) {
- this.density = density;
}
}
--
Gitblit v1.9.2