代码优化

distributed-print-business/src/main/java/com/qmth/distributed/print/business/entity/ExamPaperGroupMarker.java

@@ -7,6 +7,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
 import java.io.Serializable;
+import java.util.Objects;
 
 /**
  * @Description: 试卷分组和评卷员绑定关系
@@ -28,6 +29,23 @@ public class ExamPaperGroupMarker extends BaseEntity implements Serializable {
     @ApiModelProperty(value = "评卷员登录名")
     private String loginName;
 
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        ExamPaperGroupMarker that = (ExamPaperGroupMarker) o;
+        return groupId.equals(that.groupId) && markerId.equals(that.markerId) && loginName.equals(that.loginName);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(groupId, markerId, loginName);
+    }
+
     public Long getGroupId() {
         return groupId;
     }

teachcloud-common/src/main/java/com/qmth/teachcloud/common/entity/BasicSchool.java

@@ -7,6 +7,7 @@ import com.qmth.teachcloud.common.contant.SystemConstant;
 import io.swagger.annotations.ApiModelProperty;
 
 import java.io.Serializable;
+import java.util.Objects;
 
 /**
  * <p>
@@ -63,6 +64,23 @@ public class BasicSchool extends BaseEntity implements Serializable {
         this.enable = true;
     }
 
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        BasicSchool that = (BasicSchool) o;
+        return code.equals(that.code) && name.equals(that.name) && enable.equals(that.enable) && accessKey.equals(that.accessKey) && accessSecret.equals(that.accessSecret) && remark.equals(that.remark) && logo.equals(that.logo);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(code, name, enable, accessKey, accessSecret, remark, logo);
+    }
+
     public static long getSerialVersionUID() {
         return serialVersionUID;
     }

teachcloud-common/src/main/java/com/qmth/teachcloud/common/entity/SysOrg.java

@@ -12,6 +12,7 @@ import io.swagger.annotations.ApiModelProperty;
 
 import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
+import java.util.Objects;
 
 /**
  * <p>
@@ -70,6 +71,23 @@ public class SysOrg extends BaseEntity implements Serializable {
         this.enable = true;
     }
 
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        SysOrg sysOrg = (SysOrg) o;
+        return schoolId.equals(sysOrg.schoolId) && code.equals(sysOrg.code) && type == sysOrg.type && name.equals(sysOrg.name) && parentId.equals(sysOrg.parentId) && enable.equals(sysOrg.enable) && historicName.equals(sysOrg.historicName);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(schoolId, code, type, name, parentId, enable, historicName);
+    }
+
     public String getHistoricName() {
         return historicName;
     }

teachcloud-report-business/src/main/java/com/qmth/teachcloud/report/business/entity/TAExamCourseRecord.java

@@ -124,6 +124,23 @@ public class TAExamCourseRecord implements Serializable {
     @TableField(value = "student_current")
     private Boolean studentCurrent;
 
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        TAExamCourseRecord that = (TAExamCourseRecord) o;
+        return id.equals(that.id) && schoolId.equals(that.schoolId) && examRecordId.equals(that.examRecordId) && assignedScore.equals(that.assignedScore) && percentGrade.equals(that.percentGrade) && scoreLevel.equals(that.scoreLevel) && colRank.equals(that.colRank) && rankLevel.equals(that.rankLevel) && overCollegeRate.equals(that.overCollegeRate) && standardizedCoefficients.equals(that.standardizedCoefficients) && examId.equals(that.examId) && courseCode.equals(that.courseCode) && paperId.equals(that.paperId) && paperType.equals(that.paperType) && studentId.equals(that.studentId) && studentCode.equals(that.studentCode) && teacherId.equals(that.teacherId) && clazzId.equals(that.clazzId) && teachCollegeId.equals(that.teachCollegeId) && inspectCollegeId.equals(that.inspectCollegeId) && majorId.equals(that.majorId) && totalScore.equals(that.totalScore) && absent.equals(that.absent) && studentCurrent.equals(that.studentCurrent);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(id, schoolId, examRecordId, assignedScore, percentGrade, scoreLevel, colRank, rankLevel, overCollegeRate, standardizedCoefficients, examId, courseCode, paperId, paperType, studentId, studentCode, teacherId, clazzId, teachCollegeId, inspectCollegeId, majorId, totalScore, absent, studentCurrent);
+    }
+
     public static long getSerialVersionUID() {
         return serialVersionUID;
     }