修改

src/main/java/com/yxproject/start/entity/GroupNoEntity.java

@@ -6,13 +6,15 @@ import java.util.Objects;
 @Entity
 @Table(name = "GROUP_NO", schema = "YINGXIN", catalog = "")
 public class GroupNoEntity {
+
     private String groupNo;
     private Long taskId;
     private Long validCount;
     private Long invalidCount;
     private Long specialCardCount;
+    private long id;
 
-    @Id
+    @Basic
     @Column(name = "GROUP_NO")
     public String getGroupNo() {
         return groupNo;
@@ -62,12 +64,23 @@ public class GroupNoEntity {
         this.specialCardCount = specialCardCount;
     }
 
+    @Id
+    @Column(name = "ID")
+    public long getId() {
+        return id;
+    }
+
+    public void setId(long id) {
+        this.id = id;
+    }
+
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;
         if (o == null || getClass() != o.getClass()) return false;
         GroupNoEntity that = (GroupNoEntity) o;
-        return Objects.equals(groupNo, that.groupNo) &&
+        return id == that.id &&
+                Objects.equals(groupNo, that.groupNo) &&
                 Objects.equals(taskId, that.taskId) &&
                 Objects.equals(validCount, that.validCount) &&
                 Objects.equals(invalidCount, that.invalidCount) &&
@@ -76,6 +89,6 @@ public class GroupNoEntity {
 
     @Override
     public int hashCode() {
-        return Objects.hash(groupNo, taskId, validCount, invalidCount, specialCardCount);
+        return Objects.hash(groupNo, taskId, validCount, invalidCount, specialCardCount, id);
     }
 }

src/main/java/com/yxproject/start/entity/TaskEntity.java

@@ -7,21 +7,30 @@ import java.util.Objects;
 @Entity
 @Table(name = "TASK", schema = "YINGXIN", catalog = "")
 public class TaskEntity {
+
     private long taskId;
     private Long cardType;
     private Long oldCardType;
     private String countyCode;
     private Time submitDate;
+    private String submitName;
     private Time issuedDate;
+    private String issuedName;
     private Time downloadDate;
+    private String downloadName;
     private Time printOutDate;
+    private String printOutName;
     private Time positionDate;
+    private String positionName;
     private Time outWorkshopDate;
-    private String qualityPeopleName;
+    private String outWorkshopName;
+    private String qualityTestName;
     private Time qualityTestDate;
     private String exceptionInformation;
     private Time outStorageDate;
+    private String outStorageName;
     private Time inStorageDate;
+    private String inStorageName;
     private Long taskStateId;
     private Long isException;
     private Long printerId;
@@ -78,6 +87,16 @@ public class TaskEntity {
         this.submitDate = submitDate;
     }
 
+    @Basic
+    @Column(name = "SUBMIT_NAME")
+    public String getSubmitName() {
+        return submitName;
+    }
+
+    public void setSubmitName(String submitName) {
+        this.submitName = submitName;
+    }
+
     @Basic
     @Column(name = "ISSUED_DATE")
     public Time getIssuedDate() {
@@ -88,6 +107,16 @@ public class TaskEntity {
         this.issuedDate = issuedDate;
     }
 
+    @Basic
+    @Column(name = "ISSUED_NAME")
+    public String getIssuedName() {
+        return issuedName;
+    }
+
+    public void setIssuedName(String issuedName) {
+        this.issuedName = issuedName;
+    }
+
     @Basic
     @Column(name = "DOWNLOAD_DATE")
     public Time getDownloadDate() {
@@ -98,6 +127,16 @@ public class TaskEntity {
         this.downloadDate = downloadDate;
     }
 
+    @Basic
+    @Column(name = "DOWNLOAD_NAME")
+    public String getDownloadName() {
+        return downloadName;
+    }
+
+    public void setDownloadName(String downloadName) {
+        this.downloadName = downloadName;
+    }
+
     @Basic
     @Column(name = "PRINT_OUT_DATE")
     public Time getPrintOutDate() {
@@ -108,6 +147,16 @@ public class TaskEntity {
         this.printOutDate = printOutDate;
     }
 
+    @Basic
+    @Column(name = "PRINT_OUT_NAME")
+    public String getPrintOutName() {
+        return printOutName;
+    }
+
+    public void setPrintOutName(String printOutName) {
+        this.printOutName = printOutName;
+    }
+
     @Basic
     @Column(name = "POSITION_DATE")
     public Time getPositionDate() {
@@ -118,6 +167,16 @@ public class TaskEntity {
         this.positionDate = positionDate;
     }
 
+    @Basic
+    @Column(name = "POSITION_NAME")
+    public String getPositionName() {
+        return positionName;
+    }
+
+    public void setPositionName(String positionName) {
+        this.positionName = positionName;
+    }
+
     @Basic
     @Column(name = "OUT_WORKSHOP_DATE")
     public Time getOutWorkshopDate() {
@@ -129,13 +188,23 @@ public class TaskEntity {
     }
 
     @Basic
-    @Column(name = "QUALITY_PEOPLE_NAME")
-    public String getQualityPeopleName() {
-        return qualityPeopleName;
+    @Column(name = "OUT_WORKSHOP_NAME")
+    public String getOutWorkshopName() {
+        return outWorkshopName;
+    }
+
+    public void setOutWorkshopName(String outWorkshopName) {
+        this.outWorkshopName = outWorkshopName;
+    }
+
+    @Basic
+    @Column(name = "QUALITY_TEST_NAME")
+    public String getQualityTestName() {
+        return qualityTestName;
     }
 
-    public void setQualityPeopleName(String qualityPeopleName) {
-        this.qualityPeopleName = qualityPeopleName;
+    public void setQualityTestName(String qualityTestName) {
+        this.qualityTestName = qualityTestName;
     }
 
     @Basic
@@ -168,6 +237,16 @@ public class TaskEntity {
         this.outStorageDate = outStorageDate;
     }
 
+    @Basic
+    @Column(name = "OUT_STORAGE_NAME")
+    public String getOutStorageName() {
+        return outStorageName;
+    }
+
+    public void setOutStorageName(String outStorageName) {
+        this.outStorageName = outStorageName;
+    }
+
     @Basic
     @Column(name = "IN_STORAGE_DATE")
     public Time getInStorageDate() {
@@ -178,6 +257,16 @@ public class TaskEntity {
         this.inStorageDate = inStorageDate;
     }
 
+    @Basic
+    @Column(name = "IN_STORAGE_NAME")
+    public String getInStorageName() {
+        return inStorageName;
+    }
+
+    public void setInStorageName(String inStorageName) {
+        this.inStorageName = inStorageName;
+    }
+
     @Basic
     @Column(name = "TASK_STATE_ID")
     public Long getTaskStateId() {
@@ -238,16 +327,24 @@ public class TaskEntity {
                 Objects.equals(oldCardType, that.oldCardType) &&
                 Objects.equals(countyCode, that.countyCode) &&
                 Objects.equals(submitDate, that.submitDate) &&
+                Objects.equals(submitName, that.submitName) &&
                 Objects.equals(issuedDate, that.issuedDate) &&
+                Objects.equals(issuedName, that.issuedName) &&
                 Objects.equals(downloadDate, that.downloadDate) &&
+                Objects.equals(downloadName, that.downloadName) &&
                 Objects.equals(printOutDate, that.printOutDate) &&
+                Objects.equals(printOutName, that.printOutName) &&
                 Objects.equals(positionDate, that.positionDate) &&
+                Objects.equals(positionName, that.positionName) &&
                 Objects.equals(outWorkshopDate, that.outWorkshopDate) &&
-                Objects.equals(qualityPeopleName, that.qualityPeopleName) &&
+                Objects.equals(outWorkshopName, that.outWorkshopName) &&
+                Objects.equals(qualityTestName, that.qualityTestName) &&
                 Objects.equals(qualityTestDate, that.qualityTestDate) &&
                 Objects.equals(exceptionInformation, that.exceptionInformation) &&
                 Objects.equals(outStorageDate, that.outStorageDate) &&
+                Objects.equals(outStorageName, that.outStorageName) &&
                 Objects.equals(inStorageDate, that.inStorageDate) &&
+                Objects.equals(inStorageName, that.inStorageName) &&
                 Objects.equals(taskStateId, that.taskStateId) &&
                 Objects.equals(isException, that.isException) &&
                 Objects.equals(printerId, that.printerId) &&
@@ -257,6 +354,6 @@ public class TaskEntity {
 
     @Override
     public int hashCode() {
-        return Objects.hash(taskId, cardType, oldCardType, countyCode, submitDate, issuedDate, downloadDate, printOutDate, positionDate, outWorkshopDate, qualityPeopleName, qualityTestDate, exceptionInformation, outStorageDate, inStorageDate, taskStateId, isException, printerId, beginPageNumber, finishPageNumber);
+        return Objects.hash(taskId, cardType, oldCardType, countyCode, submitDate, submitName, issuedDate, issuedName, downloadDate, downloadName, printOutDate, printOutName, positionDate, positionName, outWorkshopDate, outWorkshopName, qualityTestName, qualityTestDate, exceptionInformation, outStorageDate, outStorageName, inStorageDate, inStorageName, taskStateId, isException, printerId, beginPageNumber, finishPageNumber);
     }
 }

src/main/resources/application.yml

@@ -4,9 +4,9 @@ server:
 spring:
   datasource:
     driver-class-name: oracle.jdbc.driver.OracleDriver
-    url: jdbc:oracle:thin:@192.168.1.197:1521:orcl
-    username: yx
-    password: yx
+    url: jdbc:oracle:thin:@192.168.1.102:1521:yingxin
+    username: yingxin
+    password: yingxin
   servlet:
     multipart:
       enabled: true