Просмотр исходного кода

update

Signed-off-by: anderx <312518615@qq.com>
anderx лет назад: 5
Родитель
Сommit
486d05b727

+ 32 - 30
src/main/java/com/goafanti/order/bo/OrderListBo.java

@@ -1,5 +1,7 @@
 package com.goafanti.order.bo;
 
+import java.math.BigDecimal;
+
 /**
  * 订单列表
  * @author Administrator
@@ -17,11 +19,11 @@ public class OrderListBo {
 	/** 签单时间 **/
 	private String signTime;
 	/** 合同首付金额 **/
-	private String signFirstPayment;
+	private BigDecimal signFirstPayment;
 	/** 合同订单金额 **/
-	private String signTotalAmount;
+	private BigDecimal signTotalAmount;
 	/** 实际付款金额 **/
-	private String actuallyTotalAmount;
+	private BigDecimal actuallyTotalAmount;
 	/** 买方姓名 **/
 	private String buyerName;
 	/** 卖方姓名 **/
@@ -77,34 +79,34 @@ public class OrderListBo {
 	/** 外包名称*/
 	private String outsourceName;
 	/** 最后收款 */
-	private String finalReceivables;
+	private BigDecimal finalReceivables;
 	/** 最后收款 时间*/
 	private String finalReceivablesTime;
 	/** 开票金额 */
-	private String invoiceAmount;
+	private BigDecimal invoiceAmount;
 	/** 结束最后收款 时间*/
 	private String endFinalReceivablesTime;
 	/** 开始最后收款 时间*/
 	private String startFinalReceivablesTime;	
 	/** 外包金额*/
-	private String outsourceAmount;
+	private BigDecimal outsourceAmount;
 	/** 筛选金额*/
 	private Integer amountStatus;
 	/** 驳回位置*/
 	private Integer backStatus;
 	/**应收款 */
-	private String orderReceivables;
+	private BigDecimal orderReceivables;
 	/**欠款 */
-	private String  orderArrears;
+	private BigDecimal  orderArrears;
 	/**总成本*/
-	private String  costAmount;
+	private BigDecimal  costAmount;
 	/**已付成本*/
-	private String paymentAmount;
+	private BigDecimal paymentAmount;
 	
-	public String getFinalReceivables() {
+	public BigDecimal getFinalReceivables() {
 		return finalReceivables;
 	}
-	public void setFinalReceivables(String finalReceivables) {
+	public void setFinalReceivables(BigDecimal finalReceivables) {
 		this.finalReceivables = finalReceivables;
 	}
 	public String getFinalReceivablesTime() {
@@ -113,10 +115,10 @@ public class OrderListBo {
 	public void setFinalReceivablesTime(String finalReceivablesTime) {
 		this.finalReceivablesTime = finalReceivablesTime;
 	}
-	public String getInvoiceAmount() {
+	public BigDecimal getInvoiceAmount() {
 		return invoiceAmount;
 	}
-	public void setInvoiceAmount(String invoiceAmount) {
+	public void setInvoiceAmount(BigDecimal invoiceAmount) {
 		this.invoiceAmount = invoiceAmount;
 	}
 	public String getOrderNo() {
@@ -149,22 +151,22 @@ public class OrderListBo {
 	public void setSignTime(String signTime) {
 		this.signTime = signTime;
 	}
-	public String getSignFirstPayment() {
+	public BigDecimal getSignFirstPayment() {
 		return signFirstPayment;
 	}
-	public void setSignFirstPayment(String signFirstPayment) {
+	public void setSignFirstPayment(BigDecimal signFirstPayment) {
 		this.signFirstPayment = signFirstPayment;
 	}
-	public String getSignTotalAmount() {
+	public BigDecimal getSignTotalAmount() {
 		return signTotalAmount;
 	}
-	public void setSignTotalAmount(String signTotalAmount) {
+	public void setSignTotalAmount(BigDecimal signTotalAmount) {
 		this.signTotalAmount = signTotalAmount;
 	}
-	public String getActuallyTotalAmount() {
+	public BigDecimal getActuallyTotalAmount() {
 		return actuallyTotalAmount;
 	}
-	public void setActuallyTotalAmount(String actuallyTotalAmount) {
+	public void setActuallyTotalAmount(BigDecimal actuallyTotalAmount) {
 		this.actuallyTotalAmount = actuallyTotalAmount;
 	}
 	public String getBuyerName() {
@@ -344,10 +346,10 @@ public class OrderListBo {
 	public void setStartFinalReceivablesTime(String startFinalReceivablesTime) {
 		this.startFinalReceivablesTime = startFinalReceivablesTime;
 	}
-	public String getOutsourceAmount() {
+	public BigDecimal getOutsourceAmount() {
 		return outsourceAmount;
 	}
-	public void setOutsourceAmount(String outsourceAmount) {
+	public void setOutsourceAmount(BigDecimal outsourceAmount) {
 		this.outsourceAmount = outsourceAmount;
 	}
 	public Integer getAmountStatus() {
@@ -362,28 +364,28 @@ public class OrderListBo {
 	public void setBackStatus(Integer backStatus) {
 		this.backStatus = backStatus;
 	}
-	public String getOrderReceivables() {
+	public BigDecimal getOrderReceivables() {
 		return orderReceivables;
 	}
-	public void setOrderReceivables(String orderReceivables) {
+	public void setOrderReceivables(BigDecimal orderReceivables) {
 		this.orderReceivables = orderReceivables;
 	}
-	public String getOrderArrears() {
+	public BigDecimal getOrderArrears() {
 		return orderArrears;
 	}
-	public void setOrderArrears(String orderArrears) {
+	public void setOrderArrears(BigDecimal orderArrears) {
 		this.orderArrears = orderArrears;
 	}
-	public String getCostAmount() {
+	public BigDecimal getCostAmount() {
 		return costAmount;
 	}
-	public void setCostAmount(String costAmount) {
+	public void setCostAmount(BigDecimal costAmount) {
 		this.costAmount = costAmount;
 	}
-	public String getPaymentAmount() {
+	public BigDecimal getPaymentAmount() {
 		return paymentAmount;
 	}
-	public void setPaymentAmount(String paymentAmount) {
+	public void setPaymentAmount(BigDecimal paymentAmount) {
 		this.paymentAmount = paymentAmount;
 	}
 }

+ 4 - 4
src/main/java/com/goafanti/order/service/impl/OrderReceivablesServiceImpl.java

@@ -714,10 +714,10 @@ public class OrderReceivablesServiceImpl extends BaseMybatisDao<TemporaryReceiva
 					case "订单负责人": o = ob.getSellerName(); break;
 					case "签单日期": o = ob.getSignTime(); break;
 					case "下单日期": o = ob.getCreateTime(); break;
-					case "签单金额(万元)":o=ob.getSignTotalAmount();break;
-					case "已开票金额(万元)":o=ob.getInvoiceAmount();break;
-					case "已收金额(万元)":o=ob.getActuallyTotalAmount();break;
-					case "最近收款(万元)":o=ob.getFinalReceivables();break;
+					case "签单金额(万元)":o=ob.getSignTotalAmount().toString();break;
+					case "已开票金额(万元)":o=ob.getInvoiceAmount().toString();break;
+					case "已收金额(万元)":o=ob.getActuallyTotalAmount().toString();break;
+					case "最近收款(万元)":o=ob.getFinalReceivables().toString();break;
 					case "最近收款时间":o=ob.getFinalReceivablesTime();break;
 					case "结算状态":o=LiquidationNewState.getValueByCode(ob.getLiquidationStatus());break;
 					case "订单流程":o=ProcessStatus.getValueByCode(ob.getProcessStatus());break;

Разница между файлами не показана из-за своего большого размера
+ 2133 - 2133
src/main/java/com/goafanti/order/service/impl/OrderServiceImpl.java