245465454

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

@@ -85,8 +85,8 @@ public class ImportModel {
 	private Date start_guarantee_date;
 	@Excel(name="维保服务期结束节点")
 	private Date end_guarantee_date;
-	@Excel(name="质保期开始节点")
-	private String mainten_start_point;
+/*	@Excel(name="质保期开始节点")
+	private String mainten_start_point;*/
 	@Excel(name="折扣金额备注")
 	private String deduct_amount_note;
 	@Excel(name="暂停金额备注")
@@ -454,14 +454,14 @@ public class ImportModel {
 		this.end_guarantee_date = end_guarantee_date;
 	}
 
-	public String getMainten_start_point() {
+/*	public String getMainten_start_point() {
 		return mainten_start_point;
 	}
 
 	public void setMainten_start_point(String mainten_start_point) {
 		this.mainten_start_point = mainten_start_point;
 	}
-
+*/
 	public String getDeduct_amount_note() {
 		return deduct_amount_note;
 	}

code/finance_serv/src/main/java/com/vion/financial/mapper/ContractMapper.java

@@ -21,4 +21,5 @@ public interface ContractMapper {
 	int count(SelectVo selectVo);
 	Boolean isDelete(String contract_unid);
 	List<ExportModel> exportContracts(SelectVo selectVo);
+	void actualDeleteOne(String contract_unid);
 }

code/finance_serv/src/main/java/com/vion/financial/mapping/ContractMapper.xml

@@ -708,4 +708,7 @@
 	<select id="countNumber" resultType="int">
 		select count(contract_unid) from tb_contract where is_delete=false
 	</select>
+	<delete id="actualDeleteOne" parameterType="String">
+		delete  from tb_contract where contract_unid = #{contract_unid}
+	</delete>
 </mapper>

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

@@ -501,17 +501,17 @@ public class ContractServiceImpl implements ContractService {
 			if(exportModel.getProduct_line_type()!=null) {
 				switch(exportModel.getProduct_line_type()) {
 				case "20001" :
-					exportModel.setProduct_line_type_name("安防");
+					exportModel.setProduct_line_type_name("智慧城市");
 					break;
 				case "20002" :
-					exportModel.setProduct_line_type_name("交通");
+					exportModel.setProduct_line_type_name("智慧商业");
 					break;
 				case "20003" :
-					exportModel.setProduct_line_type_name("客流");
+					exportModel.setProduct_line_type_name("其他");
 					break;
-				case "20004" :
+/*				case "20004" :
 					exportModel.setProduct_line_type_name("维保");
-					break;
+					break;*/
 				default:
 					break;
 			}
@@ -584,6 +584,9 @@ public class ContractServiceImpl implements ContractService {
 			PaymentAgree mainten_aymentAgree=null;
 			DeliverGoods deliverGoods=null;
 			for(ImportModel importModel:successList) {
+				if(contractMapper.queryOne(importModel.getContract_unid())!=null) {
+					contractMapper.actualDeleteOne(importModel.getContract_unid());
+				}
 				contractVo=new ContractVo();
 				returnInfo=new ReturnInfo();
 				receipt=new Receipt();
@@ -602,18 +605,18 @@ public class ContractServiceImpl implements ContractService {
 				contractVo.setSign_date(importModel.getSign_date());
 				if(importModel.getProduct_line_type_name()!=null) {
 					switch(importModel.getProduct_line_type_name()) {
-					case "安防" :
+					case "智慧城市" :
 						contractVo.setProduct_line_type("20001");
 						break;
-					case "交通" :
+					case "智慧商业" :
 						contractVo.setProduct_line_type("20002");
 						break;
-					case "客流" :
+					case "其他" :
 						contractVo.setProduct_line_type("20003");
 						break;
-					case "维保" :
+/*					case "维保" :
 						contractVo.setProduct_line_type("20004");
-						break;
+						break;*/
 						default:
 						break;
 					}
@@ -657,15 +660,15 @@ public class ContractServiceImpl implements ContractService {
 					case "已完成":
 						contractVo.setContract_state("30001");
 						break;
-					case "施工中":
+					case "进行中":
 						contractVo.setContract_state("30003");
 						break;
-					case "待发货":
+/*					case "待发货":
 						contractVo.setContract_state("30002");
 						break;
 					case "项目暂停":
 						contractVo.setContract_state("30004");
-						break;
+						break;*/
 						default:
 							break;
 					}
@@ -676,15 +679,15 @@ public class ContractServiceImpl implements ContractService {
 					case "供货":
 						contractVo.setContract_type("40001");
 						break;
-					case "施工":
+/*					case "施工":
 						contractVo.setContract_type("40002");
-						break;
+						break;*/
 					case "集成":
 						contractVo.setContract_type("40003");
 						break;
-					case "维保":
+/*					case "维保":
 						contractVo.setContract_type("40004");
-						break;
+						break;*/
 						default:
 							break;
 					}
@@ -731,7 +734,7 @@ public class ContractServiceImpl implements ContractService {
 				}
 				contractVo.setStart_guarantee_date(importModel.getStart_guarantee_date());
 				contractVo.setEnd_guarantee_date(importModel.getEnd_guarantee_date());
-				if(importModel.getMainten_start_point()!=null) {
+/*				if(importModel.getMainten_start_point()!=null) {
 					switch(importModel.getMainten_start_point()) {
 					case "签订时间":
 						contractVo.setMainten_start_point("60001");
@@ -745,7 +748,7 @@ public class ContractServiceImpl implements ContractService {
 						default:
 							break;
 					}
-				}
+				}*/
 				contractVo.setContract_amount_note(importModel.getDeduct_amount_note());
 				contractVo.setReback_note(importModel.getStop_amount_note());
 				contractVo.setContract_remain_note(importModel.getExemptions_amount_note());