设备修改

src/main/java/com/dc/dc_project/model/pojo/Equipment.java

@@ -157,103 +157,29 @@ public class Equipment {
     @TableField(value = "is_deleted")
     private Integer isDeleted;
 
-    @Override
+    /**
-    public boolean equals(Object that) {
+     * 出厂日期
-        if (this == that) {
+     */
-            return true;
+    @TableField(value = "serial_data")
-        }
+    private LocalDate serialData;
-        if (that == null) {
+
-            return false;
+    /**
-        }
+     * 使用状态
-        if (getClass() != that.getClass()) {
+     */
-            return false;
+    @TableField(value = "use_status")
-        }
+    private Long useStatus;
-        Equipment other = (Equipment) that;
+
-        return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId()))
+    /**
-            && (this.getOrgId() == null ? other.getOrgId() == null : this.getOrgId().equals(other.getOrgId()))
+     * 朔源方式
-            && (this.getName() == null ? other.getName() == null : this.getName().equals(other.getName()))
+     */
-            && (this.getModel() == null ? other.getModel() == null : this.getModel().equals(other.getModel()))
+    @TableField(value = "traceability_method")
-            && (this.getManufacturer() == null ? other.getManufacturer() == null : this.getManufacturer().equals(other.getManufacturer()))
+    private Long traceabilityMethod;
-            && (this.getSerialNo() == null ? other.getSerialNo() == null : this.getSerialNo().equals(other.getSerialNo()))
+
-            && (this.getPurchaseDate() == null ? other.getPurchaseDate() == null : this.getPurchaseDate().equals(other.getPurchaseDate()))
+    /**
-            && (this.getPrice() == null ? other.getPrice() == null : this.getPrice().equals(other.getPrice()))
+     * 检测证书编号
-            && (this.getRangeValue() == null ? other.getRangeValue() == null : this.getRangeValue().equals(other.getRangeValue()))
+     */
-            && (this.getAccuracy() == null ? other.getAccuracy() == null : this.getAccuracy().equals(other.getAccuracy()))
+    @TableField(value = "calibration_certificate")
-            && (this.getStatus() == null ? other.getStatus() == null : this.getStatus().equals(other.getStatus()))
+    private String calibrationCertificate;
-            && (this.getCalibrationOrg() == null ? other.getCalibrationOrg() == null : this.getCalibrationOrg().equals(other.getCalibrationOrg()))
-            && (this.getCalibrationDate() == null ? other.getCalibrationDate() == null : this.getCalibrationDate().equals(other.getCalibrationDate()))
-            && (this.getValidUntil() == null ? other.getValidUntil() == null : this.getValidUntil().equals(other.getValidUntil()))
-            && (this.getRemindDays() == null ? other.getRemindDays() == null : this.getRemindDays().equals(other.getRemindDays()))
-            && (this.getLocation() == null ? other.getLocation() == null : this.getLocation().equals(other.getLocation()))
-            && (this.getResponsibleUser() == null ? other.getResponsibleUser() == null : this.getResponsibleUser().equals(other.getResponsibleUser()))
-            && (this.getRemark() == null ? other.getRemark() == null : this.getRemark().equals(other.getRemark()))
-            && (this.getCreatedAt() == null ? other.getCreatedAt() == null : this.getCreatedAt().equals(other.getCreatedAt()))
-            && (this.getUpdatedAt() == null ? other.getUpdatedAt() == null : this.getUpdatedAt().equals(other.getUpdatedAt()))
-            && (this.getCreatedBy() == null ? other.getCreatedBy() == null : this.getCreatedBy().equals(other.getCreatedBy()))
-            && (this.getUpdatedBy() == null ? other.getUpdatedBy() == null : this.getUpdatedBy().equals(other.getUpdatedBy()))
-            && (this.getIsDeleted() == null ? other.getIsDeleted() == null : this.getIsDeleted().equals(other.getIsDeleted()));
-    }
 
