Merge branch 'master' of https://code-repo.d4science.org/D-Net/dhp-schemas
This commit is contained in:
commit
79eaae42ff
|
@ -155,6 +155,16 @@ public class Result extends OafEntity implements Serializable {
|
|||
|
||||
private Boolean publiclyFunded;
|
||||
|
||||
private String transformativeAgreement;
|
||||
|
||||
public String getTransformativeAgreement() {
|
||||
return transformativeAgreement;
|
||||
}
|
||||
|
||||
public void setTransformativeAgreement(String transformativeAgreement) {
|
||||
this.transformativeAgreement = transformativeAgreement;
|
||||
}
|
||||
|
||||
public Field<String> getProcessingchargeamount() {
|
||||
return processingchargeamount;
|
||||
}
|
||||
|
@ -770,6 +780,10 @@ public class Result extends OafEntity implements Serializable {
|
|||
processingchargecurrency = r.getProcessingchargecurrency();
|
||||
}
|
||||
|
||||
if (Objects.isNull(getTransformativeAgreement()) && Objects.nonNull(r.getTransformativeAgreement())) {
|
||||
setTransformativeAgreement(r.getTransformativeAgreement());
|
||||
}
|
||||
|
||||
eoscifguidelines = mergeLists(eoscifguidelines, r.getEoscifguidelines());
|
||||
|
||||
setIsGreen(mergeBooleanOR(getIsGreen(), r.getIsGreen()));
|
||||
|
|
Loading…
Reference in New Issue