|
@@ -1,11 +1,12 @@
|
|
|
package com.diagbot.entity;
|
|
|
|
|
|
-import java.math.BigDecimal;
|
|
|
-import com.baomidou.mybatisplus.annotation.TableName;
|
|
|
import com.baomidou.mybatisplus.annotation.IdType;
|
|
|
import com.baomidou.mybatisplus.annotation.TableId;
|
|
|
-import java.time.LocalDateTime;
|
|
|
+import com.baomidou.mybatisplus.annotation.TableName;
|
|
|
+
|
|
|
import java.io.Serializable;
|
|
|
+import java.math.BigDecimal;
|
|
|
+import java.util.Date;
|
|
|
|
|
|
/**
|
|
|
* <p>
|
|
@@ -13,7 +14,7 @@ import java.io.Serializable;
|
|
|
* </p>
|
|
|
*
|
|
|
* @author zhaops
|
|
|
- * @since 2021-01-08
|
|
|
+ * @since 2021-01-11
|
|
|
*/
|
|
|
@TableName("test_result_bill")
|
|
|
public class ResultBill implements Serializable {
|
|
@@ -34,12 +35,12 @@ public class ResultBill implements Serializable {
|
|
|
/**
|
|
|
* 记录创建时间
|
|
|
*/
|
|
|
- private LocalDateTime gmtCreate;
|
|
|
+ private Date gmtCreate;
|
|
|
|
|
|
/**
|
|
|
* 记录修改时间,如果时间是1970年则表示纪录未修改
|
|
|
*/
|
|
|
- private LocalDateTime gmtModified;
|
|
|
+ private Date gmtModified;
|
|
|
|
|
|
/**
|
|
|
* 创建人,0表示无创建人值
|
|
@@ -121,10 +122,15 @@ public class ResultBill implements Serializable {
|
|
|
*/
|
|
|
private BigDecimal minValue;
|
|
|
|
|
|
+ /**
|
|
|
+ * 单位
|
|
|
+ */
|
|
|
+ private String unit;
|
|
|
+
|
|
|
/**
|
|
|
* 范围(0:范围内,1:范围外)
|
|
|
*/
|
|
|
- private Integer range;
|
|
|
+ private Integer conflictItemRange;
|
|
|
|
|
|
/**
|
|
|
* 输出结果(提醒文本)
|
|
@@ -139,7 +145,7 @@ public class ResultBill implements Serializable {
|
|
|
/**
|
|
|
* 成功标志(1:成功,0:失败)
|
|
|
*/
|
|
|
- private String success;
|
|
|
+ private Integer success;
|
|
|
|
|
|
/**
|
|
|
* 提示信息(异常提醒)
|
|
@@ -153,6 +159,7 @@ public class ResultBill implements Serializable {
|
|
|
public void setId(Long id) {
|
|
|
this.id = id;
|
|
|
}
|
|
|
+
|
|
|
public String getIsDeleted() {
|
|
|
return isDeleted;
|
|
|
}
|
|
@@ -160,20 +167,23 @@ public class ResultBill implements Serializable {
|
|
|
public void setIsDeleted(String isDeleted) {
|
|
|
this.isDeleted = isDeleted;
|
|
|
}
|
|
|
- public LocalDateTime getGmtCreate() {
|
|
|
+
|
|
|
+ public Date getGmtCreate() {
|
|
|
return gmtCreate;
|
|
|
}
|
|
|
|
|
|
- public void setGmtCreate(LocalDateTime gmtCreate) {
|
|
|
+ public void setGmtCreate(Date gmtCreate) {
|
|
|
this.gmtCreate = gmtCreate;
|
|
|
}
|
|
|
- public LocalDateTime getGmtModified() {
|
|
|
+
|
|
|
+ public Date getGmtModified() {
|
|
|
return gmtModified;
|
|
|
}
|
|
|
|
|
|
- public void setGmtModified(LocalDateTime gmtModified) {
|
|
|
+ public void setGmtModified(Date gmtModified) {
|
|
|
this.gmtModified = gmtModified;
|
|
|
}
|
|
|
+
|
|
|
public String getCreator() {
|
|
|
return creator;
|
|
|
}
|
|
@@ -181,6 +191,7 @@ public class ResultBill implements Serializable {
|
|
|
public void setCreator(String creator) {
|
|
|
this.creator = creator;
|
|
|
}
|
|
|
+
|
|
|
public String getModifier() {
|
|
|
return modifier;
|
|
|
}
|
|
@@ -188,6 +199,7 @@ public class ResultBill implements Serializable {
|
|
|
public void setModifier(String modifier) {
|
|
|
this.modifier = modifier;
|
|
|
}
|
|
|
+
|
|
|
public Long getResultId() {
|
|
|
return resultId;
|
|
|
}
|
|
@@ -195,6 +207,7 @@ public class ResultBill implements Serializable {
|
|
|
public void setResultId(Long resultId) {
|
|
|
this.resultId = resultId;
|
|
|
}
|
|
|
+
|
|
|
public Integer getBillType() {
|
|
|
return billType;
|
|
|
}
|
|
@@ -202,6 +215,7 @@ public class ResultBill implements Serializable {
|
|
|
public void setBillType(Integer billType) {
|
|
|
this.billType = billType;
|
|
|
}
|
|
|
+
|
|
|
public String getBillItemType() {
|
|
|
return billItemType;
|
|
|
}
|
|
@@ -209,6 +223,7 @@ public class ResultBill implements Serializable {
|
|
|
public void setBillItemType(String billItemType) {
|
|
|
this.billItemType = billItemType;
|
|
|
}
|
|
|
+
|
|
|
public String getBillItemName() {
|
|
|
return billItemName;
|
|
|
}
|
|
@@ -216,6 +231,7 @@ public class ResultBill implements Serializable {
|
|
|
public void setBillItemName(String billItemName) {
|
|
|
this.billItemName = billItemName;
|
|
|
}
|
|
|
+
|
|
|
public String getBillItemHisName() {
|
|
|
return billItemHisName;
|
|
|
}
|
|
@@ -223,6 +239,7 @@ public class ResultBill implements Serializable {
|
|
|
public void setBillItemHisName(String billItemHisName) {
|
|
|
this.billItemHisName = billItemHisName;
|
|
|
}
|
|
|
+
|
|
|
public String getBillItemHisDetailName() {
|
|
|
return billItemHisDetailName;
|
|
|
}
|
|
@@ -230,6 +247,7 @@ public class ResultBill implements Serializable {
|
|
|
public void setBillItemHisDetailName(String billItemHisDetailName) {
|
|
|
this.billItemHisDetailName = billItemHisDetailName;
|
|
|
}
|
|
|
+
|
|
|
public String getConflictItemType() {
|
|
|
return conflictItemType;
|
|
|
}
|
|
@@ -237,6 +255,7 @@ public class ResultBill implements Serializable {
|
|
|
public void setConflictItemType(String conflictItemType) {
|
|
|
this.conflictItemType = conflictItemType;
|
|
|
}
|
|
|
+
|
|
|
public String getConflictItemName() {
|
|
|
return conflictItemName;
|
|
|
}
|
|
@@ -244,6 +263,7 @@ public class ResultBill implements Serializable {
|
|
|
public void setConflictItemName(String conflictItemName) {
|
|
|
this.conflictItemName = conflictItemName;
|
|
|
}
|
|
|
+
|
|
|
public String getConflictItemHisName() {
|
|
|
return conflictItemHisName;
|
|
|
}
|
|
@@ -251,6 +271,7 @@ public class ResultBill implements Serializable {
|
|
|
public void setConflictItemHisName(String conflictItemHisName) {
|
|
|
this.conflictItemHisName = conflictItemHisName;
|
|
|
}
|
|
|
+
|
|
|
public String getConflictItemHisDetailName() {
|
|
|
return conflictItemHisDetailName;
|
|
|
}
|
|
@@ -258,6 +279,7 @@ public class ResultBill implements Serializable {
|
|
|
public void setConflictItemHisDetailName(String conflictItemHisDetailName) {
|
|
|
this.conflictItemHisDetailName = conflictItemHisDetailName;
|
|
|
}
|
|
|
+
|
|
|
public String getInputValue() {
|
|
|
return inputValue;
|
|
|
}
|
|
@@ -265,6 +287,7 @@ public class ResultBill implements Serializable {
|
|
|
public void setInputValue(String inputValue) {
|
|
|
this.inputValue = inputValue;
|
|
|
}
|
|
|
+
|
|
|
public String getReferenceValue() {
|
|
|
return referenceValue;
|
|
|
}
|
|
@@ -272,6 +295,7 @@ public class ResultBill implements Serializable {
|
|
|
public void setReferenceValue(String referenceValue) {
|
|
|
this.referenceValue = referenceValue;
|
|
|
}
|
|
|
+
|
|
|
public BigDecimal getMaxValue() {
|
|
|
return maxValue;
|
|
|
}
|
|
@@ -279,6 +303,7 @@ public class ResultBill implements Serializable {
|
|
|
public void setMaxValue(BigDecimal maxValue) {
|
|
|
this.maxValue = maxValue;
|
|
|
}
|
|
|
+
|
|
|
public BigDecimal getMinValue() {
|
|
|
return minValue;
|
|
|
}
|
|
@@ -286,13 +311,23 @@ public class ResultBill implements Serializable {
|
|
|
public void setMinValue(BigDecimal minValue) {
|
|
|
this.minValue = minValue;
|
|
|
}
|
|
|
- public Integer getRange() {
|
|
|
- return range;
|
|
|
+
|
|
|
+ public String getUnit() {
|
|
|
+ return unit;
|
|
|
+ }
|
|
|
+
|
|
|
+ public void setUnit(String unit) {
|
|
|
+ this.unit = unit;
|
|
|
+ }
|
|
|
+
|
|
|
+ public Integer getConflictItemRange() {
|
|
|
+ return conflictItemRange;
|
|
|
}
|
|
|
|
|
|
- public void setRange(Integer range) {
|
|
|
- this.range = range;
|
|
|
+ public void setConflictItemRange(Integer conflictItemRange) {
|
|
|
+ this.conflictItemRange = conflictItemRange;
|
|
|
}
|
|
|
+
|
|
|
public String getOutput() {
|
|
|
return output;
|
|
|
}
|
|
@@ -300,6 +335,7 @@ public class ResultBill implements Serializable {
|
|
|
public void setOutput(String output) {
|
|
|
this.output = output;
|
|
|
}
|
|
|
+
|
|
|
public String getExpectedOutput() {
|
|
|
return expectedOutput;
|
|
|
}
|
|
@@ -307,13 +343,15 @@ public class ResultBill implements Serializable {
|
|
|
public void setExpectedOutput(String expectedOutput) {
|
|
|
this.expectedOutput = expectedOutput;
|
|
|
}
|
|
|
- public String getSuccess() {
|
|
|
+
|
|
|
+ public Integer getSuccess() {
|
|
|
return success;
|
|
|
}
|
|
|
|
|
|
- public void setSuccess(String success) {
|
|
|
+ public void setSuccess(Integer success) {
|
|
|
this.success = success;
|
|
|
}
|
|
|
+
|
|
|
public String getMessage() {
|
|
|
return message;
|
|
|
}
|
|
@@ -325,31 +363,32 @@ public class ResultBill implements Serializable {
|
|
|
@Override
|
|
|
public String toString() {
|
|
|
return "ResultBill{" +
|
|
|
- "id=" + id +
|
|
|
- ", isDeleted=" + isDeleted +
|
|
|
- ", gmtCreate=" + gmtCreate +
|
|
|
- ", gmtModified=" + gmtModified +
|
|
|
- ", creator=" + creator +
|
|
|
- ", modifier=" + modifier +
|
|
|
- ", resultId=" + resultId +
|
|
|
- ", billType=" + billType +
|
|
|
- ", billItemType=" + billItemType +
|
|
|
- ", billItemName=" + billItemName +
|
|
|
- ", billItemHisName=" + billItemHisName +
|
|
|
- ", billItemHisDetailName=" + billItemHisDetailName +
|
|
|
- ", conflictItemType=" + conflictItemType +
|
|
|
- ", conflictItemName=" + conflictItemName +
|
|
|
- ", conflictItemHisName=" + conflictItemHisName +
|
|
|
- ", conflictItemHisDetailName=" + conflictItemHisDetailName +
|
|
|
- ", inputValue=" + inputValue +
|
|
|
- ", referenceValue=" + referenceValue +
|
|
|
- ", maxValue=" + maxValue +
|
|
|
- ", minValue=" + minValue +
|
|
|
- ", range=" + range +
|
|
|
- ", output=" + output +
|
|
|
- ", expectedOutput=" + expectedOutput +
|
|
|
- ", success=" + success +
|
|
|
- ", message=" + message +
|
|
|
- "}";
|
|
|
+ "id=" + id +
|
|
|
+ ", isDeleted=" + isDeleted +
|
|
|
+ ", gmtCreate=" + gmtCreate +
|
|
|
+ ", gmtModified=" + gmtModified +
|
|
|
+ ", creator=" + creator +
|
|
|
+ ", modifier=" + modifier +
|
|
|
+ ", resultId=" + resultId +
|
|
|
+ ", billType=" + billType +
|
|
|
+ ", billItemType=" + billItemType +
|
|
|
+ ", billItemName=" + billItemName +
|
|
|
+ ", billItemHisName=" + billItemHisName +
|
|
|
+ ", billItemHisDetailName=" + billItemHisDetailName +
|
|
|
+ ", conflictItemType=" + conflictItemType +
|
|
|
+ ", conflictItemName=" + conflictItemName +
|
|
|
+ ", conflictItemHisName=" + conflictItemHisName +
|
|
|
+ ", conflictItemHisDetailName=" + conflictItemHisDetailName +
|
|
|
+ ", inputValue=" + inputValue +
|
|
|
+ ", referenceValue=" + referenceValue +
|
|
|
+ ", maxValue=" + maxValue +
|
|
|
+ ", minValue=" + minValue +
|
|
|
+ ", unit=" + unit +
|
|
|
+ ", conflictItemRange=" + conflictItemRange +
|
|
|
+ ", output=" + output +
|
|
|
+ ", expectedOutput=" + expectedOutput +
|
|
|
+ ", success=" + success +
|
|
|
+ ", message=" + message +
|
|
|
+ "}";
|
|
|
}
|
|
|
}
|