45445454

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

@@ -238,6 +238,40 @@ public class ContractServiceImpl implements ContractService {
 						break;
 				}
 				}
+				if(contractVo.getContract_state()!=null) {
+					switch(contractVo.getContract_state()) {
+						case "1" :
+							contractVo.setContract_state_name("已完成");
+							break;
+						case "2" :
+							contractVo.setContract_state_name("待发货");
+							break;
+						case "3" :
+							contractVo.setContract_state_name("施工中");
+							break;
+						case "4" :
+							contractVo.setContract_state_name("项目暂停");
+							break;
+						default:
+							break;
+					}
+				}
+				if(contractVo.getContract_type()!=null) {
+					switch(contractVo.getContract_type()){
+						case "1" :
+							contractVo.setContract_type_name("供货");
+							break;
+						case "2" :
+							contractVo.setContract_type_name("施工");
+							break;
+						case "3" :
+							contractVo.setContract_type_name("集成");
+							break;
+						case "4" :
+							contractVo.setContract_type_name("维保");
+							break;
+					}
+				}
 			}
 			String provinceurl=financeConfig.getProvinceurl();
 			String province_results=HttpNetClient.doGet(provinceurl, null);

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

@@ -60,6 +60,8 @@ public class ContractVo extends SelectVo{
 	private String city_name;
 	private String county_name;
 	private String product_line_type_name;
+	private String contract_state_name;
+	private String contract_type_name;
 	/*@JsonIgnoreProperties(value={"total_number"}) */
 	private Integer list_size;
 	private Integer offset;
@@ -477,6 +479,18 @@ public class ContractVo extends SelectVo{
 	public void setProduct_line_type_name(String product_line_type_name) {
 		this.product_line_type_name = product_line_type_name;
 	}
+	public String getContract_state_name() {
+		return contract_state_name;
+	}
+	public void setContract_state_name(String contract_state_name) {
+		this.contract_state_name = contract_state_name;
+	}
+	public String getContract_type_name() {
+		return contract_type_name;
+	}
+	public void setContract_type_name(String contract_type_name) {
+		this.contract_type_name = contract_type_name;
+	}
 	
 	
 }