215452215454

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

@@ -25,7 +25,7 @@ public class ImportModel {
 	@DateTimeFormat(pattern="yyyy-MM-dd")
 	@DateTimeFormat(pattern="yyyy-MM-dd")
 	private Date sign_date;
 	private Date sign_date;
 	@Excel(name="产品线类型")
 	@Excel(name="产品线类型")
-	@Pattern(regexp="[智慧城市,智慧商业,其它]")
+//	@Pattern(regexp="[智慧城市,智慧商业,其它]")
 	private String product_line_type_name;
 	private String product_line_type_name;
 	@Excel(name="销售员")
 	@Excel(name="销售员")
 	private String salesperson_name;
 	private String salesperson_name;
@@ -50,11 +50,11 @@ public class ImportModel {
 	@Excel(name="折扣金额")
 	@Excel(name="折扣金额")
 	private Double deduct_amount;
 	private Double deduct_amount;
 	@Excel(name="合同状态")
 	@Excel(name="合同状态")
-	@Pattern(regexp="[已完成,进行中]")
+//	@Pattern(regexp="[已完成,进行中]")
 	private String contract_state_name;
 	private String contract_state_name;
 	@Excel(name="回款金额")
 	@Excel(name="回款金额")
 	private Double reback_amount;
 	private Double reback_amount;
-	@Excel(name="回款日期",importFormat="yyyy-MM-dd")
+	@Excel(name="回款日期")
 	private Date reback_date;
 	private Date reback_date;
 	@Excel(name="回款备注")
 	@Excel(name="回款备注")
 	private String reback_note;
 	private String reback_note;
@@ -66,31 +66,31 @@ public class ImportModel {
 	private String receipt_note;
 	private String receipt_note;
 	@Excel(name="初验")
 	@Excel(name="初验")
 	private String pre_acceptanc;
 	private String pre_acceptanc;
-	@Excel(name="初验日期",importFormat="yyyy-MM-dd")
+	@Excel(name="初验日期")
 	private Date pre_acceptanc_date;
 	private Date pre_acceptanc_date;
 	@Excel(name="初验备注")
 	@Excel(name="初验备注")
 	private String pre_acceptanc_note;
 	private String pre_acceptanc_note;
 	@Excel(name="终验")
 	@Excel(name="终验")
 	private String end_acceptanc;
 	private String end_acceptanc;
-	@Excel(name="终验日期",importFormat="yyyy-MM-dd")
+	@Excel(name="终验日期")
 	private Date end_acceptanc_date;
 	private Date end_acceptanc_date;
 	@Excel(name="终验备注")
 	@Excel(name="终验备注")
 	private String end_acceptanc_note;
 	private String end_acceptanc_note;
 	@Excel(name="质保周期")
 	@Excel(name="质保周期")
 	private Integer guarantee_period;
 	private Integer guarantee_period;
 	@Excel(name="合同性质")
 	@Excel(name="合同性质")
-	@Pattern(regexp="[供货,集成]")
+//	@Pattern(regexp="[供货,集成]")
 	private String contract_type;
 	private String contract_type;
 	@Excel(name="是否归档")
 	@Excel(name="是否归档")
 	private String is_archive;
 	private String is_archive;
 	@Excel(name="确认收入金额")
 	@Excel(name="确认收入金额")
 	private Double confirm_income_amount;
 	private Double confirm_income_amount;
 	@Excel(name="账款状态")
 	@Excel(name="账款状态")
-	@Pattern(regexp="[正常验收款,正常维保,正常预付款,正常到货款,正常质保款,逾期预付款,逾期到货款,逾期验收款,逾期质保款]")
+//	@Pattern(regexp="[正常验收款,正常维保,正常预付款,正常到货款,正常质保款,逾期预付款,逾期到货款,逾期验收款,逾期质保款]")
 	private String amount_state_name;
 	private String amount_state_name;
-	@Excel(name="维保服务期开始节点",importFormat="yyyy-MM-dd")
+	@Excel(name="维保服务期开始节点")
 	private Date start_guarantee_date;
 	private Date start_guarantee_date;
-	@Excel(name="维保服务期结束节点",importFormat="yyyy-MM-dd")
+	@Excel(name="维保服务期结束节点")
 	private Date end_guarantee_date;
 	private Date end_guarantee_date;
 /*	@Excel(name="质保期开始节点")
 /*	@Excel(name="质保期开始节点")
 	private String mainten_start_point;*/
 	private String mainten_start_point;*/
@@ -129,9 +129,9 @@ public class ImportModel {
 	private Double mainten_payment_propority;
 	private Double mainten_payment_propority;
 	@Excel(name="质保款付款条件")
 	@Excel(name="质保款付款条件")
 	private String mainten_payment_requirement;
 	private String mainten_payment_requirement;
-	@Excel(name="发货日期",importFormat="yyyy-MM-dd")
+	@Excel(name="发货日期")
 	private Date deliver_date;
 	private Date deliver_date;
-	@Excel(name="到货验收时间",importFormat="yyyy-MM-dd")
+	@Excel(name="到货验收时间")
 	private Date goods_acceptanc_date;
 	private Date goods_acceptanc_date;
 	@Excel(name="质保款类型")//只有两种1和2
 	@Excel(name="质保款类型")//只有两种1和2
 	@Pattern(regexp="[1,2]")
 	@Pattern(regexp="[1,2]")

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

@@ -906,7 +906,7 @@ public class ContractServiceImpl implements ContractService {
 					is_repeat=false;
 					is_repeat=false;
 					repeatListId.add(contractVo.getContract_unid());
 					repeatListId.add(contractVo.getContract_unid());
 				}
 				}
-			}if(is_repeat) {
+			}if(!is_repeat) {
 				return repeatListId;
 				return repeatListId;
 			}else {
 			}else {
 				return successCode;
 				return successCode;