From 7245ea9fcacdf722e23db5245050afc7600ce3cb Mon Sep 17 00:00:00 2001 From: Carlos Alberto Date: Sun, 3 Apr 2016 13:00:04 -0300 Subject: [PATCH] Implementação dos recursos de relatório --- cit-esi-api/src/main/java/br/com/centralit/esi/api/resource/model/ReportDataSource.java | 7 ++++++- cit-esi-api/src/main/java/br/com/centralit/esi/api/resource/model/ReportParameter.java | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/cit-esi-api/src/main/java/br/com/centralit/esi/api/resource/model/ReportDataSource.java b/cit-esi-api/src/main/java/br/com/centralit/esi/api/resource/model/ReportDataSource.java index 7ae7980..c79c274 100644 --- a/cit-esi-api/src/main/java/br/com/centralit/esi/api/resource/model/ReportDataSource.java +++ b/cit-esi-api/src/main/java/br/com/centralit/esi/api/resource/model/ReportDataSource.java @@ -62,7 +62,12 @@ public class ReportDataSource extends PersistentObject { @AttributeOverride(name="expressionType", column = @Column(name="expression_type")), @AttributeOverride(name="constant", column = @Column(name="expression_constant")), @AttributeOverride(name="scriptCode.script", column = @Column(name="expression_script")), - @AttributeOverride(name="scriptCode.engineType", column = @Column(name="expression_engineType")) + @AttributeOverride(name="scriptCode.engineType", column = @Column(name="expression_engineType")), + @AttributeOverride(name="variable.name", column = @Column(name="variable_name")), + @AttributeOverride(name="variable.description", column = @Column(name="variable_description")), + @AttributeOverride(name="variable.variableType", column = @Column(name="variable_variableType")), + @AttributeOverride(name="variable.className", column = @Column(name="variable_className")), + @AttributeOverride(name="variable.multiple", column = @Column(name="variable_multiple")) }) private ReportExpression expression; diff --git a/cit-esi-api/src/main/java/br/com/centralit/esi/api/resource/model/ReportParameter.java b/cit-esi-api/src/main/java/br/com/centralit/esi/api/resource/model/ReportParameter.java index 829c4b6..e726abe 100644 --- a/cit-esi-api/src/main/java/br/com/centralit/esi/api/resource/model/ReportParameter.java +++ b/cit-esi-api/src/main/java/br/com/centralit/esi/api/resource/model/ReportParameter.java @@ -62,7 +62,12 @@ public class ReportParameter extends PersistentObject { @AttributeOverride(name="expressionType", column = @Column(name="expression_type")), @AttributeOverride(name="constant", column = @Column(name="expression_constant")), @AttributeOverride(name="scriptCode.script", column = @Column(name="expression_script")), - @AttributeOverride(name="scriptCode.engineType", column = @Column(name="expression_engineType")) + @AttributeOverride(name="scriptCode.engineType", column = @Column(name="expression_engineType")), + @AttributeOverride(name="variable.name", column = @Column(name="variable_name")), + @AttributeOverride(name="variable.description", column = @Column(name="variable_description")), + @AttributeOverride(name="variable.variableType", column = @Column(name="variable_variableType")), + @AttributeOverride(name="variable.className", column = @Column(name="variable_className")), + @AttributeOverride(name="variable.multiple", column = @Column(name="variable_multiple")) }) private ReportExpression expression; -- libgit2 0.21.2