5454465

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

@@ -227,7 +227,7 @@ public class ContractServiceImpl implements ContractService {
 						}
 						}
 					}
 					}
 				}
 				}
-				if(contractVo.getProduct_line_type()!=null) {
+/*				if(contractVo.getProduct_line_type()!=null) {
 				switch(contractVo.getProduct_line_type()) {
 				switch(contractVo.getProduct_line_type()) {
 					case "1" :
 					case "1" :
 						contractVo.setProduct_line_type_name("安防");
 						contractVo.setProduct_line_type_name("安防");
@@ -277,8 +277,31 @@ public class ContractServiceImpl implements ContractService {
 						case "4" :
 						case "4" :
 							contractVo.setContract_type_name("维保");
 							contractVo.setContract_type_name("维保");
 							break;
 							break;
+						default:
+							break;
 					}
 					}
 				}
 				}
+				if(contractVo.getAmount_state_unid()!=null) {
+					switch(contractVo.getAmount_state_unid()) {
+						case "1" :
+							contractVo.setAmount_state_unid_name("正常预付款");
+							break;
+						case "2" :
+							contractVo.setAmount_state_unid_name("正常到货款");
+							break;
+						case "3" :
+							contractVo.setAmount_state_unid_name("正常验收款");
+							break;
+						case "4" :
+							contractVo.setAmount_state_unid_name("正常维保款");
+							break;
+						case "5" :
+							contractVo.setAmount_state_unid_name("正常质保款");
+							break;
+						default:
+							break;
+					}
+				}*/
 			}
 			}
 			String provinceurl=financeConfig.getProvinceurl();
 			String provinceurl=financeConfig.getProvinceurl();
 			String province_results=HttpNetClient.doGet(provinceurl, null);
 			String province_results=HttpNetClient.doGet(provinceurl, null);

code/finance_serv/src/main/java/com/vion/financial/vo/ContractVo.java

@@ -62,6 +62,7 @@ public class ContractVo extends SelectVo{
 	private String product_line_type_name;
 	private String product_line_type_name;
 	private String contract_state_name;
 	private String contract_state_name;
 	private String contract_type_name;
 	private String contract_type_name;
+	private String amount_state_unid_name;
 	/*@JsonIgnoreProperties(value={"total_number"}) */
 	/*@JsonIgnoreProperties(value={"total_number"}) */
 	private Integer list_size;
 	private Integer list_size;
 	private Integer offset;
 	private Integer offset;
@@ -491,6 +492,12 @@ public class ContractVo extends SelectVo{
 	public void setContract_type_name(String contract_type_name) {
 	public void setContract_type_name(String contract_type_name) {
 		this.contract_type_name = contract_type_name;
 		this.contract_type_name = contract_type_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;
+	}
 	
 	
 	
 	
 }
 }