接口调整

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

@@ -81,7 +81,7 @@ public class QuoteInfo  extends AbstractTask{
 							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()));   //融资比例
+						  capitalSideLoanOther.setFinanceRate(Double.valueOf(map.get("AA_LENDRATE").toString())/100);   //融资比例
 					  }
 					  if(map.get("AA_DUEAMOUNT") !=null){
 					      capitalSideLoanOther.setLoanAmount(Double.valueOf(map.get("AA_DUEAMOUNT").toString()));    //放款金额（元）
@@ -95,20 +95,20 @@ public class QuoteInfo  extends AbstractTask{
 					  if(map.get("AA_MATURITYDATE") != null){
 						  capitalSideLoanOther.setRepaymentData(map.get("AA_MATURITYDATE").toString());  //还款日期
 					  }
-					  if(map.get("aa_interestrate") != null){
-						  capitalSideLoanOther.setLoanRate(Double.valueOf(map.get("aa_interestrate").toString()));    //放款年利率
+					  if(map.get("AA_INTERESTRATE") != null){
+						  capitalSideLoanOther.setLoanRate(Double.valueOf(map.get("AA_INTERESTRATE").toString())/100);    //放款年利率
 					  }
 					  if(map.get("AA_REPAYMENTFREQUENCY") != null){
 						  capitalSideLoanOther.setRepaymentFrequency(map.get("AA_REPAYMENTFREQUENCY").toString());   //还息频率
 					  }
-					   if(map.get("aa_bank") != null){
-						   capitalSideLoanOther.setFsCollectionBank(map.get("aa_bank").toString());    //客户收款开户行
+					   if(map.get("AA_BANK") != null){
+						   capitalSideLoanOther.setFsCollectionBank(map.get("AA_BANK").toString());    //客户收款开户行
 					   }
-					    if(map.get("aa_backbankno") != null){
-					    	capitalSideLoanOther.setFsCollectionAccount(map.get("aa_backbankno").toString());   //客户收款账号
+					    if(map.get("AA_BACKBANKNO") != null){
+					    	capitalSideLoanOther.setFsCollectionAccount(map.get("AA_BACKBANKNO").toString());   //客户收款账号
 					    }
-					  if(map.get("aa_custaccount") != null){
-						  capitalSideLoanOther.setFsCollectionName(map.get("aa_custaccount").toString());   //客户收款账号名称
+					  if(map.get("AA_CUSTACCOUNT") != null){
+						  capitalSideLoanOther.setFsCollectionName(map.get("AA_CUSTACCOUNT").toString());   //客户收款账号名称
 					  }
 					  if(map.get("AA_RECEIPTFORLOAN") != null){
 						  capitalSideLoanOther.setReceiptForLoan(Double.valueOf(map.get("AA_RECEIPTFORLOAN").toString()));  //借据余额（元）
@@ -116,17 +116,30 @@ public class QuoteInfo  extends AbstractTask{
 					  if(map.get("AA_INTERESTPAYABLE") != null){
 						  capitalSideLoanOther.setInterestPayable(Double.valueOf(map.get("AA_INTERESTPAYABLE").toString()));   //应还利息（元)
 					  }
-					  if(map.get("aa_isoverdue") != null){
-						  capitalSideLoanOther.setBeOverdue(Integer.valueOf(map.get("aa_isoverdue").toString()));   //是否逾期
+					  int isoverdue = 0;
+					  if(map.get("AA_ISOVERDUE").equals("是")){
+						  isoverdue = 1;
+					  }else{
+						  isoverdue = 0;
 					  }
-					  if(map.get("aa_iscloseoff") != null ){
-						  capitalSideLoanOther.setSettle(Integer.valueOf(map.get("aa_iscloseoff").toString()));   //是否结清
+					  
+					  int iscloseoff = 0;
+					  if(map.get("AA_ISCLOSEOFF").equals("是")){
+						  iscloseoff = 1;
+					  }else{
+						  iscloseoff = 0;
+					  }
+					  if(map.get("AA_ISOVERDUE") != null){
+						  capitalSideLoanOther.setBeOverdue(isoverdue);   //是否逾期
+					  }
+					  if(map.get("AA_ISCLOSEOFF") != null ){
+						  capitalSideLoanOther.setSettle(iscloseoff);   //是否结清
 				      }
 					  if(map.get("AA_APPLYDATE") != null ){
 						  capitalSideLoanOther.setApplyDate(map.get("AA_APPLYDATE").toString());   //申请日期
 					  } 
-					  if(map.get("aa_truster") != null){
-						  capitalSideLoanOther.setPersonInCharge(map.get("aa_truster").toString());   //经办人
+					  if(map.get("AA_TRUSTER") != null){
+						  capitalSideLoanOther.setPersonInCharge(map.get("AA_TRUSTER").toString());   //经办人
 
 					  }
 					  Object status = map.get("AA_B2BSTATUS");
@@ -134,39 +147,37 @@ public class QuoteInfo  extends AbstractTask{
 						   capitalSideLoanOther.setStatus(Integer.valueOf(map.get("AA_B2BSTATUS").toString()));  //状态
 
 					   }
-					  if(map.get("aa_auditdate") != null ){
-						  capitalSideLoanOther.setApprovalDate(map.get("aa_auditdate").toString());  //审批日期
+					  if(map.get("AA_AUDITDATE") != null ){
+						  capitalSideLoanOther.setApprovalDate(map.get("AA_AUDITDATE").toString());  //审批日期
 					  }
-					  if(map.get("aa_auditman") != null){
-						  capitalSideLoanOther.setApprovalMan(map.get("aa_auditman").toString()); //审批人
+					  if(map.get("AA_AUDITMAN") != null){
+						  capitalSideLoanOther.setApprovalMan(map.get("AA_AUDITMAN").toString()); //审批人
 					  }
 					  
 					//还款计划
-					 /* jdbcTemplate.queryForList("select rp_backdate,rp_currency,rp_principal,rp_interest,rp_thisback,rp_truster from ReimbursementPlan"
-					  		+ " left join AccountApply on aa_code = rp_aacode", "")*/
 					  List<Map<String,Object>> reList = jdbcTemplate.queryForList(" select rp_backdate,rp_currency,rp_principal,rp_interest,rp_thisback,rp_truster from ReimbursementPlan "
-							   	+" left join AccountApply on aa_code = rp_aacode where AA_B2BSTATUS= '1002' and  aa_code = '"+map.get("aa_code")+"'"); 
+							   	+" left join AccountApply on aa_code = rp_aacode where AA_B2BSTATUS= '1002' and  aa_code = '"+map.get("AA_CODE")+"'"); 
 					  for(int i = 0;i<reList.size();i++){
 						
 						  OpenCapitalSideRepaymentPlanOther.Builder capitalSideRepaymentPlanOther = OpenCapitalSideRepaymentPlanOther.newBuilder();
-						  if(reList.get(i).get("rp_backdate") != null){
-							  capitalSideRepaymentPlanOther.setRepaymentData(reList.get(i).get("rp_backdate").toString());   //还款日期
+						  if(reList.get(i).get("RP_BACKDATE") != null){
+							  capitalSideRepaymentPlanOther.setRepaymentData(reList.get(i).get("RP_BACKDATE").toString());   //还款日期
 						  }
-						  if(reList.get(i).get("rp_currency") != null){
-							   capitalSideRepaymentPlanOther.setCurrency(reList.get(i).get("rp_currency").toString());    //业务币种
+						  if(reList.get(i).get("RP_CURRENCY") != null){
+							   capitalSideRepaymentPlanOther.setCurrency(reList.get(i).get("RP_CURRENCY").toString());    //业务币种
 						  } 
-						  if(reList.get(i).get("rp_principal") != null){
-							   capitalSideRepaymentPlanOther.setCapitalAmount(Double.valueOf(reList.get(i).get("rp_principal").toString()));   //本期应还本金  
+						  if(reList.get(i).get("RP_PRINCIPAL") != null){
+							   capitalSideRepaymentPlanOther.setCapitalAmount(Double.valueOf(reList.get(i).get("RP_PRINCIPAL").toString()));   //本期应还本金  
 						  }
 						    
-						  if(reList.get(i).get("rp_interest") != null){
-							   capitalSideRepaymentPlanOther.setInterest(Double.valueOf(reList.get(i).get("rp_interest").toString()));     //本期应还利息  
+						  if(reList.get(i).get("RP_INTEREST") != null){
+							   capitalSideRepaymentPlanOther.setInterest(Double.valueOf(reList.get(i).get("RP_INTEREST").toString()));     //本期应还利息  
 						  }
-						  if(reList.get(i).get("rp_thisback") != null){
-							   capitalSideRepaymentPlanOther.setAmount(Double.valueOf(reList.get(i).get("rp_thisback").toString()));    //本期还款额  
+						  if(reList.get(i).get("RP_THISBACK") != null){
+							   capitalSideRepaymentPlanOther.setAmount(Double.valueOf(reList.get(i).get("RP_THISBACK").toString()));    //本期还款额  
 						  }
-						  if(reList.get(i).get("rp_truster") != null){
-							   capitalSideRepaymentPlanOther.setPersonInCharge(reList.get(i).get("rp_truster").toString());    //经办人  
+						  if(reList.get(i).get("RP_TRUSTER") != null){
+							   capitalSideRepaymentPlanOther.setPersonInCharge(reList.get(i).get("RP_TRUSTER").toString());    //经办人  
 						  }
 						    req.addCapitalSideRepaymentPlan(capitalSideRepaymentPlanOther);
 					  }
@@ -282,20 +293,20 @@ public class QuoteInfo  extends AbstractTask{
 			sqls.addAll(getFinanceOfferDetailsSqls(Finance.getAcceptOfferInfo().getCode()));
 			
 			//放款记录
-			if(Finance.getAcceptOfferInfo().getStatus() == 1002){
+			if(Finance.getFinanceDemandInfo().getStatus() == 1002){
  				String aaCode = jdbcTemplate.generateCode("AccountApply!YSB2", 2);
  				
  				String Pay = null;
  				if(Finance.getAcceptOfferInfo().getPayments().equals("到期一次性还本付息")){
  					Pay = "到期一次性付息"; 
  				}else{
- 					Pay = Finance.getAcceptOfferInfo().getPayments();
+ 					Pay = "按月还息";
  				}
 				sqlloand.add("MERGE INTO AccountApply a"
 					    +" 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()+"'"
+					    +" UPDATE SET a.AA_CUSTNAME ='"+Finance.getFinanceDemandInfo().getCsUserName()+"',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, "