Преглед изворни кода

update

tags/Baseline_30082024_BACKEND_UAT
MSI\derek пре 1 година
родитељ
комит
604af48a00
2 измењених фајлова са 11 додато и 7 уклоњено
  1. +4
    -1
      src/main/java/com/ffii/tsms/modules/data/entity/Staff.java
  2. +7
    -6
      src/main/java/com/ffii/tsms/modules/data/entity/Team.java

+ 4
- 1
src/main/java/com/ffii/tsms/modules/data/entity/Staff.java Прегледај датотеку

@@ -15,6 +15,9 @@ import java.util.Set;

@Entity
@Table(name = "staff")
@JsonIdentityInfo(
generator = ObjectIdGenerators.PropertyGenerator.class,
property = "id")
public class Staff extends BaseEntity<Long> {
@NotNull
@OneToOne
@@ -51,7 +54,7 @@ public class Staff extends BaseEntity<Long> {
private Grade grade;

@ManyToOne
@JsonManagedReference
// @JsonManagedReference
@JoinColumn(name = "teamId")
private Team team;



+ 7
- 6
src/main/java/com/ffii/tsms/modules/data/entity/Team.java Прегледај датотеку

@@ -1,6 +1,8 @@
package com.ffii.tsms.modules.data.entity;

import com.fasterxml.jackson.annotation.JsonBackReference;
import com.fasterxml.jackson.annotation.JsonIdentityInfo;
import com.fasterxml.jackson.annotation.ObjectIdGenerators;
import com.ffii.core.entity.BaseEntity;
import com.ffii.tsms.modules.user.entity.User;
import jakarta.persistence.*;
@@ -8,6 +10,9 @@ import jakarta.validation.constraints.NotNull;

@Entity
@Table(name = "team")
@JsonIdentityInfo(
generator = ObjectIdGenerators.PropertyGenerator.class,
property = "id")
public class Team extends BaseEntity<Long> {
@Column(name = "description", length = 1500)
private String description;
@@ -22,14 +27,10 @@ public class Team extends BaseEntity<Long> {

@NotNull
@OneToOne
@JsonBackReference
// @JsonBackReference
@JoinColumn(name = "teamLead", unique = true)
private Staff staff;

// @NotNull
@OneToOne(mappedBy = "team", cascade = CascadeType.ALL, orphanRemoval = true)
private Staff teamLead;

public String getDescription() {
return description;
}
@@ -58,5 +59,5 @@ public class Team extends BaseEntity<Long> {

public void setStaff(Staff staff) { this.staff = staff; }

public Staff getTeamLead() { return teamLead;}
}

Loading…
Откажи
Сачувај