Merge branch 'jhipster-generated'
This commit is contained in:
@ -28,8 +28,12 @@ public class Asset implements Serializable {
|
||||
private Long id;
|
||||
|
||||
@NotNull
|
||||
@Column(name = "jhi_date", nullable = false)
|
||||
private LocalDate date;
|
||||
@Column(name = "document_date", nullable = false)
|
||||
private LocalDate documentDate;
|
||||
|
||||
@NotNull
|
||||
@Column(name = "value_date", nullable = false)
|
||||
private LocalDate valueDate;
|
||||
|
||||
@NotNull
|
||||
@Enumerated(EnumType.STRING)
|
||||
@ -41,8 +45,8 @@ public class Asset implements Serializable {
|
||||
private BigDecimal amount;
|
||||
|
||||
@Size(max = 160)
|
||||
@Column(name = "jhi_comment", length = 160)
|
||||
private String comment;
|
||||
@Column(name = "remark", length = 160)
|
||||
private String remark;
|
||||
|
||||
@NotNull
|
||||
@ManyToOne(optional = false)
|
||||
@ -58,17 +62,30 @@ public class Asset implements Serializable {
|
||||
this.id = id;
|
||||
}
|
||||
|
||||
public LocalDate getDate() {
|
||||
return date;
|
||||
public LocalDate getDocumentDate() {
|
||||
return documentDate;
|
||||
}
|
||||
|
||||
public Asset date(LocalDate date) {
|
||||
this.date = date;
|
||||
public Asset documentDate(LocalDate documentDate) {
|
||||
this.documentDate = documentDate;
|
||||
return this;
|
||||
}
|
||||
|
||||
public void setDate(LocalDate date) {
|
||||
this.date = date;
|
||||
public void setDocumentDate(LocalDate documentDate) {
|
||||
this.documentDate = documentDate;
|
||||
}
|
||||
|
||||
public LocalDate getValueDate() {
|
||||
return valueDate;
|
||||
}
|
||||
|
||||
public Asset valueDate(LocalDate valueDate) {
|
||||
this.valueDate = valueDate;
|
||||
return this;
|
||||
}
|
||||
|
||||
public void setValueDate(LocalDate valueDate) {
|
||||
this.valueDate = valueDate;
|
||||
}
|
||||
|
||||
public AssetAction getAction() {
|
||||
@ -97,17 +114,17 @@ public class Asset implements Serializable {
|
||||
this.amount = amount;
|
||||
}
|
||||
|
||||
public String getComment() {
|
||||
return comment;
|
||||
public String getRemark() {
|
||||
return remark;
|
||||
}
|
||||
|
||||
public Asset comment(String comment) {
|
||||
this.comment = comment;
|
||||
public Asset remark(String remark) {
|
||||
this.remark = remark;
|
||||
return this;
|
||||
}
|
||||
|
||||
public void setComment(String comment) {
|
||||
this.comment = comment;
|
||||
public void setRemark(String remark) {
|
||||
this.remark = remark;
|
||||
}
|
||||
|
||||
public Membership getMembership() {
|
||||
@ -148,10 +165,11 @@ public class Asset implements Serializable {
|
||||
public String toString() {
|
||||
return "Asset{" +
|
||||
"id=" + getId() +
|
||||
", date='" + getDate() + "'" +
|
||||
", documentDate='" + getDocumentDate() + "'" +
|
||||
", valueDate='" + getValueDate() + "'" +
|
||||
", action='" + getAction() + "'" +
|
||||
", amount=" + getAmount() +
|
||||
", comment='" + getComment() + "'" +
|
||||
", remark='" + getRemark() + "'" +
|
||||
"}";
|
||||
}
|
||||
}
|
||||
|
@ -28,12 +28,13 @@ public class Customer implements Serializable {
|
||||
@NotNull
|
||||
@Min(value = 10000)
|
||||
@Max(value = 99999)
|
||||
@Column(name = "jhi_number", nullable = false, unique = true)
|
||||
private Integer number;
|
||||
@Column(name = "reference", nullable = false, unique = true)
|
||||
private Integer reference;
|
||||
|
||||
@NotNull
|
||||
@Size(max = 3)
|
||||
@Pattern(regexp = "[a-z][a-z0-9]+")
|
||||
@Column(name = "prefix", nullable = false, unique = true)
|
||||
@Column(name = "prefix", length = 3, nullable = false, unique = true)
|
||||
private String prefix;
|
||||
|
||||
@NotNull
|
||||
@ -58,12 +59,14 @@ public class Customer implements Serializable {
|
||||
@Column(name = "billing_address", length = 400)
|
||||
private String billingAddress;
|
||||
|
||||
@Size(max = 160)
|
||||
@Column(name = "remark", length = 160)
|
||||
private String remark;
|
||||
|
||||
@OneToMany(mappedBy = "customer")
|
||||
private Set<Membership> memberships = new HashSet<>();
|
||||
|
||||
@OneToMany(mappedBy = "customer")
|
||||
private Set<SepaMandate> sepamandates = new HashSet<>();
|
||||
|
||||
// jhipster-needle-entity-add-field - JHipster will add fields here, do not remove
|
||||
public Long getId() {
|
||||
return id;
|
||||
@ -73,17 +76,17 @@ public class Customer implements Serializable {
|
||||
this.id = id;
|
||||
}
|
||||
|
||||
public Integer getNumber() {
|
||||
return number;
|
||||
public Integer getReference() {
|
||||
return reference;
|
||||
}
|
||||
|
||||
public Customer number(Integer number) {
|
||||
this.number = number;
|
||||
public Customer reference(Integer reference) {
|
||||
this.reference = reference;
|
||||
return this;
|
||||
}
|
||||
|
||||
public void setNumber(Integer number) {
|
||||
this.number = number;
|
||||
public void setReference(Integer reference) {
|
||||
this.reference = reference;
|
||||
}
|
||||
|
||||
public String getPrefix() {
|
||||
@ -164,6 +167,19 @@ public class Customer implements Serializable {
|
||||
this.billingAddress = billingAddress;
|
||||
}
|
||||
|
||||
public String getRemark() {
|
||||
return remark;
|
||||
}
|
||||
|
||||
public Customer remark(String remark) {
|
||||
this.remark = remark;
|
||||
return this;
|
||||
}
|
||||
|
||||
public void setRemark(String remark) {
|
||||
this.remark = remark;
|
||||
}
|
||||
|
||||
public Set<Membership> getMemberships() {
|
||||
return memberships;
|
||||
}
|
||||
@ -239,13 +255,14 @@ public class Customer implements Serializable {
|
||||
public String toString() {
|
||||
return "Customer{" +
|
||||
"id=" + getId() +
|
||||
", number=" + getNumber() +
|
||||
", reference=" + getReference() +
|
||||
", prefix='" + getPrefix() + "'" +
|
||||
", name='" + getName() + "'" +
|
||||
", contractualSalutation='" + getContractualSalutation() + "'" +
|
||||
", contractualAddress='" + getContractualAddress() + "'" +
|
||||
", billingSalutation='" + getBillingSalutation() + "'" +
|
||||
", billingAddress='" + getBillingAddress() + "'" +
|
||||
", remark='" + getRemark() + "'" +
|
||||
"}";
|
||||
}
|
||||
}
|
||||
|
@ -30,22 +30,16 @@ public class Membership implements Serializable {
|
||||
private Long id;
|
||||
|
||||
@NotNull
|
||||
@Column(name = "jhi_from", nullable = false)
|
||||
private LocalDate from;
|
||||
@Column(name = "since_date", nullable = false)
|
||||
private LocalDate sinceDate;
|
||||
|
||||
@Column(name = "jhi_to")
|
||||
private LocalDate to;
|
||||
@Column(name = "until_date")
|
||||
private LocalDate untilDate;
|
||||
|
||||
@Size(max = 160)
|
||||
@Column(name = "jhi_comment", length = 160)
|
||||
private String comment;
|
||||
|
||||
@OneToMany(mappedBy = "membership")
|
||||
@OneToMany(mappedBy = "member")
|
||||
private Set<Share> shares = new HashSet<>();
|
||||
|
||||
@OneToMany(mappedBy = "membership")
|
||||
@OneToMany(mappedBy = "member")
|
||||
private Set<Asset> assets = new HashSet<>();
|
||||
|
||||
@ManyToOne(optional = false)
|
||||
@NotNull
|
||||
@JsonIgnoreProperties("memberships")
|
||||
@ -60,43 +54,30 @@ public class Membership implements Serializable {
|
||||
this.id = id;
|
||||
}
|
||||
|
||||
public LocalDate getFrom() {
|
||||
return from;
|
||||
public LocalDate getSinceDate() {
|
||||
return sinceDate;
|
||||
}
|
||||
|
||||
public Membership from(LocalDate from) {
|
||||
this.from = from;
|
||||
public Membership sinceDate(LocalDate sinceDate) {
|
||||
this.sinceDate = sinceDate;
|
||||
return this;
|
||||
}
|
||||
|
||||
public void setFrom(LocalDate from) {
|
||||
this.from = from;
|
||||
public void setSinceDate(LocalDate sinceDate) {
|
||||
this.sinceDate = sinceDate;
|
||||
}
|
||||
|
||||
public LocalDate getTo() {
|
||||
return to;
|
||||
public LocalDate getUntilDate() {
|
||||
return untilDate;
|
||||
}
|
||||
|
||||
public Membership to(LocalDate to) {
|
||||
this.to = to;
|
||||
public Membership untilDate(LocalDate untilDate) {
|
||||
this.untilDate = untilDate;
|
||||
return this;
|
||||
}
|
||||
|
||||
public void setTo(LocalDate to) {
|
||||
this.to = to;
|
||||
}
|
||||
|
||||
public String getComment() {
|
||||
return comment;
|
||||
}
|
||||
|
||||
public Membership comment(String comment) {
|
||||
this.comment = comment;
|
||||
return this;
|
||||
}
|
||||
|
||||
public void setComment(String comment) {
|
||||
this.comment = comment;
|
||||
public void setUntilDate(LocalDate untilDate) {
|
||||
this.untilDate = untilDate;
|
||||
}
|
||||
|
||||
public Set<Share> getShares() {
|
||||
@ -187,9 +168,8 @@ public class Membership implements Serializable {
|
||||
public String toString() {
|
||||
return "Membership{" +
|
||||
"id=" + getId() +
|
||||
", from='" + getFrom() + "'" +
|
||||
", to='" + getTo() + "'" +
|
||||
", comment='" + getComment() + "'" +
|
||||
", sinceDate='" + getSinceDate() + "'" +
|
||||
", untilDate='" + getUntilDate() + "'" +
|
||||
"}";
|
||||
}
|
||||
}
|
||||
|
@ -38,25 +38,25 @@ public class SepaMandate implements Serializable {
|
||||
private String bic;
|
||||
|
||||
@NotNull
|
||||
@Column(name = "created", nullable = false)
|
||||
private LocalDate created;
|
||||
@Column(name = "document_date", nullable = false)
|
||||
private LocalDate documentDate;
|
||||
|
||||
@NotNull
|
||||
@Column(name = "valid_from", nullable = false)
|
||||
private LocalDate validFrom;
|
||||
|
||||
@Column(name = "valid_to")
|
||||
private LocalDate validTo;
|
||||
@Column(name = "valid_until")
|
||||
private LocalDate validUntil;
|
||||
|
||||
@Column(name = "last_used")
|
||||
private LocalDate lastUsed;
|
||||
|
||||
@Column(name = "cancelled")
|
||||
private LocalDate cancelled;
|
||||
@Column(name = "cancellation_date")
|
||||
private LocalDate cancellationDate;
|
||||
|
||||
@Size(max = 160)
|
||||
@Column(name = "jhi_comment", length = 160)
|
||||
private String comment;
|
||||
@Column(name = "remark", length = 160)
|
||||
private String remark;
|
||||
|
||||
@ManyToOne(optional = false)
|
||||
@NotNull
|
||||
@ -111,17 +111,17 @@ public class SepaMandate implements Serializable {
|
||||
this.bic = bic;
|
||||
}
|
||||
|
||||
public LocalDate getCreated() {
|
||||
return created;
|
||||
public LocalDate getDocumentDate() {
|
||||
return documentDate;
|
||||
}
|
||||
|
||||
public SepaMandate created(LocalDate created) {
|
||||
this.created = created;
|
||||
public SepaMandate documentDate(LocalDate documentDate) {
|
||||
this.documentDate = documentDate;
|
||||
return this;
|
||||
}
|
||||
|
||||
public void setCreated(LocalDate created) {
|
||||
this.created = created;
|
||||
public void setDocumentDate(LocalDate documentDate) {
|
||||
this.documentDate = documentDate;
|
||||
}
|
||||
|
||||
public LocalDate getValidFrom() {
|
||||
@ -137,17 +137,17 @@ public class SepaMandate implements Serializable {
|
||||
this.validFrom = validFrom;
|
||||
}
|
||||
|
||||
public LocalDate getValidTo() {
|
||||
return validTo;
|
||||
public LocalDate getValidUntil() {
|
||||
return validUntil;
|
||||
}
|
||||
|
||||
public SepaMandate validTo(LocalDate validTo) {
|
||||
this.validTo = validTo;
|
||||
public SepaMandate validUntil(LocalDate validUntil) {
|
||||
this.validUntil = validUntil;
|
||||
return this;
|
||||
}
|
||||
|
||||
public void setValidTo(LocalDate validTo) {
|
||||
this.validTo = validTo;
|
||||
public void setValidUntil(LocalDate validUntil) {
|
||||
this.validUntil = validUntil;
|
||||
}
|
||||
|
||||
public LocalDate getLastUsed() {
|
||||
@ -163,30 +163,30 @@ public class SepaMandate implements Serializable {
|
||||
this.lastUsed = lastUsed;
|
||||
}
|
||||
|
||||
public LocalDate getCancelled() {
|
||||
return cancelled;
|
||||
public LocalDate getCancellationDate() {
|
||||
return cancellationDate;
|
||||
}
|
||||
|
||||
public SepaMandate cancelled(LocalDate cancelled) {
|
||||
this.cancelled = cancelled;
|
||||
public SepaMandate cancellationDate(LocalDate cancellationDate) {
|
||||
this.cancellationDate = cancellationDate;
|
||||
return this;
|
||||
}
|
||||
|
||||
public void setCancelled(LocalDate cancelled) {
|
||||
this.cancelled = cancelled;
|
||||
public void setCancellationDate(LocalDate cancellationDate) {
|
||||
this.cancellationDate = cancellationDate;
|
||||
}
|
||||
|
||||
public String getComment() {
|
||||
return comment;
|
||||
public String getRemark() {
|
||||
return remark;
|
||||
}
|
||||
|
||||
public SepaMandate comment(String comment) {
|
||||
this.comment = comment;
|
||||
public SepaMandate remark(String remark) {
|
||||
this.remark = remark;
|
||||
return this;
|
||||
}
|
||||
|
||||
public void setComment(String comment) {
|
||||
this.comment = comment;
|
||||
public void setRemark(String remark) {
|
||||
this.remark = remark;
|
||||
}
|
||||
|
||||
public Customer getCustomer() {
|
||||
@ -230,12 +230,12 @@ public class SepaMandate implements Serializable {
|
||||
", reference='" + getReference() + "'" +
|
||||
", iban='" + getIban() + "'" +
|
||||
", bic='" + getBic() + "'" +
|
||||
", created='" + getCreated() + "'" +
|
||||
", documentDate='" + getDocumentDate() + "'" +
|
||||
", validFrom='" + getValidFrom() + "'" +
|
||||
", validTo='" + getValidTo() + "'" +
|
||||
", validUntil='" + getValidUntil() + "'" +
|
||||
", lastUsed='" + getLastUsed() + "'" +
|
||||
", cancelled='" + getCancelled() + "'" +
|
||||
", comment='" + getComment() + "'" +
|
||||
", cancellationDate='" + getCancellationDate() + "'" +
|
||||
", remark='" + getRemark() + "'" +
|
||||
"}";
|
||||
}
|
||||
}
|
||||
|
@ -29,8 +29,12 @@ public class Share implements Serializable {
|
||||
private Long id;
|
||||
|
||||
@NotNull
|
||||
@Column(name = "jhi_date", nullable = false)
|
||||
private LocalDate date;
|
||||
@Column(name = "document_date", nullable = false)
|
||||
private LocalDate documentDate;
|
||||
|
||||
@NotNull
|
||||
@Column(name = "value_date", nullable = false)
|
||||
private LocalDate valueDate;
|
||||
|
||||
@NotNull
|
||||
@Enumerated(EnumType.STRING)
|
||||
@ -42,8 +46,8 @@ public class Share implements Serializable {
|
||||
private Integer quantity;
|
||||
|
||||
@Size(max = 160)
|
||||
@Column(name = "jhi_comment", length = 160)
|
||||
private String comment;
|
||||
@Column(name = "remark", length = 160)
|
||||
private String remark;
|
||||
|
||||
@NotNull
|
||||
@ManyToOne(optional = false)
|
||||
@ -59,17 +63,30 @@ public class Share implements Serializable {
|
||||
this.id = id;
|
||||
}
|
||||
|
||||
public LocalDate getDate() {
|
||||
return date;
|
||||
public LocalDate getDocumentDate() {
|
||||
return documentDate;
|
||||
}
|
||||
|
||||
public Share date(LocalDate date) {
|
||||
this.date = date;
|
||||
public Share documentDate(LocalDate documentDate) {
|
||||
this.documentDate = documentDate;
|
||||
return this;
|
||||
}
|
||||
|
||||
public void setDate(LocalDate date) {
|
||||
this.date = date;
|
||||
public void setDocumentDate(LocalDate documentDate) {
|
||||
this.documentDate = documentDate;
|
||||
}
|
||||
|
||||
public LocalDate getValueDate() {
|
||||
return valueDate;
|
||||
}
|
||||
|
||||
public Share valueDate(LocalDate valueDate) {
|
||||
this.valueDate = valueDate;
|
||||
return this;
|
||||
}
|
||||
|
||||
public void setValueDate(LocalDate valueDate) {
|
||||
this.valueDate = valueDate;
|
||||
}
|
||||
|
||||
public ShareAction getAction() {
|
||||
@ -98,17 +115,17 @@ public class Share implements Serializable {
|
||||
this.quantity = quantity;
|
||||
}
|
||||
|
||||
public String getComment() {
|
||||
return comment;
|
||||
public String getRemark() {
|
||||
return remark;
|
||||
}
|
||||
|
||||
public Share comment(String comment) {
|
||||
this.comment = comment;
|
||||
public Share remark(String remark) {
|
||||
this.remark = remark;
|
||||
return this;
|
||||
}
|
||||
|
||||
public void setComment(String comment) {
|
||||
this.comment = comment;
|
||||
public void setRemark(String remark) {
|
||||
this.remark = remark;
|
||||
}
|
||||
|
||||
public Membership getMembership() {
|
||||
@ -149,10 +166,11 @@ public class Share implements Serializable {
|
||||
public String toString() {
|
||||
return "Share{" +
|
||||
"id=" + getId() +
|
||||
", date='" + getDate() + "'" +
|
||||
", documentDate='" + getDocumentDate() + "'" +
|
||||
", valueDate='" + getValueDate() + "'" +
|
||||
", action='" + getAction() + "'" +
|
||||
", quantity=" + getQuantity() +
|
||||
", comment='" + getComment() + "'" +
|
||||
", remark='" + getRemark() + "'" +
|
||||
"}";
|
||||
}
|
||||
}
|
||||
|
@ -89,8 +89,11 @@ public class AssetQueryService extends QueryService<Asset> {
|
||||
if (criteria.getId() != null) {
|
||||
specification = specification.and(buildSpecification(criteria.getId(), Asset_.id));
|
||||
}
|
||||
if (criteria.getDate() != null) {
|
||||
specification = specification.and(buildRangeSpecification(criteria.getDate(), Asset_.date));
|
||||
if (criteria.getDocumentDate() != null) {
|
||||
specification = specification.and(buildRangeSpecification(criteria.getDocumentDate(), Asset_.documentDate));
|
||||
}
|
||||
if (criteria.getValueDate() != null) {
|
||||
specification = specification.and(buildRangeSpecification(criteria.getValueDate(), Asset_.valueDate));
|
||||
}
|
||||
if (criteria.getAction() != null) {
|
||||
specification = specification.and(buildSpecification(criteria.getAction(), Asset_.action));
|
||||
@ -98,8 +101,8 @@ public class AssetQueryService extends QueryService<Asset> {
|
||||
if (criteria.getAmount() != null) {
|
||||
specification = specification.and(buildRangeSpecification(criteria.getAmount(), Asset_.amount));
|
||||
}
|
||||
if (criteria.getComment() != null) {
|
||||
specification = specification.and(buildStringSpecification(criteria.getComment(), Asset_.comment));
|
||||
if (criteria.getRemark() != null) {
|
||||
specification = specification.and(buildStringSpecification(criteria.getRemark(), Asset_.remark));
|
||||
}
|
||||
if (criteria.getMembershipId() != null) {
|
||||
specification = specification.and(buildSpecification(criteria.getMembershipId(),
|
||||
|
@ -89,8 +89,8 @@ public class CustomerQueryService extends QueryService<Customer> {
|
||||
if (criteria.getId() != null) {
|
||||
specification = specification.and(buildSpecification(criteria.getId(), Customer_.id));
|
||||
}
|
||||
if (criteria.getNumber() != null) {
|
||||
specification = specification.and(buildRangeSpecification(criteria.getNumber(), Customer_.number));
|
||||
if (criteria.getReference() != null) {
|
||||
specification = specification.and(buildRangeSpecification(criteria.getReference(), Customer_.reference));
|
||||
}
|
||||
if (criteria.getPrefix() != null) {
|
||||
specification = specification.and(buildStringSpecification(criteria.getPrefix(), Customer_.prefix));
|
||||
@ -110,6 +110,9 @@ public class CustomerQueryService extends QueryService<Customer> {
|
||||
if (criteria.getBillingAddress() != null) {
|
||||
specification = specification.and(buildStringSpecification(criteria.getBillingAddress(), Customer_.billingAddress));
|
||||
}
|
||||
if (criteria.getRemark() != null) {
|
||||
specification = specification.and(buildStringSpecification(criteria.getRemark(), Customer_.remark));
|
||||
}
|
||||
if (criteria.getMembershipId() != null) {
|
||||
specification = specification.and(buildSpecification(criteria.getMembershipId(),
|
||||
root -> root.join(Customer_.memberships, JoinType.LEFT).get(Membership_.id)));
|
||||
|
@ -89,14 +89,17 @@ public class MembershipQueryService extends QueryService<Membership> {
|
||||
if (criteria.getId() != null) {
|
||||
specification = specification.and(buildSpecification(criteria.getId(), Membership_.id));
|
||||
}
|
||||
if (criteria.getFrom() != null) {
|
||||
specification = specification.and(buildRangeSpecification(criteria.getFrom(), Membership_.from));
|
||||
if (criteria.getDocumentDate() != null) {
|
||||
specification = specification.and(buildRangeSpecification(criteria.getDocumentDate(), Membership_.documentDate));
|
||||
}
|
||||
if (criteria.getTo() != null) {
|
||||
specification = specification.and(buildRangeSpecification(criteria.getTo(), Membership_.to));
|
||||
if (criteria.getMemberFrom() != null) {
|
||||
specification = specification.and(buildRangeSpecification(criteria.getMemberFrom(), Membership_.memberFrom));
|
||||
}
|
||||
if (criteria.getComment() != null) {
|
||||
specification = specification.and(buildStringSpecification(criteria.getComment(), Membership_.comment));
|
||||
if (criteria.getMemberUntil() != null) {
|
||||
specification = specification.and(buildRangeSpecification(criteria.getMemberUntil(), Membership_.memberUntil));
|
||||
}
|
||||
if (criteria.getRemark() != null) {
|
||||
specification = specification.and(buildStringSpecification(criteria.getRemark(), Membership_.remark));
|
||||
}
|
||||
if (criteria.getShareId() != null) {
|
||||
specification = specification.and(buildSpecification(criteria.getShareId(),
|
||||
|
@ -98,23 +98,23 @@ public class SepaMandateQueryService extends QueryService<SepaMandate> {
|
||||
if (criteria.getBic() != null) {
|
||||
specification = specification.and(buildStringSpecification(criteria.getBic(), SepaMandate_.bic));
|
||||
}
|
||||
if (criteria.getCreated() != null) {
|
||||
specification = specification.and(buildRangeSpecification(criteria.getCreated(), SepaMandate_.created));
|
||||
if (criteria.getDocumentDate() != null) {
|
||||
specification = specification.and(buildRangeSpecification(criteria.getDocumentDate(), SepaMandate_.documentDate));
|
||||
}
|
||||
if (criteria.getValidFrom() != null) {
|
||||
specification = specification.and(buildRangeSpecification(criteria.getValidFrom(), SepaMandate_.validFrom));
|
||||
}
|
||||
if (criteria.getValidTo() != null) {
|
||||
specification = specification.and(buildRangeSpecification(criteria.getValidTo(), SepaMandate_.validTo));
|
||||
if (criteria.getValidUntil() != null) {
|
||||
specification = specification.and(buildRangeSpecification(criteria.getValidUntil(), SepaMandate_.validUntil));
|
||||
}
|
||||
if (criteria.getLastUsed() != null) {
|
||||
specification = specification.and(buildRangeSpecification(criteria.getLastUsed(), SepaMandate_.lastUsed));
|
||||
}
|
||||
if (criteria.getCancelled() != null) {
|
||||
specification = specification.and(buildRangeSpecification(criteria.getCancelled(), SepaMandate_.cancelled));
|
||||
if (criteria.getCancellationDate() != null) {
|
||||
specification = specification.and(buildRangeSpecification(criteria.getCancellationDate(), SepaMandate_.cancellationDate));
|
||||
}
|
||||
if (criteria.getComment() != null) {
|
||||
specification = specification.and(buildStringSpecification(criteria.getComment(), SepaMandate_.comment));
|
||||
if (criteria.getRemark() != null) {
|
||||
specification = specification.and(buildStringSpecification(criteria.getRemark(), SepaMandate_.remark));
|
||||
}
|
||||
if (criteria.getCustomerId() != null) {
|
||||
specification = specification.and(buildSpecification(criteria.getCustomerId(),
|
||||
|
@ -89,8 +89,11 @@ public class ShareQueryService extends QueryService<Share> {
|
||||
if (criteria.getId() != null) {
|
||||
specification = specification.and(buildSpecification(criteria.getId(), Share_.id));
|
||||
}
|
||||
if (criteria.getDate() != null) {
|
||||
specification = specification.and(buildRangeSpecification(criteria.getDate(), Share_.date));
|
||||
if (criteria.getDocumentDate() != null) {
|
||||
specification = specification.and(buildRangeSpecification(criteria.getDocumentDate(), Share_.documentDate));
|
||||
}
|
||||
if (criteria.getValueDate() != null) {
|
||||
specification = specification.and(buildRangeSpecification(criteria.getValueDate(), Share_.valueDate));
|
||||
}
|
||||
if (criteria.getAction() != null) {
|
||||
specification = specification.and(buildSpecification(criteria.getAction(), Share_.action));
|
||||
@ -98,8 +101,8 @@ public class ShareQueryService extends QueryService<Share> {
|
||||
if (criteria.getQuantity() != null) {
|
||||
specification = specification.and(buildRangeSpecification(criteria.getQuantity(), Share_.quantity));
|
||||
}
|
||||
if (criteria.getComment() != null) {
|
||||
specification = specification.and(buildStringSpecification(criteria.getComment(), Share_.comment));
|
||||
if (criteria.getRemark() != null) {
|
||||
specification = specification.and(buildStringSpecification(criteria.getRemark(), Share_.remark));
|
||||
}
|
||||
if (criteria.getMembershipId() != null) {
|
||||
specification = specification.and(buildSpecification(criteria.getMembershipId(),
|
||||
|
@ -32,13 +32,15 @@ public class AssetCriteria implements Serializable {
|
||||
|
||||
private LongFilter id;
|
||||
|
||||
private LocalDateFilter date;
|
||||
private LocalDateFilter documentDate;
|
||||
|
||||
private LocalDateFilter valueDate;
|
||||
|
||||
private AssetActionFilter action;
|
||||
|
||||
private BigDecimalFilter amount;
|
||||
|
||||
private StringFilter comment;
|
||||
private StringFilter remark;
|
||||
|
||||
private LongFilter membershipId;
|
||||
|
||||
@ -50,12 +52,20 @@ public class AssetCriteria implements Serializable {
|
||||
this.id = id;
|
||||
}
|
||||
|
||||
public LocalDateFilter getDate() {
|
||||
return date;
|
||||
public LocalDateFilter getDocumentDate() {
|
||||
return documentDate;
|
||||
}
|
||||
|
||||
public void setDate(LocalDateFilter date) {
|
||||
this.date = date;
|
||||
public void setDocumentDate(LocalDateFilter documentDate) {
|
||||
this.documentDate = documentDate;
|
||||
}
|
||||
|
||||
public LocalDateFilter getValueDate() {
|
||||
return valueDate;
|
||||
}
|
||||
|
||||
public void setValueDate(LocalDateFilter valueDate) {
|
||||
this.valueDate = valueDate;
|
||||
}
|
||||
|
||||
public AssetActionFilter getAction() {
|
||||
@ -74,12 +84,12 @@ public class AssetCriteria implements Serializable {
|
||||
this.amount = amount;
|
||||
}
|
||||
|
||||
public StringFilter getComment() {
|
||||
return comment;
|
||||
public StringFilter getRemark() {
|
||||
return remark;
|
||||
}
|
||||
|
||||
public void setComment(StringFilter comment) {
|
||||
this.comment = comment;
|
||||
public void setRemark(StringFilter remark) {
|
||||
this.remark = remark;
|
||||
}
|
||||
|
||||
public LongFilter getMembershipId() {
|
||||
@ -102,10 +112,11 @@ public class AssetCriteria implements Serializable {
|
||||
final AssetCriteria that = (AssetCriteria) o;
|
||||
return
|
||||
Objects.equals(id, that.id) &&
|
||||
Objects.equals(date, that.date) &&
|
||||
Objects.equals(documentDate, that.documentDate) &&
|
||||
Objects.equals(valueDate, that.valueDate) &&
|
||||
Objects.equals(action, that.action) &&
|
||||
Objects.equals(amount, that.amount) &&
|
||||
Objects.equals(comment, that.comment) &&
|
||||
Objects.equals(remark, that.remark) &&
|
||||
Objects.equals(membershipId, that.membershipId);
|
||||
}
|
||||
|
||||
@ -113,10 +124,11 @@ public class AssetCriteria implements Serializable {
|
||||
public int hashCode() {
|
||||
return Objects.hash(
|
||||
id,
|
||||
date,
|
||||
documentDate,
|
||||
valueDate,
|
||||
action,
|
||||
amount,
|
||||
comment,
|
||||
remark,
|
||||
membershipId
|
||||
);
|
||||
}
|
||||
@ -125,10 +137,11 @@ public class AssetCriteria implements Serializable {
|
||||
public String toString() {
|
||||
return "AssetCriteria{" +
|
||||
(id != null ? "id=" + id + ", " : "") +
|
||||
(date != null ? "date=" + date + ", " : "") +
|
||||
(documentDate != null ? "documentDate=" + documentDate + ", " : "") +
|
||||
(valueDate != null ? "valueDate=" + valueDate + ", " : "") +
|
||||
(action != null ? "action=" + action + ", " : "") +
|
||||
(amount != null ? "amount=" + amount + ", " : "") +
|
||||
(comment != null ? "comment=" + comment + ", " : "") +
|
||||
(remark != null ? "remark=" + remark + ", " : "") +
|
||||
(membershipId != null ? "membershipId=" + membershipId + ", " : "") +
|
||||
"}";
|
||||
}
|
||||
|
@ -14,7 +14,10 @@ public class AssetDTO implements Serializable {
|
||||
private Long id;
|
||||
|
||||
@NotNull
|
||||
private LocalDate date;
|
||||
private LocalDate documentDate;
|
||||
|
||||
@NotNull
|
||||
private LocalDate valueDate;
|
||||
|
||||
@NotNull
|
||||
private AssetAction action;
|
||||
@ -23,12 +26,12 @@ public class AssetDTO implements Serializable {
|
||||
private BigDecimal amount;
|
||||
|
||||
@Size(max = 160)
|
||||
private String comment;
|
||||
private String remark;
|
||||
|
||||
|
||||
private Long membershipId;
|
||||
|
||||
private String membershipFrom;
|
||||
private String membershipDocumentDate;
|
||||
|
||||
public Long getId() {
|
||||
return id;
|
||||
@ -38,12 +41,20 @@ public class AssetDTO implements Serializable {
|
||||
this.id = id;
|
||||
}
|
||||
|
||||
public LocalDate getDate() {
|
||||
return date;
|
||||
public LocalDate getDocumentDate() {
|
||||
return documentDate;
|
||||
}
|
||||
|
||||
public void setDate(LocalDate date) {
|
||||
this.date = date;
|
||||
public void setDocumentDate(LocalDate documentDate) {
|
||||
this.documentDate = documentDate;
|
||||
}
|
||||
|
||||
public LocalDate getValueDate() {
|
||||
return valueDate;
|
||||
}
|
||||
|
||||
public void setValueDate(LocalDate valueDate) {
|
||||
this.valueDate = valueDate;
|
||||
}
|
||||
|
||||
public AssetAction getAction() {
|
||||
@ -62,12 +73,12 @@ public class AssetDTO implements Serializable {
|
||||
this.amount = amount;
|
||||
}
|
||||
|
||||
public String getComment() {
|
||||
return comment;
|
||||
public String getRemark() {
|
||||
return remark;
|
||||
}
|
||||
|
||||
public void setComment(String comment) {
|
||||
this.comment = comment;
|
||||
public void setRemark(String remark) {
|
||||
this.remark = remark;
|
||||
}
|
||||
|
||||
public Long getMembershipId() {
|
||||
@ -78,12 +89,12 @@ public class AssetDTO implements Serializable {
|
||||
this.membershipId = membershipId;
|
||||
}
|
||||
|
||||
public String getMembershipFrom() {
|
||||
return membershipFrom;
|
||||
public String getMembershipDocumentDate() {
|
||||
return membershipDocumentDate;
|
||||
}
|
||||
|
||||
public void setMembershipFrom(String membershipFrom) {
|
||||
this.membershipFrom = membershipFrom;
|
||||
public void setMembershipDocumentDate(String membershipDocumentDate) {
|
||||
this.membershipDocumentDate = membershipDocumentDate;
|
||||
}
|
||||
|
||||
@Override
|
||||
@ -111,12 +122,13 @@ public class AssetDTO implements Serializable {
|
||||
public String toString() {
|
||||
return "AssetDTO{" +
|
||||
"id=" + getId() +
|
||||
", date='" + getDate() + "'" +
|
||||
", documentDate='" + getDocumentDate() + "'" +
|
||||
", valueDate='" + getValueDate() + "'" +
|
||||
", action='" + getAction() + "'" +
|
||||
", amount=" + getAmount() +
|
||||
", comment='" + getComment() + "'" +
|
||||
", remark='" + getRemark() + "'" +
|
||||
", membership=" + getMembershipId() +
|
||||
", membership='" + getMembershipFrom() + "'" +
|
||||
", membership='" + getMembershipDocumentDate() + "'" +
|
||||
"}";
|
||||
}
|
||||
}
|
||||
|
@ -2,7 +2,10 @@ package org.hostsharing.hsadminng.service.dto;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.util.Objects;
|
||||
import io.github.jhipster.service.filter.BooleanFilter;
|
||||
import io.github.jhipster.service.filter.DoubleFilter;
|
||||
import io.github.jhipster.service.filter.Filter;
|
||||
import io.github.jhipster.service.filter.FloatFilter;
|
||||
import io.github.jhipster.service.filter.IntegerFilter;
|
||||
import io.github.jhipster.service.filter.LongFilter;
|
||||
import io.github.jhipster.service.filter.StringFilter;
|
||||
@ -21,7 +24,7 @@ public class CustomerCriteria implements Serializable {
|
||||
|
||||
private LongFilter id;
|
||||
|
||||
private IntegerFilter number;
|
||||
private IntegerFilter reference;
|
||||
|
||||
private StringFilter prefix;
|
||||
|
||||
@ -35,6 +38,8 @@ public class CustomerCriteria implements Serializable {
|
||||
|
||||
private StringFilter billingAddress;
|
||||
|
||||
private StringFilter remark;
|
||||
|
||||
private LongFilter membershipId;
|
||||
|
||||
private LongFilter sepamandateId;
|
||||
@ -47,12 +52,12 @@ public class CustomerCriteria implements Serializable {
|
||||
this.id = id;
|
||||
}
|
||||
|
||||
public IntegerFilter getNumber() {
|
||||
return number;
|
||||
public IntegerFilter getReference() {
|
||||
return reference;
|
||||
}
|
||||
|
||||
public void setNumber(IntegerFilter number) {
|
||||
this.number = number;
|
||||
public void setReference(IntegerFilter reference) {
|
||||
this.reference = reference;
|
||||
}
|
||||
|
||||
public StringFilter getPrefix() {
|
||||
@ -103,6 +108,14 @@ public class CustomerCriteria implements Serializable {
|
||||
this.billingAddress = billingAddress;
|
||||
}
|
||||
|
||||
public StringFilter getRemark() {
|
||||
return remark;
|
||||
}
|
||||
|
||||
public void setRemark(StringFilter remark) {
|
||||
this.remark = remark;
|
||||
}
|
||||
|
||||
public LongFilter getMembershipId() {
|
||||
return membershipId;
|
||||
}
|
||||
@ -131,13 +144,14 @@ public class CustomerCriteria implements Serializable {
|
||||
final CustomerCriteria that = (CustomerCriteria) o;
|
||||
return
|
||||
Objects.equals(id, that.id) &&
|
||||
Objects.equals(number, that.number) &&
|
||||
Objects.equals(reference, that.reference) &&
|
||||
Objects.equals(prefix, that.prefix) &&
|
||||
Objects.equals(name, that.name) &&
|
||||
Objects.equals(contractualSalutation, that.contractualSalutation) &&
|
||||
Objects.equals(contractualAddress, that.contractualAddress) &&
|
||||
Objects.equals(billingSalutation, that.billingSalutation) &&
|
||||
Objects.equals(billingAddress, that.billingAddress) &&
|
||||
Objects.equals(remark, that.remark) &&
|
||||
Objects.equals(membershipId, that.membershipId) &&
|
||||
Objects.equals(sepamandateId, that.sepamandateId);
|
||||
}
|
||||
@ -146,13 +160,14 @@ public class CustomerCriteria implements Serializable {
|
||||
public int hashCode() {
|
||||
return Objects.hash(
|
||||
id,
|
||||
number,
|
||||
reference,
|
||||
prefix,
|
||||
name,
|
||||
contractualSalutation,
|
||||
contractualAddress,
|
||||
billingSalutation,
|
||||
billingAddress,
|
||||
remark,
|
||||
membershipId,
|
||||
sepamandateId
|
||||
);
|
||||
@ -162,13 +177,14 @@ public class CustomerCriteria implements Serializable {
|
||||
public String toString() {
|
||||
return "CustomerCriteria{" +
|
||||
(id != null ? "id=" + id + ", " : "") +
|
||||
(number != null ? "number=" + number + ", " : "") +
|
||||
(reference != null ? "reference=" + reference + ", " : "") +
|
||||
(prefix != null ? "prefix=" + prefix + ", " : "") +
|
||||
(name != null ? "name=" + name + ", " : "") +
|
||||
(contractualSalutation != null ? "contractualSalutation=" + contractualSalutation + ", " : "") +
|
||||
(contractualAddress != null ? "contractualAddress=" + contractualAddress + ", " : "") +
|
||||
(billingSalutation != null ? "billingSalutation=" + billingSalutation + ", " : "") +
|
||||
(billingAddress != null ? "billingAddress=" + billingAddress + ", " : "") +
|
||||
(remark != null ? "remark=" + remark + ", " : "") +
|
||||
(membershipId != null ? "membershipId=" + membershipId + ", " : "") +
|
||||
(sepamandateId != null ? "sepamandateId=" + sepamandateId + ", " : "") +
|
||||
"}";
|
||||
|
@ -13,9 +13,10 @@ public class CustomerDTO implements Serializable {
|
||||
@NotNull
|
||||
@Min(value = 10000)
|
||||
@Max(value = 99999)
|
||||
private Integer number;
|
||||
private Integer reference;
|
||||
|
||||
@NotNull
|
||||
@Size(max = 3)
|
||||
@Pattern(regexp = "[a-z][a-z0-9]+")
|
||||
private String prefix;
|
||||
|
||||
@ -36,6 +37,9 @@ public class CustomerDTO implements Serializable {
|
||||
@Size(max = 400)
|
||||
private String billingAddress;
|
||||
|
||||
@Size(max = 160)
|
||||
private String remark;
|
||||
|
||||
|
||||
public Long getId() {
|
||||
return id;
|
||||
@ -45,12 +49,12 @@ public class CustomerDTO implements Serializable {
|
||||
this.id = id;
|
||||
}
|
||||
|
||||
public Integer getNumber() {
|
||||
return number;
|
||||
public Integer getReference() {
|
||||
return reference;
|
||||
}
|
||||
|
||||
public void setNumber(Integer number) {
|
||||
this.number = number;
|
||||
public void setReference(Integer reference) {
|
||||
this.reference = reference;
|
||||
}
|
||||
|
||||
public String getPrefix() {
|
||||
@ -101,6 +105,14 @@ public class CustomerDTO implements Serializable {
|
||||
this.billingAddress = billingAddress;
|
||||
}
|
||||
|
||||
public String getRemark() {
|
||||
return remark;
|
||||
}
|
||||
|
||||
public void setRemark(String remark) {
|
||||
this.remark = remark;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean equals(Object o) {
|
||||
if (this == o) {
|
||||
@ -126,13 +138,14 @@ public class CustomerDTO implements Serializable {
|
||||
public String toString() {
|
||||
return "CustomerDTO{" +
|
||||
"id=" + getId() +
|
||||
", number=" + getNumber() +
|
||||
", reference=" + getReference() +
|
||||
", prefix='" + getPrefix() + "'" +
|
||||
", name='" + getName() + "'" +
|
||||
", contractualSalutation='" + getContractualSalutation() + "'" +
|
||||
", contractualAddress='" + getContractualAddress() + "'" +
|
||||
", billingSalutation='" + getBillingSalutation() + "'" +
|
||||
", billingAddress='" + getBillingAddress() + "'" +
|
||||
", remark='" + getRemark() + "'" +
|
||||
"}";
|
||||
}
|
||||
}
|
||||
|
@ -25,11 +25,13 @@ public class MembershipCriteria implements Serializable {
|
||||
|
||||
private LongFilter id;
|
||||
|
||||
private LocalDateFilter from;
|
||||
private LocalDateFilter documentDate;
|
||||
|
||||
private LocalDateFilter to;
|
||||
private LocalDateFilter memberFrom;
|
||||
|
||||
private StringFilter comment;
|
||||
private LocalDateFilter memberUntil;
|
||||
|
||||
private StringFilter remark;
|
||||
|
||||
private LongFilter shareId;
|
||||
|
||||
@ -45,28 +47,36 @@ public class MembershipCriteria implements Serializable {
|
||||
this.id = id;
|
||||
}
|
||||
|
||||
public LocalDateFilter getFrom() {
|
||||
return from;
|
||||
public LocalDateFilter getDocumentDate() {
|
||||
return documentDate;
|
||||
}
|
||||
|
||||
public void setFrom(LocalDateFilter from) {
|
||||
this.from = from;
|
||||
public void setDocumentDate(LocalDateFilter documentDate) {
|
||||
this.documentDate = documentDate;
|
||||
}
|
||||
|
||||
public LocalDateFilter getTo() {
|
||||
return to;
|
||||
public LocalDateFilter getMemberFrom() {
|
||||
return memberFrom;
|
||||
}
|
||||
|
||||
public void setTo(LocalDateFilter to) {
|
||||
this.to = to;
|
||||
public void setMemberFrom(LocalDateFilter memberFrom) {
|
||||
this.memberFrom = memberFrom;
|
||||
}
|
||||
|
||||
public StringFilter getComment() {
|
||||
return comment;
|
||||
public LocalDateFilter getMemberUntil() {
|
||||
return memberUntil;
|
||||
}
|
||||
|
||||
public void setComment(StringFilter comment) {
|
||||
this.comment = comment;
|
||||
public void setMemberUntil(LocalDateFilter memberUntil) {
|
||||
this.memberUntil = memberUntil;
|
||||
}
|
||||
|
||||
public StringFilter getRemark() {
|
||||
return remark;
|
||||
}
|
||||
|
||||
public void setRemark(StringFilter remark) {
|
||||
this.remark = remark;
|
||||
}
|
||||
|
||||
public LongFilter getShareId() {
|
||||
@ -105,9 +115,10 @@ public class MembershipCriteria implements Serializable {
|
||||
final MembershipCriteria that = (MembershipCriteria) o;
|
||||
return
|
||||
Objects.equals(id, that.id) &&
|
||||
Objects.equals(from, that.from) &&
|
||||
Objects.equals(to, that.to) &&
|
||||
Objects.equals(comment, that.comment) &&
|
||||
Objects.equals(documentDate, that.documentDate) &&
|
||||
Objects.equals(memberFrom, that.memberFrom) &&
|
||||
Objects.equals(memberUntil, that.memberUntil) &&
|
||||
Objects.equals(remark, that.remark) &&
|
||||
Objects.equals(shareId, that.shareId) &&
|
||||
Objects.equals(assetId, that.assetId) &&
|
||||
Objects.equals(customerId, that.customerId);
|
||||
@ -117,9 +128,10 @@ public class MembershipCriteria implements Serializable {
|
||||
public int hashCode() {
|
||||
return Objects.hash(
|
||||
id,
|
||||
from,
|
||||
to,
|
||||
comment,
|
||||
documentDate,
|
||||
memberFrom,
|
||||
memberUntil,
|
||||
remark,
|
||||
shareId,
|
||||
assetId,
|
||||
customerId
|
||||
@ -130,9 +142,10 @@ public class MembershipCriteria implements Serializable {
|
||||
public String toString() {
|
||||
return "MembershipCriteria{" +
|
||||
(id != null ? "id=" + id + ", " : "") +
|
||||
(from != null ? "from=" + from + ", " : "") +
|
||||
(to != null ? "to=" + to + ", " : "") +
|
||||
(comment != null ? "comment=" + comment + ", " : "") +
|
||||
(documentDate != null ? "documentDate=" + documentDate + ", " : "") +
|
||||
(memberFrom != null ? "memberFrom=" + memberFrom + ", " : "") +
|
||||
(memberUntil != null ? "memberUntil=" + memberUntil + ", " : "") +
|
||||
(remark != null ? "remark=" + remark + ", " : "") +
|
||||
(shareId != null ? "shareId=" + shareId + ", " : "") +
|
||||
(assetId != null ? "assetId=" + assetId + ", " : "") +
|
||||
(customerId != null ? "customerId=" + customerId + ", " : "") +
|
||||
|
@ -1,11 +1,8 @@
|
||||
package org.hostsharing.hsadminng.service.dto;
|
||||
|
||||
import javax.validation.constraints.NotNull;
|
||||
import javax.validation.constraints.Size;
|
||||
import java.io.Serializable;
|
||||
import java.time.LocalDate;
|
||||
import javax.validation.constraints.*;
|
||||
import java.io.Serializable;
|
||||
import java.util.Objects;
|
||||
import java.util.function.Consumer;
|
||||
|
||||
/**
|
||||
* A DTO for the Membership entity.
|
||||
@ -15,14 +12,17 @@ public class MembershipDTO implements Serializable {
|
||||
private Long id;
|
||||
|
||||
@NotNull
|
||||
private LocalDate from;
|
||||
|
||||
private LocalDate to;
|
||||
|
||||
@Size(max = 160)
|
||||
private String comment;
|
||||
private LocalDate documentDate;
|
||||
|
||||
@NotNull
|
||||
private LocalDate memberFrom;
|
||||
|
||||
private LocalDate memberUntil;
|
||||
|
||||
@Size(max = 160)
|
||||
private String remark;
|
||||
|
||||
|
||||
private Long customerId;
|
||||
|
||||
private String customerPrefix;
|
||||
@ -41,28 +41,36 @@ public class MembershipDTO implements Serializable {
|
||||
this.id = id;
|
||||
}
|
||||
|
||||
public LocalDate getFrom() {
|
||||
return from;
|
||||
public LocalDate getDocumentDate() {
|
||||
return documentDate;
|
||||
}
|
||||
|
||||
public void setFrom(LocalDate from) {
|
||||
this.from = from;
|
||||
public void setDocumentDate(LocalDate documentDate) {
|
||||
this.documentDate = documentDate;
|
||||
}
|
||||
|
||||
public LocalDate getTo() {
|
||||
return to;
|
||||
public LocalDate getMemberFrom() {
|
||||
return memberFrom;
|
||||
}
|
||||
|
||||
public void setTo(LocalDate to) {
|
||||
this.to = to;
|
||||
public void setMemberFrom(LocalDate memberFrom) {
|
||||
this.memberFrom = memberFrom;
|
||||
}
|
||||
|
||||
public String getComment() {
|
||||
return comment;
|
||||
public LocalDate getMemberUntil() {
|
||||
return memberUntil;
|
||||
}
|
||||
|
||||
public void setComment(String comment) {
|
||||
this.comment = comment;
|
||||
public void setMemberUntil(LocalDate memberUntil) {
|
||||
this.memberUntil = memberUntil;
|
||||
}
|
||||
|
||||
public String getRemark() {
|
||||
return remark;
|
||||
}
|
||||
|
||||
public void setRemark(String remark) {
|
||||
this.remark = remark;
|
||||
}
|
||||
|
||||
public Long getCustomerId() {
|
||||
@ -106,9 +114,10 @@ public class MembershipDTO implements Serializable {
|
||||
public String toString() {
|
||||
return "MembershipDTO{" +
|
||||
"id=" + getId() +
|
||||
", from='" + getFrom() + "'" +
|
||||
", to='" + getTo() + "'" +
|
||||
", comment='" + getComment() + "'" +
|
||||
", documentDate='" + getDocumentDate() + "'" +
|
||||
", memberFrom='" + getMemberFrom() + "'" +
|
||||
", memberUntil='" + getMemberUntil() + "'" +
|
||||
", remark='" + getRemark() + "'" +
|
||||
", customer=" + getCustomerId() +
|
||||
", customer='" + getCustomerPrefix() + "'" +
|
||||
"}";
|
||||
|
@ -31,17 +31,17 @@ public class SepaMandateCriteria implements Serializable {
|
||||
|
||||
private StringFilter bic;
|
||||
|
||||
private LocalDateFilter created;
|
||||
private LocalDateFilter documentDate;
|
||||
|
||||
private LocalDateFilter validFrom;
|
||||
|
||||
private LocalDateFilter validTo;
|
||||
private LocalDateFilter validUntil;
|
||||
|
||||
private LocalDateFilter lastUsed;
|
||||
|
||||
private LocalDateFilter cancelled;
|
||||
private LocalDateFilter cancellationDate;
|
||||
|
||||
private StringFilter comment;
|
||||
private StringFilter remark;
|
||||
|
||||
private LongFilter customerId;
|
||||
|
||||
@ -77,12 +77,12 @@ public class SepaMandateCriteria implements Serializable {
|
||||
this.bic = bic;
|
||||
}
|
||||
|
||||
public LocalDateFilter getCreated() {
|
||||
return created;
|
||||
public LocalDateFilter getDocumentDate() {
|
||||
return documentDate;
|
||||
}
|
||||
|
||||
public void setCreated(LocalDateFilter created) {
|
||||
this.created = created;
|
||||
public void setDocumentDate(LocalDateFilter documentDate) {
|
||||
this.documentDate = documentDate;
|
||||
}
|
||||
|
||||
public LocalDateFilter getValidFrom() {
|
||||
@ -93,12 +93,12 @@ public class SepaMandateCriteria implements Serializable {
|
||||
this.validFrom = validFrom;
|
||||
}
|
||||
|
||||
public LocalDateFilter getValidTo() {
|
||||
return validTo;
|
||||
public LocalDateFilter getValidUntil() {
|
||||
return validUntil;
|
||||
}
|
||||
|
||||
public void setValidTo(LocalDateFilter validTo) {
|
||||
this.validTo = validTo;
|
||||
public void setValidUntil(LocalDateFilter validUntil) {
|
||||
this.validUntil = validUntil;
|
||||
}
|
||||
|
||||
public LocalDateFilter getLastUsed() {
|
||||
@ -109,20 +109,20 @@ public class SepaMandateCriteria implements Serializable {
|
||||
this.lastUsed = lastUsed;
|
||||
}
|
||||
|
||||
public LocalDateFilter getCancelled() {
|
||||
return cancelled;
|
||||
public LocalDateFilter getCancellationDate() {
|
||||
return cancellationDate;
|
||||
}
|
||||
|
||||
public void setCancelled(LocalDateFilter cancelled) {
|
||||
this.cancelled = cancelled;
|
||||
public void setCancellationDate(LocalDateFilter cancellationDate) {
|
||||
this.cancellationDate = cancellationDate;
|
||||
}
|
||||
|
||||
public StringFilter getComment() {
|
||||
return comment;
|
||||
public StringFilter getRemark() {
|
||||
return remark;
|
||||
}
|
||||
|
||||
public void setComment(StringFilter comment) {
|
||||
this.comment = comment;
|
||||
public void setRemark(StringFilter remark) {
|
||||
this.remark = remark;
|
||||
}
|
||||
|
||||
public LongFilter getCustomerId() {
|
||||
@ -148,12 +148,12 @@ public class SepaMandateCriteria implements Serializable {
|
||||
Objects.equals(reference, that.reference) &&
|
||||
Objects.equals(iban, that.iban) &&
|
||||
Objects.equals(bic, that.bic) &&
|
||||
Objects.equals(created, that.created) &&
|
||||
Objects.equals(documentDate, that.documentDate) &&
|
||||
Objects.equals(validFrom, that.validFrom) &&
|
||||
Objects.equals(validTo, that.validTo) &&
|
||||
Objects.equals(validUntil, that.validUntil) &&
|
||||
Objects.equals(lastUsed, that.lastUsed) &&
|
||||
Objects.equals(cancelled, that.cancelled) &&
|
||||
Objects.equals(comment, that.comment) &&
|
||||
Objects.equals(cancellationDate, that.cancellationDate) &&
|
||||
Objects.equals(remark, that.remark) &&
|
||||
Objects.equals(customerId, that.customerId);
|
||||
}
|
||||
|
||||
@ -164,12 +164,12 @@ public class SepaMandateCriteria implements Serializable {
|
||||
reference,
|
||||
iban,
|
||||
bic,
|
||||
created,
|
||||
documentDate,
|
||||
validFrom,
|
||||
validTo,
|
||||
validUntil,
|
||||
lastUsed,
|
||||
cancelled,
|
||||
comment,
|
||||
cancellationDate,
|
||||
remark,
|
||||
customerId
|
||||
);
|
||||
}
|
||||
@ -181,12 +181,12 @@ public class SepaMandateCriteria implements Serializable {
|
||||
(reference != null ? "reference=" + reference + ", " : "") +
|
||||
(iban != null ? "iban=" + iban + ", " : "") +
|
||||
(bic != null ? "bic=" + bic + ", " : "") +
|
||||
(created != null ? "created=" + created + ", " : "") +
|
||||
(documentDate != null ? "documentDate=" + documentDate + ", " : "") +
|
||||
(validFrom != null ? "validFrom=" + validFrom + ", " : "") +
|
||||
(validTo != null ? "validTo=" + validTo + ", " : "") +
|
||||
(validUntil != null ? "validUntil=" + validUntil + ", " : "") +
|
||||
(lastUsed != null ? "lastUsed=" + lastUsed + ", " : "") +
|
||||
(cancelled != null ? "cancelled=" + cancelled + ", " : "") +
|
||||
(comment != null ? "comment=" + comment + ", " : "") +
|
||||
(cancellationDate != null ? "cancellationDate=" + cancellationDate + ", " : "") +
|
||||
(remark != null ? "remark=" + remark + ", " : "") +
|
||||
(customerId != null ? "customerId=" + customerId + ", " : "") +
|
||||
"}";
|
||||
}
|
||||
|
@ -22,19 +22,19 @@ public class SepaMandateDTO implements Serializable {
|
||||
private String bic;
|
||||
|
||||
@NotNull
|
||||
private LocalDate created;
|
||||
private LocalDate documentDate;
|
||||
|
||||
@NotNull
|
||||
private LocalDate validFrom;
|
||||
|
||||
private LocalDate validTo;
|
||||
private LocalDate validUntil;
|
||||
|
||||
private LocalDate lastUsed;
|
||||
|
||||
private LocalDate cancelled;
|
||||
private LocalDate cancellationDate;
|
||||
|
||||
@Size(max = 160)
|
||||
private String comment;
|
||||
private String remark;
|
||||
|
||||
|
||||
private Long customerId;
|
||||
@ -73,12 +73,12 @@ public class SepaMandateDTO implements Serializable {
|
||||
this.bic = bic;
|
||||
}
|
||||
|
||||
public LocalDate getCreated() {
|
||||
return created;
|
||||
public LocalDate getDocumentDate() {
|
||||
return documentDate;
|
||||
}
|
||||
|
||||
public void setCreated(LocalDate created) {
|
||||
this.created = created;
|
||||
public void setDocumentDate(LocalDate documentDate) {
|
||||
this.documentDate = documentDate;
|
||||
}
|
||||
|
||||
public LocalDate getValidFrom() {
|
||||
@ -89,12 +89,12 @@ public class SepaMandateDTO implements Serializable {
|
||||
this.validFrom = validFrom;
|
||||
}
|
||||
|
||||
public LocalDate getValidTo() {
|
||||
return validTo;
|
||||
public LocalDate getValidUntil() {
|
||||
return validUntil;
|
||||
}
|
||||
|
||||
public void setValidTo(LocalDate validTo) {
|
||||
this.validTo = validTo;
|
||||
public void setValidUntil(LocalDate validUntil) {
|
||||
this.validUntil = validUntil;
|
||||
}
|
||||
|
||||
public LocalDate getLastUsed() {
|
||||
@ -105,20 +105,20 @@ public class SepaMandateDTO implements Serializable {
|
||||
this.lastUsed = lastUsed;
|
||||
}
|
||||
|
||||
public LocalDate getCancelled() {
|
||||
return cancelled;
|
||||
public LocalDate getCancellationDate() {
|
||||
return cancellationDate;
|
||||
}
|
||||
|
||||
public void setCancelled(LocalDate cancelled) {
|
||||
this.cancelled = cancelled;
|
||||
public void setCancellationDate(LocalDate cancellationDate) {
|
||||
this.cancellationDate = cancellationDate;
|
||||
}
|
||||
|
||||
public String getComment() {
|
||||
return comment;
|
||||
public String getRemark() {
|
||||
return remark;
|
||||
}
|
||||
|
||||
public void setComment(String comment) {
|
||||
this.comment = comment;
|
||||
public void setRemark(String remark) {
|
||||
this.remark = remark;
|
||||
}
|
||||
|
||||
public Long getCustomerId() {
|
||||
@ -165,12 +165,12 @@ public class SepaMandateDTO implements Serializable {
|
||||
", reference='" + getReference() + "'" +
|
||||
", iban='" + getIban() + "'" +
|
||||
", bic='" + getBic() + "'" +
|
||||
", created='" + getCreated() + "'" +
|
||||
", documentDate='" + getDocumentDate() + "'" +
|
||||
", validFrom='" + getValidFrom() + "'" +
|
||||
", validTo='" + getValidTo() + "'" +
|
||||
", validUntil='" + getValidUntil() + "'" +
|
||||
", lastUsed='" + getLastUsed() + "'" +
|
||||
", cancelled='" + getCancelled() + "'" +
|
||||
", comment='" + getComment() + "'" +
|
||||
", cancellationDate='" + getCancellationDate() + "'" +
|
||||
", remark='" + getRemark() + "'" +
|
||||
", customer=" + getCustomerId() +
|
||||
", customer='" + getCustomerPrefix() + "'" +
|
||||
"}";
|
||||
|
@ -31,13 +31,15 @@ public class ShareCriteria implements Serializable {
|
||||
|
||||
private LongFilter id;
|
||||
|
||||
private LocalDateFilter date;
|
||||
private LocalDateFilter documentDate;
|
||||
|
||||
private LocalDateFilter valueDate;
|
||||
|
||||
private ShareActionFilter action;
|
||||
|
||||
private IntegerFilter quantity;
|
||||
|
||||
private StringFilter comment;
|
||||
private StringFilter remark;
|
||||
|
||||
private LongFilter membershipId;
|
||||
|
||||
@ -49,12 +51,20 @@ public class ShareCriteria implements Serializable {
|
||||
this.id = id;
|
||||
}
|
||||
|
||||
public LocalDateFilter getDate() {
|
||||
return date;
|
||||
public LocalDateFilter getDocumentDate() {
|
||||
return documentDate;
|
||||
}
|
||||
|
||||
public void setDate(LocalDateFilter date) {
|
||||
this.date = date;
|
||||
public void setDocumentDate(LocalDateFilter documentDate) {
|
||||
this.documentDate = documentDate;
|
||||
}
|
||||
|
||||
public LocalDateFilter getValueDate() {
|
||||
return valueDate;
|
||||
}
|
||||
|
||||
public void setValueDate(LocalDateFilter valueDate) {
|
||||
this.valueDate = valueDate;
|
||||
}
|
||||
|
||||
public ShareActionFilter getAction() {
|
||||
@ -73,12 +83,12 @@ public class ShareCriteria implements Serializable {
|
||||
this.quantity = quantity;
|
||||
}
|
||||
|
||||
public StringFilter getComment() {
|
||||
return comment;
|
||||
public StringFilter getRemark() {
|
||||
return remark;
|
||||
}
|
||||
|
||||
public void setComment(StringFilter comment) {
|
||||
this.comment = comment;
|
||||
public void setRemark(StringFilter remark) {
|
||||
this.remark = remark;
|
||||
}
|
||||
|
||||
public LongFilter getMembershipId() {
|
||||
@ -101,10 +111,11 @@ public class ShareCriteria implements Serializable {
|
||||
final ShareCriteria that = (ShareCriteria) o;
|
||||
return
|
||||
Objects.equals(id, that.id) &&
|
||||
Objects.equals(date, that.date) &&
|
||||
Objects.equals(documentDate, that.documentDate) &&
|
||||
Objects.equals(valueDate, that.valueDate) &&
|
||||
Objects.equals(action, that.action) &&
|
||||
Objects.equals(quantity, that.quantity) &&
|
||||
Objects.equals(comment, that.comment) &&
|
||||
Objects.equals(remark, that.remark) &&
|
||||
Objects.equals(membershipId, that.membershipId);
|
||||
}
|
||||
|
||||
@ -112,10 +123,11 @@ public class ShareCriteria implements Serializable {
|
||||
public int hashCode() {
|
||||
return Objects.hash(
|
||||
id,
|
||||
date,
|
||||
documentDate,
|
||||
valueDate,
|
||||
action,
|
||||
quantity,
|
||||
comment,
|
||||
remark,
|
||||
membershipId
|
||||
);
|
||||
}
|
||||
@ -124,10 +136,11 @@ public class ShareCriteria implements Serializable {
|
||||
public String toString() {
|
||||
return "ShareCriteria{" +
|
||||
(id != null ? "id=" + id + ", " : "") +
|
||||
(date != null ? "date=" + date + ", " : "") +
|
||||
(documentDate != null ? "documentDate=" + documentDate + ", " : "") +
|
||||
(valueDate != null ? "valueDate=" + valueDate + ", " : "") +
|
||||
(action != null ? "action=" + action + ", " : "") +
|
||||
(quantity != null ? "quantity=" + quantity + ", " : "") +
|
||||
(comment != null ? "comment=" + comment + ", " : "") +
|
||||
(remark != null ? "remark=" + remark + ", " : "") +
|
||||
(membershipId != null ? "membershipId=" + membershipId + ", " : "") +
|
||||
"}";
|
||||
}
|
||||
|
@ -13,7 +13,10 @@ public class ShareDTO implements Serializable {
|
||||
private Long id;
|
||||
|
||||
@NotNull
|
||||
private LocalDate date;
|
||||
private LocalDate documentDate;
|
||||
|
||||
@NotNull
|
||||
private LocalDate valueDate;
|
||||
|
||||
@NotNull
|
||||
private ShareAction action;
|
||||
@ -22,12 +25,12 @@ public class ShareDTO implements Serializable {
|
||||
private Integer quantity;
|
||||
|
||||
@Size(max = 160)
|
||||
private String comment;
|
||||
private String remark;
|
||||
|
||||
|
||||
private Long membershipId;
|
||||
|
||||
private String membershipFrom;
|
||||
private String membershipDocumentDate;
|
||||
|
||||
public Long getId() {
|
||||
return id;
|
||||
@ -37,12 +40,20 @@ public class ShareDTO implements Serializable {
|
||||
this.id = id;
|
||||
}
|
||||
|
||||
public LocalDate getDate() {
|
||||
return date;
|
||||
public LocalDate getDocumentDate() {
|
||||
return documentDate;
|
||||
}
|
||||
|
||||
public void setDate(LocalDate date) {
|
||||
this.date = date;
|
||||
public void setDocumentDate(LocalDate documentDate) {
|
||||
this.documentDate = documentDate;
|
||||
}
|
||||
|
||||
public LocalDate getValueDate() {
|
||||
return valueDate;
|
||||
}
|
||||
|
||||
public void setValueDate(LocalDate valueDate) {
|
||||
this.valueDate = valueDate;
|
||||
}
|
||||
|
||||
public ShareAction getAction() {
|
||||
@ -61,12 +72,12 @@ public class ShareDTO implements Serializable {
|
||||
this.quantity = quantity;
|
||||
}
|
||||
|
||||
public String getComment() {
|
||||
return comment;
|
||||
public String getRemark() {
|
||||
return remark;
|
||||
}
|
||||
|
||||
public void setComment(String comment) {
|
||||
this.comment = comment;
|
||||
public void setRemark(String remark) {
|
||||
this.remark = remark;
|
||||
}
|
||||
|
||||
public Long getMembershipId() {
|
||||
@ -77,12 +88,12 @@ public class ShareDTO implements Serializable {
|
||||
this.membershipId = membershipId;
|
||||
}
|
||||
|
||||
public String getMembershipFrom() {
|
||||
return membershipFrom;
|
||||
public String getMembershipDocumentDate() {
|
||||
return membershipDocumentDate;
|
||||
}
|
||||
|
||||
public void setMembershipFrom(String membershipFrom) {
|
||||
this.membershipFrom = membershipFrom;
|
||||
public void setMembershipDocumentDate(String membershipDocumentDate) {
|
||||
this.membershipDocumentDate = membershipDocumentDate;
|
||||
}
|
||||
|
||||
@Override
|
||||
@ -110,12 +121,13 @@ public class ShareDTO implements Serializable {
|
||||
public String toString() {
|
||||
return "ShareDTO{" +
|
||||
"id=" + getId() +
|
||||
", date='" + getDate() + "'" +
|
||||
", documentDate='" + getDocumentDate() + "'" +
|
||||
", valueDate='" + getValueDate() + "'" +
|
||||
", action='" + getAction() + "'" +
|
||||
", quantity=" + getQuantity() +
|
||||
", comment='" + getComment() + "'" +
|
||||
", remark='" + getRemark() + "'" +
|
||||
", membership=" + getMembershipId() +
|
||||
", membership='" + getMembershipFrom() + "'" +
|
||||
", membership='" + getMembershipDocumentDate() + "'" +
|
||||
"}";
|
||||
}
|
||||
}
|
||||
|
@ -12,7 +12,7 @@ import org.mapstruct.*;
|
||||
public interface AssetMapper extends EntityMapper<AssetDTO, Asset> {
|
||||
|
||||
@Mapping(source = "membership.id", target = "membershipId")
|
||||
@Mapping(source = "membership.from", target = "membershipFrom")
|
||||
@Mapping(source = "membership.documentDate", target = "membershipDocumentDate")
|
||||
AssetDTO toDto(Asset asset);
|
||||
|
||||
@Mapping(source = "membershipId", target = "membership")
|
||||
|
@ -12,7 +12,7 @@ import org.mapstruct.*;
|
||||
public interface ShareMapper extends EntityMapper<ShareDTO, Share> {
|
||||
|
||||
@Mapping(source = "membership.id", target = "membershipId")
|
||||
@Mapping(source = "membership.from", target = "membershipFrom")
|
||||
@Mapping(source = "membership.documentDate", target = "membershipDocumentDate")
|
||||
ShareDTO toDto(Share share);
|
||||
|
||||
@Mapping(source = "membershipId", target = "membership")
|
||||
|
Reference in New Issue
Block a user