Skip to content

Commit 04d40b2

Browse files
committed
CLAP-154 Fix: Merge Conflict
1 parent f33e8b5 commit 04d40b2

File tree

1 file changed

+7
-1
lines changed
  • src/main/java/clap/server/domain/model/task

1 file changed

+7
-1
lines changed

src/main/java/clap/server/domain/model/task/Task.java

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public class Task extends BaseTime {
2525
private Category category;
2626
private Member requester;
2727
private TaskStatus taskStatus;
28-
private int processorOrder;
28+
private long processorOrder;
2929
private Member processor;
3030
private Label label;
3131
private Member reviewer;
@@ -50,6 +50,12 @@ public void updateTask(Category category, String title, String description) {
5050
this.taskCode = toTaskCode(category);
5151
}
5252

53+
public void setInitialProcessorOrder() {
54+
if(this.processor == null) {
55+
this.processorOrder = this.taskId * 128L;
56+
}
57+
}
58+
5359
public void updateTaskStatus(TaskStatus status) {
5460
this.taskStatus = status;
5561
}

0 commit comments

Comments
 (0)