【进度】

code/finance_serv/src/main/java/com/vion/financial/entity/Receipt.java

@@ -3,32 +3,34 @@ package com.vion.financial.entity;
 import java.util.Date;
 import java.util.Date;
 
 
 public class Receipt {
 public class Receipt {
-	private int receipt_unid;
+	private Integer receipt_unid;
 	private String contract_unid;
 	private String contract_unid;
-	private int receipt_progress;
+	private Integer receipt_progress;
 	private Double receipt_amount;
 	private Double receipt_amount;
 	private String oa_flow_id;
 	private String oa_flow_id;
 	private String receipt_note;
 	private String receipt_note;
 	private Date create_date;
 	private Date create_date;
-	public int getReceipt_unid() {
-		return receipt_unid;
-	}
-	public void setReceipt_unid(int receipt_unid) {
-		this.receipt_unid = receipt_unid;
-	}
+	
 	public String getContract_unid() {
 	public String getContract_unid() {
 		return contract_unid;
 		return contract_unid;
 	}
 	}
 	public void setContract_unid(String contract_unid) {
 	public void setContract_unid(String contract_unid) {
 		this.contract_unid = contract_unid;
 		this.contract_unid = contract_unid;
 	}
 	}
-	public int getReceipt_progress() {
+	
+	
+	public Integer getReceipt_unid() {
+		return receipt_unid;
+	}
+	public void setReceipt_unid(Integer receipt_unid) {
+		this.receipt_unid = receipt_unid;
+	}
+	public Integer getReceipt_progress() {
 		return receipt_progress;
 		return receipt_progress;
 	}
 	}
-	public void setReceipt_progress(int receipt_progress) {
+	public void setReceipt_progress(Integer receipt_progress) {
 		this.receipt_progress = receipt_progress;
 		this.receipt_progress = receipt_progress;
 	}
 	}
-	
 	public Double getReceipt_amount() {
 	public Double getReceipt_amount() {
 		return receipt_amount;
 		return receipt_amount;
 	}
 	}

code/finance_serv/src/main/java/com/vion/financial/entity/ReturnInfo.java

@@ -6,28 +6,30 @@ import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.vion.financial.serializer.DateYMDHMSJsonSerializer;
 import com.vion.financial.serializer.DateYMDHMSJsonSerializer;
 
 
 public class ReturnInfo {
 public class ReturnInfo {
-	private int reback_unid;
+	private Integer reback_unid;
 	private String contract_unid;
 	private String contract_unid;
-	private int reback_progress;
+	private Integer reback_progress;
 	private Date reback_date;
 	private Date reback_date;
 	private Double actual_reback_amount;
 	private Double actual_reback_amount;
 	private String reback_note;
 	private String reback_note;
-	public int getReback_unid() {
-		return reback_unid;
-	}
-	public void setReback_unid(int reback_unid) {
-		this.reback_unid = reback_unid;
-	}
+	
 	public String getContract_unid() {
 	public String getContract_unid() {
 		return contract_unid;
 		return contract_unid;
 	}
 	}
 	public void setContract_unid(String contract_unid) {
 	public void setContract_unid(String contract_unid) {
 		this.contract_unid = contract_unid;
 		this.contract_unid = contract_unid;
 	}
 	}
-	public int getReback_progress() {
+	
+	public Integer getReback_unid() {
+		return reback_unid;
+	}
+	public void setReback_unid(Integer reback_unid) {
+		this.reback_unid = reback_unid;
+	}
+	public Integer getReback_progress() {
 		return reback_progress;
 		return reback_progress;
 	}
 	}
-	public void setReback_progress(int reback_progress) {
+	public void setReback_progress(Integer reback_progress) {
 		this.reback_progress = reback_progress;
 		this.reback_progress = reback_progress;
 	}
 	}
 	@JsonSerialize(using = DateYMDHMSJsonSerializer.class)
 	@JsonSerialize(using = DateYMDHMSJsonSerializer.class)

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

@@ -7,7 +7,16 @@
 		receipt_note,
 		receipt_note,
 		</if>
 		</if>
 		create_date)
 		create_date)
-        values( #{contract_unid},#{receipt_progress},#{receipt_amount},#{oa_flow_id},
+        values( #{contract_unid},
+        <choose>
+        <when test="receipt_progress == null">
+        (select max(receipt_progress) from tb_receipt where contract_unid=#{contract_unid})
+        </when>
+        <otherwise>
+        #{receipt_progress}
+        </otherwise>
+        </choose>
+        ,#{receipt_amount},#{oa_flow_id},
         <if test="receipt_note !=null and receipt_note !=''">
         <if test="receipt_note !=null and receipt_note !=''">
         #{receipt_note},
         #{receipt_note},
         </if>
         </if>

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

@@ -17,9 +17,12 @@
 		)
 		)
 		values (
 		values (
 		#{contract_unid},
 		#{contract_unid},
-		<if test="reback_progress !=null and reback_progress !=''">
+		<if test="reback_progress !=null">
 		#{reback_progress},
 		#{reback_progress},
 		</if>
 		</if>
+		<if test="reback_progress ==null">
+		(select max(reback_progress) from tb_return_info where contract_unid=#{contract_unid}),
+		</if>
 		<if test="reback_date !=null">
 		<if test="reback_date !=null">
 		#{reback_date,typeHandler=com.vion.financial.handler.MilliDateTypeHandler},
 		#{reback_date,typeHandler=com.vion.financial.handler.MilliDateTypeHandler},
 		</if>
 		</if>

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

@@ -888,12 +888,12 @@ public class ContractServiceImpl implements ContractService {
 				returnInfo.setActual_reback_amount(importModel.getReback_amount());
 				returnInfo.setActual_reback_amount(importModel.getReback_amount());
 				returnInfo.setReback_date(importModel.getReback_date());
 				returnInfo.setReback_date(importModel.getReback_date());
 				returnInfo.setReback_note(importModel.getReback_note());
 				returnInfo.setReback_note(importModel.getReback_note());
-				returnInfo.setReback_progress(1);
+				//returnInfo.setReback_progress(1);
 				receipt.setContract_unid(importModel.getContract_unid());
 				receipt.setContract_unid(importModel.getContract_unid());
 				receipt.setReceipt_amount(importModel.getReceipt_amount());
 				receipt.setReceipt_amount(importModel.getReceipt_amount());
 				receipt.setOa_flow_id(importModel.getOa_flow_id());
 				receipt.setOa_flow_id(importModel.getOa_flow_id());
 				receipt.setReceipt_note(importModel.getReceipt_note());
 				receipt.setReceipt_note(importModel.getReceipt_note());
-				receipt.setReceipt_progress(1);
+				//receipt.setReceipt_progress(1);
 				if(importModel.getPre_acceptanc() != null && importModel.getPre_acceptanc().equals("是")) {
 				if(importModel.getPre_acceptanc() != null && importModel.getPre_acceptanc().equals("是")) {
 					projectAcceptanc_pre.setAcceptanc_type("1");
 					projectAcceptanc_pre.setAcceptanc_type("1");
 					projectAcceptanc_pre.setContract_unid(importModel.getContract_unid());
 					projectAcceptanc_pre.setContract_unid(importModel.getContract_unid());