Integry/IntegryManagementSystem
19
0
Fork 0
Code Actions Packages Projects Releases Activity

Merge branch 'master' into develop

Browse Source
This commit is contained in:
Giuseppe Scorrano
2024-03-13 15:37:11 +01:00
parent 067058190e 25511f25b1
commit d169443340
5 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ems-core/src/main/java/it/integry/ems_model/entity/AtbOffr.java
View File

@@ -4,6 +4,7 @@ import com.fasterxml.jackson.annotation.JsonTypeName;
import it.integry.ems_model.annotation.*; import it.integry.ems_model.annotation.*;
import it.integry.ems_model.base.EntityBase; import it.integry.ems_model.base.EntityBase;
import org.kie.api.definition.type.PropertyReactive; import org.kie.api.definition.type.PropertyReactive;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.Date; import java.util.Date;
@@ -28,7 +29,7 @@ public class AtbOffr extends EntityBase {
private Integer numOff; private Integer numOff;
@PK @PK
@ImportFromParent( value = "id_contratto") @ImportFromParent( value = "idContratto")
@SqlField(value = "id_contratto", nullable = false) @SqlField(value = "id_contratto", nullable = false)
private Long idContratto; private Long idContratto;

2
ems-core/src/main/java/it/integry/ems_model/entity/AtbPianoLogisticoDet.java
View File

@@ -35,7 +35,7 @@ public class AtbPianoLogisticoDet extends EntityBase {
private Integer ggOrd; private Integer ggOrd;
@Unique @Unique
@ImportFromParent(value = "id_piano") @ImportFromParent(value = "idPiano")
@SqlField(value = "id_piano", nullable = false) @SqlField(value = "id_piano", nullable = false)
private Long idPiano; private Long idPiano;

2
ems-core/src/main/java/it/integry/ems_model/entity/VtbBdgr.java
View File

@@ -18,7 +18,7 @@ public class VtbBdgr extends EntityBase {
@SqlField(value = "id_row", nullable = false) @SqlField(value = "id_row", nullable = false)
private Long idRow; private Long idRow;
@ImportFromParent("id_bdg") @ImportFromParent("idBdg")
@SqlField(value = "id_bdg", nullable = false) @SqlField(value = "id_bdg", nullable = false)
private Long idBdg; private Long idBdg;

3
ems-core/src/main/java/it/integry/ems_model/entity/VtbOffr.java
View File

@@ -5,6 +5,7 @@ import it.integry.common.var.CommonConstants;
import it.integry.ems_model.annotation.*; import it.integry.ems_model.annotation.*;
import it.integry.ems_model.base.EntityBase; import it.integry.ems_model.base.EntityBase;
import org.kie.api.definition.type.PropertyReactive; import org.kie.api.definition.type.PropertyReactive;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.Date; import java.util.Date;
@@ -16,7 +17,7 @@ public class VtbOffr extends EntityBase {
public static final String ENTITY = "vtb_offr"; public static final String ENTITY = "vtb_offr";
@PK @PK
@ImportFromParent(value = "id_offerta") @ImportFromParent(value = "idOfferta")
@SqlField(value = "id_offerta", nullable = false) @SqlField(value = "id_offerta", nullable = false)
private Long idOfferta; private Long idOfferta;

3
ems-core/src/main/java/it/integry/ems_model/entity/WtbNotificationImage.java
View File

@@ -7,7 +7,6 @@ import it.integry.ems_model.annotation.SqlField;
import it.integry.ems_model.annotation.Table; import it.integry.ems_model.annotation.Table;
import it.integry.ems_model.base.EntityBase; import it.integry.ems_model.base.EntityBase;
import org.kie.api.definition.type.PropertyReactive; import org.kie.api.definition.type.PropertyReactive;
import it.integry.ems_model.annotation.FK;
@PropertyReactive @PropertyReactive
@Table(WtbNotificationImage.ENTITY) @Table(WtbNotificationImage.ENTITY)
@@ -22,7 +21,7 @@ public class WtbNotificationImage extends EntityBase {
private long notificationId; private long notificationId;
@PK @PK
@ImportFromParent(value = "id_attach", parentEntity = StbFilesAttached.class) @ImportFromParent(value = "idAttach", parentEntity = StbFilesAttached.class)
@SqlField(value = "attach_id", maxLength = 40, nullable = false) @SqlField(value = "attach_id", maxLength = 40, nullable = false)
private String attachId; private String attachId;