-    @Override
-    public int hashCode() {
-        final int prime = 31;
-        int result = 1;
-        result = prime * result + ((getId() == null) ? 0 : getId().hashCode());
-        result = prime * result + ((getOrgId() == null) ? 0 : getOrgId().hashCode());
-        result = prime * result + ((getName() == null) ? 0 : getName().hashCode());
-        result = prime * result + ((getModel() == null) ? 0 : getModel().hashCode());
-        result = prime * result + ((getManufacturer() == null) ? 0 : getManufacturer().hashCode());
-        result = prime * result + ((getSerialNo() == null) ? 0 : getSerialNo().hashCode());
-        result = prime * result + ((getPurchaseDate() == null) ? 0 : getPurchaseDate().hashCode());
-        result = prime * result + ((getPrice() == null) ? 0 : getPrice().hashCode());
-        result = prime * result + ((getRangeValue() == null) ? 0 : getRangeValue().hashCode());
-        result = prime * result + ((getAccuracy() == null) ? 0 : getAccuracy().hashCode());
-        result = prime * result + ((getStatus() == null) ? 0 : getStatus().hashCode());
-        result = prime * result + ((getCalibrationOrg() == null) ? 0 : getCalibrationOrg().hashCode());
-        result = prime * result + ((getCalibrationDate() == null) ? 0 : getCalibrationDate().hashCode());
-        result = prime * result + ((getValidUntil() == null) ? 0 : getValidUntil().hashCode());
-        result = prime * result + ((getRemindDays() == null) ? 0 : getRemindDays().hashCode());
-        result = prime * result + ((getLocation() == null) ? 0 : getLocation().hashCode());
-        result = prime * result + ((getResponsibleUser() == null) ? 0 : getResponsibleUser().hashCode());
-        result = prime * result + ((getRemark() == null) ? 0 : getRemark().hashCode());
-        result = prime * result + ((getCreatedAt() == null) ? 0 : getCreatedAt().hashCode());
-        result = prime * result + ((getUpdatedAt() == null) ? 0 : getUpdatedAt().hashCode());
-        result = prime * result + ((getCreatedBy() == null) ? 0 : getCreatedBy().hashCode());
-        result = prime * result + ((getUpdatedBy() == null) ? 0 : getUpdatedBy().hashCode());
-        result = prime * result + ((getIsDeleted() == null) ? 0 : getIsDeleted().hashCode());
-        return result;
-    }
 
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append(getClass().getSimpleName());
-        sb.append(" [");
-        sb.append("Hash = ").append(hashCode());
-        sb.append(", id=").append(id);
-        sb.append(", orgId=").append(orgId);
-        sb.append(", name=").append(name);
-        sb.append(", model=").append(model);
-        sb.append(", manufacturer=").append(manufacturer);
-        sb.append(", serialNo=").append(serialNo);
-        sb.append(", purchaseDate=").append(purchaseDate);
-        sb.append(", price=").append(price);
-        sb.append(", rangeValue=").append(rangeValue);
-        sb.append(", accuracy=").append(accuracy);
-        sb.append(", status=").append(status);
-        sb.append(", calibrationOrg=").append(calibrationOrg);
-        sb.append(", calibrationDate=").append(calibrationDate);
-        sb.append(", validUntil=").append(validUntil);
-        sb.append(", remindDays=").append(remindDays);
-        sb.append(", location=").append(location);
-        sb.append(", responsibleUser=").append(responsibleUser);
-        sb.append(", remark=").append(remark);
-        sb.append(", createdAt=").append(createdAt);
-        sb.append(", updatedAt=").append(updatedAt);
-        sb.append(", createdBy=").append(createdBy);
-        sb.append(", updatedBy=").append(updatedBy);
-        sb.append(", isDeleted=").append(isDeleted);
-        sb.append("]");
-        return sb.toString();
-    }
 }