1543123654695

code/finance_serv/src/main/java/com/vion/financial/excel/ExportModel.java

@@ -48,8 +48,10 @@ public class ExportModel {
 	private Double total_reback_amount;                  //累计已收款
 	private Double total_reback_amount;                  //累计已收款
 	@Excel(name="合同余额")
 	@Excel(name="合同余额")
 	private Double contract_remain;                       //合同余额
 	private Double contract_remain;                       //合同余额
-	@Excel(name="合同状态")
-	private String contract_type;                         //合同性质，合同 状态
+	@Excel(name="账款状态")
+	private String amount_state_unid_name;
+	@ExcelIgnore()
+	private String amount_state_unid;                         //账款 状态
 	@Excel(name="累计应收款")
 	@Excel(name="累计应收款")
 	private Double total_receive_amount;                  //累计应收款
 	private Double total_receive_amount;                  //累计应收款
 	@Excel(name="应收账款余额")
 	@Excel(name="应收账款余额")
@@ -187,12 +189,6 @@ public class ExportModel {
 	public void setContract_remain(Double contract_remain) {
 	public void setContract_remain(Double contract_remain) {
 		this.contract_remain = contract_remain;
 		this.contract_remain = contract_remain;
 	}
 	}
-	public String getContract_type() {
-		return contract_type;
-	}
-	public void setContract_type(String contract_type) {
-		this.contract_type = contract_type;
-	}
 	public Double getTotal_receive_amount() {
 	public Double getTotal_receive_amount() {
 		return total_receive_amount;
 		return total_receive_amount;
 	}
 	}
@@ -295,7 +291,17 @@ public class ExportModel {
 	public void setCounty_name(String county_name) {
 	public void setCounty_name(String county_name) {
 		this.county_name = county_name;
 		this.county_name = county_name;
 	}
 	}
-	
-	
+	public String getAmount_state_unid_name() {
+		return amount_state_unid_name;
+	}
+	public void setAmount_state_unid_name(String amount_state_unid_name) {
+		this.amount_state_unid_name = amount_state_unid_name;
+	}
+	public String getAmount_state_unid() {
+		return amount_state_unid;
+	}
+	public void setAmount_state_unid(String amount_state_unid) {
+		this.amount_state_unid = amount_state_unid;
+	}
 	
 	
 }
 }

code/finance_serv/src/main/java/com/vion/financial/service/imp/ContractServiceImpl.java

@@ -422,6 +422,27 @@ public class ContractServiceImpl implements ContractService {
 					}
 					}
 				}
 				}
 			}
 			}
+			if(exportModel.getAmount_state_unid()!=null) {
+				switch(exportModel.getAmount_state_unid()) {
+					case "40001" :
+						exportModel.setAmount_state_unid_name("正常预付款");
+						break;
+					case "40002" :
+						exportModel.setAmount_state_unid_name("正常到货款");
+						break;
+					case "40003" :
+						exportModel.setAmount_state_unid_name("正常验收款");
+						break;
+					case "40004" :
+						exportModel.setAmount_state_unid_name("正常维保款");
+						break;
+					case "40005" :
+						exportModel.setAmount_state_unid_name("正常质保款");
+						break;
+					default:
+						break;
+				}
+			}
 			if(list_province != null && list_province.size() > 0) {
 			if(list_province != null && list_province.size() > 0) {
 				for(Map _map:list_province) {
 				for(Map _map:list_province) {
 					if(exportModel.getProvince()!=null) {
 					if(exportModel.getProvince()!=null) {