K požadavku na služební cestu byla přidána možnost "Požadovat zálohu".
Upraven výpočet vyúčtování- odečítá se požadovaná záloha.
This commit is contained in:
@@ -1,5 +1,6 @@
|
||||
package info.bukova.isspst.data;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
@@ -35,6 +36,10 @@ public class TripRequirement extends RequirementBase {
|
||||
private List<User> passengers;
|
||||
@Embedded
|
||||
private Vehicle vehicle;
|
||||
@Column(name = "REQUIRE_DOWN_PAYMENT")
|
||||
private Boolean requireDownPayment;
|
||||
@Column(name = "DOWN_PAYMENT", precision = 15, scale = 4)
|
||||
private BigDecimal downPayment;
|
||||
|
||||
public TripRequirement() {
|
||||
this.setOwnedBy(new User());
|
||||
@@ -97,4 +102,20 @@ public class TripRequirement extends RequirementBase {
|
||||
this.vehicle = vehicle;
|
||||
}
|
||||
|
||||
public Boolean getRequireDownPayment() {
|
||||
return requireDownPayment;
|
||||
}
|
||||
|
||||
public void setRequireDownPayment(Boolean requireDownPayment) {
|
||||
this.requireDownPayment = requireDownPayment;
|
||||
}
|
||||
|
||||
public BigDecimal getDownPayment() {
|
||||
return downPayment;
|
||||
}
|
||||
|
||||
public void setDownPayment(BigDecimal downPayment) {
|
||||
this.downPayment = downPayment;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -92,6 +92,10 @@ public class TripBillServiceImpl extends AbstractOwnedService<TripBill> implemen
|
||||
calculateItem(item);
|
||||
bill.setTotal(bill.getTotal().add(item.getTotal()));
|
||||
}
|
||||
|
||||
if (bill.getRequirement().getDownPayment() != null) {
|
||||
bill.setTotal(bill.getTotal().subtract(bill.getRequirement().getDownPayment()));
|
||||
}
|
||||
}
|
||||
|
||||
private void calculateItem(TripBillItem item) {
|
||||
|
||||
Reference in New Issue
Block a user