放款接口调整

src/main/java/com/uas/erp/schedular/finance/task/QuoteInfo.java

@@ -1,4 +1,5 @@
 package com.uas.erp.schedular.finance.task;
+import java.text.DecimalFormat;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Calendar;
@@ -79,21 +80,23 @@ public class QuoteInfo  extends AbstractTask{
 						if (aa_recedate!=null){
 							capitalSideLoanOther.setReceivablesArrivalDate(map.get("AA_RECEIVABLESARRIVALDATE").toString());
 						}
+						
 					  if(Double.valueOf(map.get("AA_LENDRATE").toString()) != null && Double.valueOf(map.get("AA_LENDRATE").toString()) != 0){
-						  capitalSideLoanOther.setFinanceRate(Double.valueOf(map.get("AA_LENDRATE").toString())/100);   //融资比例
+						  DecimalFormat df = new DecimalFormat("#.00");
+						  capitalSideLoanOther.setFinanceRate(Double.valueOf(df.format(map.get("AA_LENDRATE"))));   //融资比例
 					  }
 					  if(map.get("AA_DUEAMOUNT") !=null){
 					      capitalSideLoanOther.setLoanAmount(Double.valueOf(map.get("AA_DUEAMOUNT").toString()));    //放款金额（元）
 					    }
 					  
-					  String formats = "yyyy-MM-dd HH:mm:ss";
+					  String formats = "yyyy-MM-dd";
 					  SimpleDateFormat sdf = new SimpleDateFormat(formats); 
 					 
 					  if(map.get("AA_MATURITYDATE") != null){
 						  String seconds = map.get("AA_MATURITYDATE").toString();
 						  String MATURITYDATE = sdf.format(new Date(Long.valueOf(seconds)));
 						  //capitalSideLoanOther.setReceivablesArrivalDate(map.get("AA_MATURITYDATE").toString());   //应收账款到期日
-						  capitalSideLoanOther.setReceivablesArrivalDate(MATURITYDATE);   //应收账款到期日
+						  capitalSideLoanOther.setRepaymentData(MATURITYDATE);   //应收账款到期日
 					  }
 					  
 					  if(map.get("AA_ACTPAYDATE") != null){
@@ -321,7 +324,7 @@ public class QuoteInfo  extends AbstractTask{
 					    +" USING (SELECT nvl(max(AA_ID),0) ID from AccountApply where AA_FINANCEDEMANDCODE = '"+Finance.getFinanceDemandInfo().getCode()+"') b"
 					    +" ON (a.AA_ID = b.ID)"
 					    +" WHEN MATCHED THEN "
-					    +" UPDATE SET a.AA_CUSTNAME ='"+Finance.getFinanceDemandInfo().getCsUserName()+"',a.AA_B2BSTATUS = '"+Finance.getFinanceDemandInfo().getStatus()+"'"
+					    +" UPDATE SET a.AA_B2BSTATUS = '"+Finance.getFinanceDemandInfo().getStatus()+"'"
 					    +" WHEN NOT MATCHED THEN "
                         +" INSERT(AA_ID, AA_CODE, AA_CUSTCODE, AA_CUSTNAME, AA_STATUS, AA_SACODES, AA_BILLCODES,"
 	        			+ " AA_BILLAMOUNT, AA_CURRENCY, AA_DUEAMOUNT, AA_BANK, AA_BACKBANKNO, AA_LOANDATE, AA_BACKDATE, "
@@ -340,9 +343,9 @@ public class QuoteInfo  extends AbstractTask{
 	        			+ "AA_RECEIPTFORLOAN, AA_INTERESTPAYABLE, AA_BEOVERDUE, AA_SETTLE, AA_PERSONINCHARGE, AA_APPROVALDATE, "
 	        			+ "AA_APPROVALMAN, AA_UPLOADSTATUS,AA_B2BSTATUS,AA_REPAYMENTDATA,AA_B2BAA_APPLYDATE,AA_B2BAA_AUDITDATE,AA_EDCODE) "
 					    
-					    + "values (AccountApply_seq.nextval,'"+aaCode+"','"+Finance.getAcceptOfferInfo().getFinanceSideName()+"',null,'在录入',null,null,null,' ','"+Finance.getAcceptOfferInfo().getOfferAmount()+"',null,null,null,null,'"+Finance.getAcceptOfferInfo().getOfferRate() * 100+"',null,'"+Finance.getAcceptOfferInfo().getFinancingRatio()+"',null,null,null,null,null,null"
+					    + "values (AccountApply_seq.nextval,'"+aaCode+"',null,'"+Finance.getAcceptOfferInfo().getFinanceSideName()+"','在录入',null,null,null,' ','"+Finance.getAcceptOfferInfo().getOfferAmount()+"',null,null,null,null,'"+Finance.getAcceptOfferInfo().getOfferRate() * 100+"',null,'"+Finance.getAcceptOfferInfo().getFinancingRatio()+"',null,null,null,null,null,null"
     			        + ",'"+Finance.getFinanceDemandInfo().getCsUserName()+"',sysdate,null,sysdate,null,null,'ENTERING',null,null,'"+Pay+"',null,null"
-    				    + ",null,null,null,null,null,null,null,null,null,null,null,null,null,'"+Finance.getFinanceDemandInfo().getAmount()+"',null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null"
+    				    + ",null,null,null,null,null,'否',null,null,'否',null,null,null,null,'"+Finance.getFinanceDemandInfo().getAmount()+"',null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null"
     					+ ",null,null,null,null,null,null,null,null,null,null,null,null,null,null,'"+Finance.getFinanceDemandInfo().getCode()+"','"+Finance.getAcceptOfferInfo().getCode()+"',"
     					+ "'"+aaCode+"','"+Finance.getAcceptOfferInfo().getCsEnuu()+"','"+Finance.getFinanceDemandInfo().getFsEnuu()+"','"+Finance.getFinanceDemandInfo().getFsEnName()+"',"
     				    + "null,'"+Finance.getAcceptOfferInfo().getFinancingRatio() * 100+"',null,"