Merge remote-tracking branch 'origin/master'

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

@@ -80,32 +80,35 @@ public class QuoteInfo  extends AbstractTask{
 						if (aa_recedate!=null){
 							capitalSideLoanOther.setReceivablesArrivalDate(map.get("AA_RECEIVABLESARRIVALDATE").toString());
 						}
-					  if(Double.valueOf(map.get("AA_FINANCERATE").toString()) != null && Double.valueOf(map.get("AA_FINANCERATE").toString()) != 0){
-						  capitalSideLoanOther.setFinanceRate(Double.valueOf(map.get("AA_FINANCERATE").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()));   //融资比例
 					  }
-					  if(map.get("AA_LOANAMOUNT") !=null){
-					      capitalSideLoanOther.setLoanAmount(Double.valueOf(map.get("AA_LOANAMOUNT").toString()));    //放款金额（元）
+					  if(map.get("AA_DUEAMOUNT") !=null){
+					      capitalSideLoanOther.setLoanAmount(Double.valueOf(map.get("AA_DUEAMOUNT").toString()));    //放款金额（元）
 					    }
-					  if(map.get("AA_LOANRATE") != null){
-						  capitalSideLoanOther.setLoanDate(map.get("AA_LOANRATE").toString());   //放款日期
+					  if(map.get("AA_MATURITYDATE") != null){
+						  capitalSideLoanOther.setReceivablesArrivalDate(map.get("AA_MATURITYDATE").toString());   //应收账款到期日
 					  }
-					  if(map.get("AA_BACKDATE") != null){
-						  capitalSideLoanOther.setRepaymentData(map.get("AA_BACKDATE").toString());  //还款日期
+					  if(map.get("AA_ACTPAYDATE") != null){
+						  capitalSideLoanOther.setLoanDate(map.get("AA_ACTPAYDATE").toString());   //放款日期
 					  }
-					  if(map.get("AA_LOANRATE") != null){
-						  capitalSideLoanOther.setLoanRate(Double.valueOf(map.get("AA_LOANRATE").toString()));    //放款年利率
+					  if(map.get("AA_MATURITYDATE") != null){
+						  capitalSideLoanOther.setRepaymentData(map.get("AA_MATURITYDATE").toString());  //还款日期
+					  }
+					  if(map.get("FINANCINGRATIO") != null){
+						  capitalSideLoanOther.setLoanRate(Double.valueOf(map.get("FINANCINGRATIO").toString()));    //放款年利率
 					  }
 					  if(map.get("AA_REPAYMENTFREQUENCY") != null){
 						  capitalSideLoanOther.setRepaymentFrequency(map.get("AA_REPAYMENTFREQUENCY").toString());   //还息频率
 					  }
-					   if(map.get("AA_FSCOLLECTIONBANK") != null){
-						   capitalSideLoanOther.setFsCollectionBank(map.get("AA_FSCOLLECTIONBANK").toString());    //客户收款开户行
+					   if(map.get("aa_bank") != null){
+						   capitalSideLoanOther.setFsCollectionBank(map.get("aa_bank").toString());    //客户收款开户行
 					   }
-					    if(map.get("AA_FSCOLLECTIONACCOUNT") != null){
-					    	capitalSideLoanOther.setFsCollectionAccount(map.get("AA_FSCOLLECTIONACCOUNT").toString());   //客户收款账号
+					    if(map.get("aa_backbankno") != null){
+					    	capitalSideLoanOther.setFsCollectionAccount(map.get("aa_backbankno").toString());   //客户收款账号
 					    }
-					  if(map.get("AA_FSCOLLECTIONNAME") != null){
-						  capitalSideLoanOther.setFsCollectionName(map.get("AA_FSCOLLECTIONNAME").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()));  //借据余额（元）
@@ -114,7 +117,7 @@ public class QuoteInfo  extends AbstractTask{
 						  capitalSideLoanOther.setInterestPayable(Double.valueOf(map.get("AA_INTERESTPAYABLE").toString()));   //应还利息（元)
 					  }
 					  if(map.get("AA_BEOVERDUE") != null){
-						  capitalSideLoanOther.setBeOverdue(Integer.valueOf(map.get("AA_BEOVERDUE").toString()));   //是否结清
+						  capitalSideLoanOther.setBeOverdue(Integer.valueOf(map.get("AA_BEOVERDUE").toString()));   //是否逾期
 					  }
 					  if(map.get("AA_SETTLE") != null ){
 						  capitalSideLoanOther.setSettle(Integer.valueOf(map.get("AA_SETTLE").toString()));   //是否结清
@@ -122,20 +125,21 @@ public class QuoteInfo  extends AbstractTask{
 					  if(map.get("AA_APPLYDATE") != null ){
 						  capitalSideLoanOther.setApplyDate(map.get("AA_APPLYDATE").toString());   //申请日期
 					  } 
-					  if(map.get("AA_PERSONINCHARGE") != null){
-						  capitalSideLoanOther.setPersonInCharge(map.get("AA_PERSONINCHARGE").toString());   //状态
+					  if(map.get("aa_truster") != null){
+						  capitalSideLoanOther.setPersonInCharge(map.get("aa_truster").toString());   //经办人
 
 					  }
 					   if(map.get("AA_B2BSTATUS") != null ){
 						   capitalSideLoanOther.setStatus(Integer.valueOf(map.get("AA_B2BSTATUS").toString()));  //状态
 
 					   }
-					  if(map.get("AA_APPROVALDATE") != null ){
-						  capitalSideLoanOther.setApprovalDate(map.get("AA_APPROVALDATE").toString());  //审批人
+					  if(map.get("aa_auditdate") != null ){
+						  capitalSideLoanOther.setApprovalDate(map.get("aa_auditdate").toString());  //审批日期
 					  }
-					  if(map.get("AA_APPROVALMAN") != null){
-						  capitalSideLoanOther.setApprovalMan(map.get("AA_APPROVALMAN").toString()); //审批人
+					  if(map.get("aa_auditman") != null){
+						  capitalSideLoanOther.setApprovalMan(map.get("aa_auditman").toString()); //审批人
 					  }
+					  //还款计划
 					  OpenCapitalSideRepaymentPlanOther.Builder capitalSideRepaymentPlanOther = OpenCapitalSideRepaymentPlanOther.newBuilder();
 					    capitalSideRepaymentPlanOther.setRepaymentData("2020-2-25");
 					    capitalSideRepaymentPlanOther.setCurrency("RMB");
@@ -179,7 +183,9 @@ public class QuoteInfo  extends AbstractTask{
 			List<Map<String, Object>> maps = jdbcTemplate.queryForList(" select * from ("
         +" select AA_ID,AA_FINANCEDEMANDCODE,AA_LOANCODE,AA_CSENUU,AA_FSENUU,AA_RECEIVABLESARRIVALDATE,AA_FINANCERATE,AA_LOANAMOUNT,"
         +" AA_LOANRATE,AA_REPAYMENTFREQUENCY,AA_FSCOLLECTIONBANK,AA_FSCOLLECTIONACCOUNT,AA_FSCOLLECTIONNAME,AA_RECEIPTFORLOAN,AA_INTERESTPAYABLE,"
-        +" AA_BEOVERDUE,AA_SETTLE,AA_PERSONINCHARGE,AA_APPROVALDATE,AA_APPROVALMAN,AA_BACKDATE,AA_APPLYDATE,AA_B2BSTATUS from ACCOUNTAPPLY "
+        +" AA_BEOVERDUE,AA_SETTLE,AA_PERSONINCHARGE,aa_auditman,aa_auditdate,AA_BACKDATE,AA_APPLYDATE,AA_ACTPAYDATE"
+        + "AA_B2BSTATUS,AA_MATURITYDATE,AA_DUEAMOUNT,AA_LENDRATE,FINANCINGRATIO,aa_bank,aa_custaccount,"
+        + "aa_backbankno,aa_truster from ACCOUNTAPPLY left join  ACCEPTOFFER on FINANCECODE = AA_FINANCEDEMANDCODE "
         +" where AA_UPLOADSTATUS = '待上传' order by aa_code) where rownum < 100");
 			System.out.println(maps);
 		 return maps;
@@ -268,7 +274,7 @@ public class QuoteInfo  extends AbstractTask{
 	        			+ "AA_FSENUU, AA_FSNAME, AA_RECEIVABLESARRIVALDATE, AA_FINANCERATE, AA_LOANAMOUNT, AA_LOANRATE, "
 	        			+ "AA_REPAYMENTFREQUENCY, AA_FSCOLLECTIONBANK, AA_FSCOLLECTIONACCOUNT, AA_FSCOLLECTIONNAME, "
 	        			+ "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_APPROVALMAN, AA_UPLOADSTATUS,AA_B2BSTATUS,AA_REPAYMENTDATA,AA_B2BAA_APPLYDATE,AA_B2BAA_AUDITDATE,AA_EDCODE) "
 					    
 					    + "values (AccountApply_seq.nextval,'"+aaCode+"',null,null,'在录入',null,null,null,' ',null,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,null,null,null"
@@ -279,7 +285,7 @@ public class QuoteInfo  extends AbstractTask{
     				    + "'"+Finance.getAcceptOfferInfo().getOfferRate() * 100+"','"+Finance.getAcceptOfferInfo().getPayments()+"',null,"
     				    + "null,null,null,null,"
     				    + "null,null,'"+Finance.getFinanceDemandInfo().getCsUserName()+"',null,null,'已上传',"
-    				    + "'"+Finance.getAcceptOfferInfo().getStatus()+"',null,null,null)");
+    				    + "'"+Finance.getAcceptOfferInfo().getStatus()+"',null,null,null,null)");
 			}
 		}
         jdbcTemplate.batchExecute(sqls);  //报价信息