From ceeb3cee504abbb8dbd7ea1625b144fe08f6e920 Mon Sep 17 00:00:00 2001 From: "MSI\\derek" Date: Mon, 2 Sep 2024 16:12:34 +0800 Subject: [PATCH] update grade_log table: drop posId --- .../java/com/ffii/tsms/modules/data/entity/GradeLog.java | 9 --------- .../tsms/modules/data/entity/projections/GradeLogInfo.kt | 1 - .../20240902_01_derek/01_drop_posId_in_gradeLog.sql | 6 ++++++ 3 files changed, 6 insertions(+), 10 deletions(-) create mode 100644 src/main/resources/db/changelog/changes/20240902_01_derek/01_drop_posId_in_gradeLog.sql diff --git a/src/main/java/com/ffii/tsms/modules/data/entity/GradeLog.java b/src/main/java/com/ffii/tsms/modules/data/entity/GradeLog.java index 0f390dd..75681a9 100644 --- a/src/main/java/com/ffii/tsms/modules/data/entity/GradeLog.java +++ b/src/main/java/com/ffii/tsms/modules/data/entity/GradeLog.java @@ -20,11 +20,6 @@ public class GradeLog extends BaseEntity { @JoinColumn(name = "gradeId") private Grade grade; - @NotNull - @OneToOne - @JoinColumn(name = "positionId") - private Position position; - @NotNull @Column(name = "from", length = 30) private LocalDate from; @@ -45,10 +40,6 @@ public class GradeLog extends BaseEntity { public void setGrade(Grade grade) { this.grade = grade; } - public Position getPosition() { return position; } - - public void setPosition(Position position) { this.position = position; } - public LocalDate getFrom() { return from; } public void setFrom(LocalDate from) { this.from = from; } diff --git a/src/main/java/com/ffii/tsms/modules/data/entity/projections/GradeLogInfo.kt b/src/main/java/com/ffii/tsms/modules/data/entity/projections/GradeLogInfo.kt index aee6ebd..7c46256 100644 --- a/src/main/java/com/ffii/tsms/modules/data/entity/projections/GradeLogInfo.kt +++ b/src/main/java/com/ffii/tsms/modules/data/entity/projections/GradeLogInfo.kt @@ -18,7 +18,6 @@ interface GradeLogInfo { val staffCode: String val grade: Grade - val position: Position val from: LocalDate val to: LocalDate? } diff --git a/src/main/resources/db/changelog/changes/20240902_01_derek/01_drop_posId_in_gradeLog.sql b/src/main/resources/db/changelog/changes/20240902_01_derek/01_drop_posId_in_gradeLog.sql new file mode 100644 index 0000000..b74aca5 --- /dev/null +++ b/src/main/resources/db/changelog/changes/20240902_01_derek/01_drop_posId_in_gradeLog.sql @@ -0,0 +1,6 @@ +-- liquibase formatted sql +-- changeset derek:drop posId in grade log + +ALTER TABLE `grade_log` +DROP FOREIGN KEY `FK_GRADE_LOG_ON_POSITIONID`, +DROP COLUMN `positionId`; \ No newline at end of file