Commit 7245ea9fcacdf722e23db5245050afc7600ce3cb
1 parent
470a2361
Exists in
master
Implementação dos recursos de relatório
Showing
2 changed files
with
12 additions
and
2 deletions
Show diff stats
cit-esi-api/src/main/java/br/com/centralit/esi/api/resource/model/ReportDataSource.java
| @@ -62,7 +62,12 @@ public class ReportDataSource extends PersistentObject { | @@ -62,7 +62,12 @@ public class ReportDataSource extends PersistentObject { | ||
| 62 | @AttributeOverride(name="expressionType", column = @Column(name="expression_type")), | 62 | @AttributeOverride(name="expressionType", column = @Column(name="expression_type")), |
| 63 | @AttributeOverride(name="constant", column = @Column(name="expression_constant")), | 63 | @AttributeOverride(name="constant", column = @Column(name="expression_constant")), |
| 64 | @AttributeOverride(name="scriptCode.script", column = @Column(name="expression_script")), | 64 | @AttributeOverride(name="scriptCode.script", column = @Column(name="expression_script")), |
| 65 | - @AttributeOverride(name="scriptCode.engineType", column = @Column(name="expression_engineType")) | 65 | + @AttributeOverride(name="scriptCode.engineType", column = @Column(name="expression_engineType")), |
| 66 | + @AttributeOverride(name="variable.name", column = @Column(name="variable_name")), | ||
| 67 | + @AttributeOverride(name="variable.description", column = @Column(name="variable_description")), | ||
| 68 | + @AttributeOverride(name="variable.variableType", column = @Column(name="variable_variableType")), | ||
| 69 | + @AttributeOverride(name="variable.className", column = @Column(name="variable_className")), | ||
| 70 | + @AttributeOverride(name="variable.multiple", column = @Column(name="variable_multiple")) | ||
| 66 | }) | 71 | }) |
| 67 | private ReportExpression expression; | 72 | private ReportExpression expression; |
| 68 | 73 |
cit-esi-api/src/main/java/br/com/centralit/esi/api/resource/model/ReportParameter.java
| @@ -62,7 +62,12 @@ public class ReportParameter extends PersistentObject { | @@ -62,7 +62,12 @@ public class ReportParameter extends PersistentObject { | ||
| 62 | @AttributeOverride(name="expressionType", column = @Column(name="expression_type")), | 62 | @AttributeOverride(name="expressionType", column = @Column(name="expression_type")), |
| 63 | @AttributeOverride(name="constant", column = @Column(name="expression_constant")), | 63 | @AttributeOverride(name="constant", column = @Column(name="expression_constant")), |
| 64 | @AttributeOverride(name="scriptCode.script", column = @Column(name="expression_script")), | 64 | @AttributeOverride(name="scriptCode.script", column = @Column(name="expression_script")), |
| 65 | - @AttributeOverride(name="scriptCode.engineType", column = @Column(name="expression_engineType")) | 65 | + @AttributeOverride(name="scriptCode.engineType", column = @Column(name="expression_engineType")), |
| 66 | + @AttributeOverride(name="variable.name", column = @Column(name="variable_name")), | ||
| 67 | + @AttributeOverride(name="variable.description", column = @Column(name="variable_description")), | ||
| 68 | + @AttributeOverride(name="variable.variableType", column = @Column(name="variable_variableType")), | ||
| 69 | + @AttributeOverride(name="variable.className", column = @Column(name="variable_className")), | ||
| 70 | + @AttributeOverride(name="variable.multiple", column = @Column(name="variable_multiple")) | ||
| 66 | }) | 71 | }) |
| 67 | private ReportExpression expression; | 72 | private ReportExpression expression; |
| 68 | 73 |