125435454845

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

@@ -10,8 +10,10 @@ public class ExportModel {
 	private String contract_unid;                         //合同编号
 	private String contract_unid;                         //合同编号
 	@Excel(name="所属年份")
 	@Excel(name="所属年份")
 	private String year;                                  //所属年份
 	private String year;                                  //所属年份
+	@ExcelIgnore()
+	private String product_line_type;
 	@Excel(name="产品线类型")
 	@Excel(name="产品线类型")
-	private String product_line_type;                     //产品线类型
+	private String product_line_type_name;                     //产品线类型
 	@Excel(name="签订日期",format="yyyy-MM-dd",width=15)
 	@Excel(name="签订日期",format="yyyy-MM-dd",width=15)
 	private Date sign_date;                               //签订日期
 	private Date sign_date;                               //签订日期
 	@Excel(name="所属月份")
 	@Excel(name="所属月份")
@@ -303,5 +305,11 @@ public class ExportModel {
 	public void setAmount_state_unid(String amount_state_unid) {
 	public void setAmount_state_unid(String amount_state_unid) {
 		this.amount_state_unid = amount_state_unid;
 		this.amount_state_unid = amount_state_unid;
 	}
 	}
+	public String getProduct_line_type_name() {
+		return product_line_type_name;
+	}
+	public void setProduct_line_type_name(String product_line_type_name) {
+		this.product_line_type_name = product_line_type_name;
+	}
 	
 	
 }
 }

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

@@ -444,6 +444,25 @@ public class ContractServiceImpl implements ContractService {
 						break;
 						break;
 				}
 				}
 			}				
 			}				
+			if(exportModel.getProduct_line_type()!=null) {
+				switch(exportModel.getProduct_line_type()) {
+				case "1" :
+					exportModel.setProduct_line_type_name("安防");
+					break;
+				case "2" :
+					exportModel.setProduct_line_type_name("交通");
+					break;
+				case "3" :
+					exportModel.setProduct_line_type_name("客流");
+					break;
+				case "4" :
+					exportModel.setProduct_line_type_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) {