added merge forh2020topiccode and h2020topicdescription. Removed merge for funded amount.
This commit is contained in:
parent
627b57575e
commit
e723513fac
|
@ -1,6 +1,8 @@
|
||||||
|
|
||||||
package eu.dnetlib.dhp.schema.oaf;
|
package eu.dnetlib.dhp.schema.oaf;
|
||||||
|
|
||||||
|
import org.apache.commons.lang3.StringUtils;
|
||||||
|
|
||||||
import java.io.Serializable;
|
import java.io.Serializable;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
|
@ -346,10 +348,15 @@ public class Project extends OafEntity implements Serializable {
|
||||||
: contactemail;
|
: contactemail;
|
||||||
summary = p.getSummary() != null && compareTrust(this, e) < 0 ? p.getSummary() : summary;
|
summary = p.getSummary() != null && compareTrust(this, e) < 0 ? p.getSummary() : summary;
|
||||||
currency = p.getCurrency() != null && compareTrust(this, e) < 0 ? p.getCurrency() : currency;
|
currency = p.getCurrency() != null && compareTrust(this, e) < 0 ? p.getCurrency() : currency;
|
||||||
totalcost = p.getTotalcost() != null && compareTrust(this, e) < 0 ? p.getTotalcost() : totalcost;
|
// totalcost = p.getTotalcost() != null && compareTrust(this, e) < 0 ? p.getTotalcost() : totalcost;
|
||||||
fundedamount = p.getFundedamount() != null && compareTrust(this, e) < 0
|
// fundedamount = p.getFundedamount() != null && compareTrust(this, e) < 0
|
||||||
? p.getFundedamount()
|
// ? p.getFundedamount()
|
||||||
: fundedamount;
|
// : fundedamount;
|
||||||
|
|
||||||
|
if (p.getH2020topiccode() != null && StringUtils.isEmpty(h2020topiccode)){
|
||||||
|
h2020topiccode = p.getH2020topiccode();
|
||||||
|
h2020topicdescription = p.getH2020topicdescription();
|
||||||
|
}
|
||||||
|
|
||||||
h2020classification = mergeLists(h2020classification, p.getH2020classification());
|
h2020classification = mergeLists(h2020classification, p.getH2020classification());
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue