Skip to content
Snippets Groups Projects
Commit d5464d55 authored by Siiri Tann's avatar Siiri Tann
Browse files

Merge branch 'develop' into 'master'

Release: merge 'develop' into 'master' created by Siiri Tann

See merge request teis/proceedings-odata-service!9
parents 07821ca0 59bf83da
No related branches found
Tags 1.2.0
No related merge requests found
# Changelog
## [1.2.0] - 2021-05-31
* TEIS-2139: updates to ProceduralActInspectionTopicOdataEntity and ProceedingInspectionTopicOdataEntity
* TEIS-2064: added new fields to procedural act entity
* TEIS-2144: SupervisionPlanInspectionTopicODataEntity datatype fix
## [1.1.0] - 2021-03-08
* TEIS-2018: proceedings-service equivalent OData entity to ReadProceedingInspectionDocumentEntity
......
theGroup=ee.sm.ti.teis
theVersion=1.1.1
commonsVersion=1.21.0
theVersion=1.2.0
commonsVersion=1.25.0
pluginVersion=1.3.0
teiidVersion=1.6.0
package ee.sm.ti.teis.odata.proceduralact;
import ee.sm.ti.teis.servicecommon.common.AuditedEntity;
import ee.sm.ti.teis.types.enums.ObjectStatus;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.Setter;
import org.hibernate.annotations.Type;
import javax.persistence.*;
import java.util.UUID;
@Entity
@Getter
@Setter
@EqualsAndHashCode(callSuper = true)
@Table(name = "procedural_act_inspection_topic")
public class ProceduralActInspectionTopicODataEntity extends AuditedEntity {
@Id
@Type(type = "uuid-char")
private UUID id;
@Type(type = "uuid-char")
private UUID upperProceduralActInspectionTopicId;
@Type(type = "uuid-char")
private UUID proceduralActId;
private String inspectionTopicId;
private Integer inspectionTopicLevel;
private String inspectionTopicName;
@Column(length = Integer.MAX_VALUE)
private String inspectionTopicDescription;
private String inspectionTopicLegislationName;
private Long inspectionTopicSeqNo;
private String inspectionOutcome;
private String source;
@Enumerated(EnumType.STRING)
private ObjectStatus objectStatus;
}
......@@ -35,6 +35,9 @@ public class ProceduralActODataEntity extends AuditedEntity {
private String feedbackEmail;
private String status;
private boolean advanceNotice;
private boolean conductedAct;
@Column(length = Integer.MAX_VALUE)
private String reasonOfNotConductedAct;
@Enumerated(EnumType.STRING)
private ObjectStatus objectStatus;
}
package ee.sm.ti.teis.odata.proceeding;
import ee.sm.ti.teis.servicecommon.common.AuditedEntity;
import ee.sm.ti.teis.types.enums.ObjectStatus;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.Setter;
import org.hibernate.annotations.Type;
import javax.persistence.*;
import java.util.UUID;
@Entity
@Getter
@Setter
@EqualsAndHashCode(callSuper = true)
@Table(name = "proceeding_inspection_topic")
public class ProceedingInspectionTopicODataEntity extends AuditedEntity {
@Id
@Type(type = "uuid-char")
private UUID id;
@Type(type = "uuid-char")
private UUID proceedingId;
@Type(type = "uuid-char")
private UUID upperProceedingInspectionTopicId;
private String inspectionTopicId;
private Integer inspectionTopicLevel;
private String inspectionTopicName;
@Column(length = Integer.MAX_VALUE)
private String inspectionTopicDescription;
private Long inspectionTopicSeqNo;
private String source;
@Enumerated(EnumType.STRING)
private ObjectStatus objectStatus;
}
......@@ -25,6 +25,7 @@ public class SupervisionPlanInspectionTopicODataEntity extends AuditedEntity {
private String inspectionTopicId;
private String upperSupervisionPlanInspectionTopicId;
private String inspectionTopicName;
@Column(length = Integer.MAX_VALUE)
private String inspectionTopicDescription;
private Integer inspectionTopicLevel;
private Long inspectionTopicSeqNo;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment