Merge remote-tracking branch 'origin/master'

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

@@ -83,7 +83,8 @@ public class QuoteInfo  extends AbstractTask{
 						
 					  if(Double.valueOf(map.get("AA_LENDRATE").toString()) != null && Double.valueOf(map.get("AA_LENDRATE").toString()) != 0){
 						  DecimalFormat df = new DecimalFormat("#.00");
-						  capitalSideLoanOther.setFinanceRate(Double.valueOf(df.format(map.get("AA_LENDRATE"))));   //融资比例
+						  double LENDRATE = Double.valueOf(df.format(map.get("AA_LENDRATE")))/100;
+						  capitalSideLoanOther.setFinanceRate(LENDRATE);   //融资比例
 					  }
 					  if(map.get("AA_DUEAMOUNT") !=null){
 					      capitalSideLoanOther.setLoanAmount(Double.valueOf(map.get("AA_DUEAMOUNT").toString()));    //放款金额（元）
@@ -96,14 +97,12 @@ public class QuoteInfo  extends AbstractTask{
 						  String seconds = map.get("AA_MATURITYDATE").toString();
 						  String MATURITYDATE = sdf.format(new Date(Long.valueOf(seconds)));
 						  //capitalSideLoanOther.setReceivablesArrivalDate(map.get("AA_MATURITYDATE").toString());   //应收账款到期日
-						  capitalSideLoanOther.setRepaymentData(MATURITYDATE);   //应收账款到期日
+						  capitalSideLoanOther.setReceivablesArrivalDate(MATURITYDATE);   //应收账款到期日
 					  }
 					  
 					  if(map.get("AA_ACTPAYDATE") != null){
 						  String ACTPAYDATE = map.get("AA_ACTPAYDATE").toString();
-						  String ACTPAYDATEs = sdf.format(new Date(Long.valueOf(ACTPAYDATE)));
-						  capitalSideLoanOther.setLoanDate(ACTPAYDATEs);   //放款日期
-						  //capitalSideLoanOther.setLoanDate(map.get("AA_ACTPAYDATE").toString());   //放款日期
+						  capitalSideLoanOther.setLoanDate(sdf.format(new Date(Long.valueOf(ACTPAYDATE))));   //放款日期
 					  }
 					  if(map.get("AA_MATURITYDATE") != null){
 						  String seconds = map.get("AA_MATURITYDATE").toString();
@@ -152,7 +151,8 @@ public class QuoteInfo  extends AbstractTask{
 						  capitalSideLoanOther.setSettle(iscloseoff);   //是否结清
 				      }
 					  if(map.get("AA_APPLYDATE") != null ){
-						  capitalSideLoanOther.setApplyDate(map.get("AA_APPLYDATE").toString());   //申请日期
+						  String APPLYDATE = map.get("AA_APPLYDATE").toString();
+						  capitalSideLoanOther.setApplyDate(sdf.format(new Date(Long.valueOf(APPLYDATE))));   //申请日期
 					  } 
 					  if(map.get("AA_TRUSTER") != null){
 						  capitalSideLoanOther.setPersonInCharge(map.get("AA_TRUSTER").toString());   //经办人
@@ -163,7 +163,8 @@ public class QuoteInfo  extends AbstractTask{
 
 					   }
 					  if(map.get("AA_AUDITDATE") != null ){
-						  capitalSideLoanOther.setApprovalDate(map.get("AA_AUDITDATE").toString());  //审批日期
+						  String AUDITDATE = map.get("AA_APPLYDATE").toString();
+						  capitalSideLoanOther.setApprovalDate(sdf.format(new Date(Long.valueOf(AUDITDATE))));    //审批日期
 					  }
 					  if(map.get("AA_AUDITMAN") != null){
 						  capitalSideLoanOther.setApprovalMan(map.get("AA_AUDITMAN").toString()); //审批人
@@ -234,7 +235,7 @@ public class QuoteInfo  extends AbstractTask{
 			List<Map<String, Object>> maps = jdbcTemplate.queryForList("select * from ("
         +" select AA_B2BSTATUS,AA_ID,AA_CODE,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_ISOVERDUE,AA_ISCLOSEOFF,AA_PERSONINCHARGE,AA_AUDITMAN,AA_AUDITDATE,AA_BACKDATE,AA_APPLYDATE,AA_ACTPAYDATE"
+        +" AA_ISOVERDUE,AA_ISCLOSEOFF,AA_PERSONINCHARGE,AA_AUDITMAN,AA_AUDITDATE,AA_BACKDATE,AA_APPLYDATE,AA_ACTPAYDATE,"
         +" AA_MATURITYDATE,AA_DUEAMOUNT,AA_LENDRATE,AA_INTERESTRATE,AA_BANK,AA_CUSTACCOUNT,"
         +" AA_BACKBANKNO,AA_TRUSTER from ACCOUNTAPPLY "
         +" where AA_UPLOADSTATUS = '待上传' and AA_ACTPAYDATE is not null order by aa_code) where rownum < 100");
@@ -346,7 +347,7 @@ public class QuoteInfo  extends AbstractTask{
 					    + "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,'"+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()+"',"
+    					+ ",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,"
     				    + "'"+Finance.getAcceptOfferInfo().getOfferRate() * 100+"','"+Finance.getAcceptOfferInfo().getPayments()+"',null,"