|
|
@@ -36,7 +36,7 @@ public class OutOrderProject {
|
|
|
/**
|
|
|
* 是否会员
|
|
|
*/
|
|
|
- @Excel(name = "是否会员")
|
|
|
+ @Excel(name = "是否会员",readConverterExp = "0=否,1=是")
|
|
|
private Integer projectType;
|
|
|
/**
|
|
|
* 大客户
|
|
|
@@ -94,19 +94,19 @@ public class OutOrderProject {
|
|
|
private String contractAmountProportion;
|
|
|
|
|
|
@Excel(name = "应收款")
|
|
|
- private String shouldAmount;
|
|
|
+ private BigDecimal orderReceivables;
|
|
|
|
|
|
/**
|
|
|
* 已收款
|
|
|
*/
|
|
|
@Excel(name = "已收款")
|
|
|
- private String settlementAmount;
|
|
|
+ private BigDecimal settlementAmount;
|
|
|
|
|
|
@Excel(name = "欠款")
|
|
|
- private String arrearsAmount;
|
|
|
+ private BigDecimal arrearsAmount;
|
|
|
|
|
|
@Excel(name = "已报销")
|
|
|
- private String expenseAmount;
|
|
|
+ private BigDecimal expenseAmount;
|
|
|
|
|
|
@Excel(name = "应公出")
|
|
|
private String shouldPublic;
|
|
|
@@ -322,35 +322,35 @@ public class OutOrderProject {
|
|
|
this.contractAmountProportion = contractAmountProportion;
|
|
|
}
|
|
|
|
|
|
- public String getShouldAmount() {
|
|
|
- return shouldAmount;
|
|
|
+ public BigDecimal getOrderReceivables() {
|
|
|
+ return orderReceivables;
|
|
|
}
|
|
|
|
|
|
- public void setShouldAmount(String shouldAmount) {
|
|
|
- this.shouldAmount = shouldAmount;
|
|
|
+ public void setOrderReceivables(BigDecimal orderReceivables) {
|
|
|
+ this.orderReceivables = orderReceivables;
|
|
|
}
|
|
|
|
|
|
- public String getSettlementAmount() {
|
|
|
+ public BigDecimal getSettlementAmount() {
|
|
|
return settlementAmount;
|
|
|
}
|
|
|
|
|
|
- public void setSettlementAmount(String settlementAmount) {
|
|
|
+ public void setSettlementAmount(BigDecimal settlementAmount) {
|
|
|
this.settlementAmount = settlementAmount;
|
|
|
}
|
|
|
|
|
|
- public String getArrearsAmount() {
|
|
|
+ public BigDecimal getArrearsAmount() {
|
|
|
return arrearsAmount;
|
|
|
}
|
|
|
|
|
|
- public void setArrearsAmount(String arrearsAmount) {
|
|
|
+ public void setArrearsAmount(BigDecimal arrearsAmount) {
|
|
|
this.arrearsAmount = arrearsAmount;
|
|
|
}
|
|
|
|
|
|
- public String getExpenseAmount() {
|
|
|
+ public BigDecimal getExpenseAmount() {
|
|
|
return expenseAmount;
|
|
|
}
|
|
|
|
|
|
- public void setExpenseAmount(String expenseAmount) {
|
|
|
+ public void setExpenseAmount(BigDecimal expenseAmount) {
|
|
|
this.expenseAmount = expenseAmount;
|
|
|
}
|
|
|
|