Sfoglia il codice sorgente

update

Signed-off-by: anderx <312518615@qq.com>
anderx 5 anni fa
parent
commit
664717442f

+ 128 - 126
src/main/java/com/goafanti/order/bo/OutArrearsDunListBo.java

@@ -1,126 +1,128 @@
-package com.goafanti.order.bo;
-
-public class OutArrearsDunListBo {
-	private String id;
-	private String contractNo;
-	private String orderNo;
-	private String userName;
-	private String salesmanName;
-   	private Integer projectStatus;
-   	private String totalAmount;
-   	private Integer liquidationStatus;
-   	private String settlementAmount;
-   	private String orderReceivables;
-   	private String orderArrears;
-   	private Integer orderStatus; 
-   	private String startDate;
-   	private Integer type;
-   	private String depName;
-   	private String signDate;
-   	private Integer dunStatus;
-	public String getId() {
-		return id;
-	}
-	public void setId(String id) {
-		this.id = id;
-	}
-	public String getContractNo() {
-		return contractNo;
-	}
-	public void setContractNo(String contractNo) {
-		this.contractNo = contractNo;
-	}
-	public String getOrderNo() {
-		return orderNo;
-	}
-	public void setOrderNo(String orderNo) {
-		this.orderNo = orderNo;
-	}
-	public String getUserName() {
-		return userName;
-	}
-	public void setUserName(String userName) {
-		this.userName = userName;
-	}
-	public String getSalesmanName() {
-		return salesmanName;
-	}
-	public void setSalesmanName(String salesmanName) {
-		this.salesmanName = salesmanName;
-	}
-	public Integer getProjectStatus() {
-		return projectStatus;
-	}
-	public void setProjectStatus(Integer projectStatus) {
-		this.projectStatus = projectStatus;
-	}
-	public String getTotalAmount() {
-		return totalAmount;
-	}
-	public void setTotalAmount(String totalAmount) {
-		this.totalAmount = totalAmount;
-	}
-	public Integer getLiquidationStatus() {
-		return liquidationStatus;
-	}
-	public void setLiquidationStatus(Integer liquidationStatus) {
-		this.liquidationStatus = liquidationStatus;
-	}
-	public String getSettlementAmount() {
-		return settlementAmount;
-	}
-	public void setSettlementAmount(String settlementAmount) {
-		this.settlementAmount = settlementAmount;
-	}
-	public String getOrderReceivables() {
-		return orderReceivables;
-	}
-	public void setOrderReceivables(String orderReceivables) {
-		this.orderReceivables = orderReceivables;
-	}
-	public String getOrderArrears() {
-		return orderArrears;
-	}
-	public void setOrderArrears(String orderArrears) {
-		this.orderArrears = orderArrears;
-	}
-	public Integer getOrderStatus() {
-		return orderStatus;
-	}
-	public void setOrderStatus(Integer orderStatus) {
-		this.orderStatus = orderStatus;
-	}
-	public String getStartDate() {
-		return startDate;
-	}
-	public void setStartDate(String startDate) {
-		this.startDate = startDate;
-	}
-	public String getDepName() {
-		return depName;
-	}
-	public void setDepName(String depName) {
-		this.depName = depName;
-	}
-	public String getSignDate() {
-		return signDate;
-	}
-	public void setSignDate(String signDate) {
-		this.signDate = signDate;
-	}
-	public Integer getDunStatus() {
-		return dunStatus;
-	}
-	public void setDunStatus(Integer dunStatus) {
-		this.dunStatus = dunStatus;
-	}
-	public Integer getType() {
-		return type;
-	}
-	public void setType(Integer type) {
-		this.type = type;
-	}
-   	
-   	
-
-}
+package com.goafanti.order.bo;
+
+import java.math.BigDecimal;
+
+public class OutArrearsDunListBo {
+	private String id;
+	private String contractNo;
+	private String orderNo;
+	private String userName;
+	private String salesmanName;
+   	private Integer projectStatus;
+   	private BigDecimal totalAmount;
+   	private Integer liquidationStatus;
+   	private BigDecimal settlementAmount;
+   	private BigDecimal orderReceivables;
+   	private BigDecimal orderArrears;
+   	private Integer orderStatus; 
+   	private String startDate;
+   	private Integer type;
+   	private String depName;
+   	private String signDate;
+   	private Integer dunStatus;
+	public String getId() {
+		return id;
+	}
+	public void setId(String id) {
+		this.id = id;
+	}
+	public String getContractNo() {
+		return contractNo;
+	}
+	public void setContractNo(String contractNo) {
+		this.contractNo = contractNo;
+	}
+	public String getOrderNo() {
+		return orderNo;
+	}
+	public void setOrderNo(String orderNo) {
+		this.orderNo = orderNo;
+	}
+	public String getUserName() {
+		return userName;
+	}
+	public void setUserName(String userName) {
+		this.userName = userName;
+	}
+	public String getSalesmanName() {
+		return salesmanName;
+	}
+	public void setSalesmanName(String salesmanName) {
+		this.salesmanName = salesmanName;
+	}
+	public Integer getProjectStatus() {
+		return projectStatus;
+	}
+	public void setProjectStatus(Integer projectStatus) {
+		this.projectStatus = projectStatus;
+	}
+	public BigDecimal getTotalAmount() {
+		return totalAmount;
+	}
+	public void setTotalAmount(BigDecimal totalAmount) {
+		this.totalAmount = totalAmount;
+	}
+	public Integer getLiquidationStatus() {
+		return liquidationStatus;
+	}
+	public void setLiquidationStatus(Integer liquidationStatus) {
+		this.liquidationStatus = liquidationStatus;
+	}
+	public BigDecimal getSettlementAmount() {
+		return settlementAmount;
+	}
+	public void setSettlementAmount(BigDecimal settlementAmount) {
+		this.settlementAmount = settlementAmount;
+	}
+	public BigDecimal getOrderReceivables() {
+		return orderReceivables;
+	}
+	public void setOrderReceivables(BigDecimal orderReceivables) {
+		this.orderReceivables = orderReceivables;
+	}
+	public BigDecimal getOrderArrears() {
+		return orderArrears;
+	}
+	public void setOrderArrears(BigDecimal orderArrears) {
+		this.orderArrears = orderArrears;
+	}
+	public Integer getOrderStatus() {
+		return orderStatus;
+	}
+	public void setOrderStatus(Integer orderStatus) {
+		this.orderStatus = orderStatus;
+	}
+	public String getStartDate() {
+		return startDate;
+	}
+	public void setStartDate(String startDate) {
+		this.startDate = startDate;
+	}
+	public String getDepName() {
+		return depName;
+	}
+	public void setDepName(String depName) {
+		this.depName = depName;
+	}
+	public String getSignDate() {
+		return signDate;
+	}
+	public void setSignDate(String signDate) {
+		this.signDate = signDate;
+	}
+	public Integer getDunStatus() {
+		return dunStatus;
+	}
+	public void setDunStatus(Integer dunStatus) {
+		this.dunStatus = dunStatus;
+	}
+	public Integer getType() {
+		return type;
+	}
+	public void setType(Integer type) {
+		this.type = type;
+	}
+   	
+   	
+
+}

+ 3 - 3
src/main/java/com/goafanti/order/service/impl/OrderNewServiceImpl.java

@@ -1419,11 +1419,11 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
     				case "订单部门": o = ob.getDepName(); break;
     				case "订单状态": o = OrderNewState.getValueByCode(ob.getOrderStatus());break;
     				case "项目状态": o = ProjectNewStage.getValueByCode(ob.getOrderStatus());break;
-    				case "签单金额(万元)": o = ob.getTotalAmount();break;
-    				case "已收款(万元)": o = ob.getSettlementAmount();break;
+    				case "签单金额(万元)": o = ob.getTotalAmount().toString();break;
+    				case "已收款(万元)": o = ob.getSettlementAmount().toString();break;
     				case "结算状态": o = LiquidationNewState.getValueByCode(ob.getLiquidationStatus());break;
     				case "催收科目": o = ob.getType()==0?"按时触发应收款":"未知";break;
-    				case "欠款催收": o = ob.getOrderArrears();break;
+    				case "欠款催收": o = ob.getOrderArrears().toString();break;
     				case "催款状态": o = NewDunState.getValueByCode(ob.getDunStatus());break;
     				case "催款启动时间": o = ob.getStartDate();break;
     				case "下单时间": o = ob.getSignDate();break;