上传还款计划

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

@@ -74,7 +74,6 @@ public class QuoteInfo  extends AbstractTask{
 						 capitalSideLoanOther.setLoanCode(map.get("AA_LOANCODE").toString());  //放款编号
 					 }
 					 
-					 SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 						Object aa_recedate = map.get("AA_RECEIVABLESARRIVALDATE");
 						//String aaredate = format.format(new Date());
 						if (aa_recedate!=null){
@@ -86,14 +85,28 @@ public class QuoteInfo  extends AbstractTask{
 					  if(map.get("AA_DUEAMOUNT") !=null){
 					      capitalSideLoanOther.setLoanAmount(Double.valueOf(map.get("AA_DUEAMOUNT").toString()));    //放款金额（元）
 					    }
+					  
+					  String formats = "yyyy-MM-dd HH:mm:ss";
+					  SimpleDateFormat sdf = new SimpleDateFormat(formats); 
+					 
 					  if(map.get("AA_MATURITYDATE") != null){
-						  capitalSideLoanOther.setReceivablesArrivalDate(map.get("AA_MATURITYDATE").toString());   //应收账款到期日
+						  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);   //应收账款到期日
 					  }
+					  
 					  if(map.get("AA_ACTPAYDATE") != null){
-						  capitalSideLoanOther.setLoanDate(map.get("AA_ACTPAYDATE").toString());   //放款日期
+						  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());   //放款日期
 					  }
 					  if(map.get("AA_MATURITYDATE") != null){
-						  capitalSideLoanOther.setRepaymentData(map.get("AA_MATURITYDATE").toString());  //还款日期
+						  String seconds = map.get("AA_MATURITYDATE").toString();
+						  String MATURITYDATE = sdf.format(new Date(Long.valueOf(seconds)));
+						  capitalSideLoanOther.setRepaymentData(MATURITYDATE);  //还款日期
+						  //capitalSideLoanOther.setRepaymentData(map.get("AA_MATURITYDATE").toString());  //还款日期
 					  }
 					  if(map.get("AA_INTERESTRATE") != null){
 						  capitalSideLoanOther.setLoanRate(Double.valueOf(map.get("AA_INTERESTRATE").toString())/100);    //放款年利率
@@ -142,7 +155,6 @@ public class QuoteInfo  extends AbstractTask{
 						  capitalSideLoanOther.setPersonInCharge(map.get("AA_TRUSTER").toString());   //经办人
 
 					  }
-					  Object status = map.get("AA_B2BSTATUS");
 					   if(map.get("AA_B2BSTATUS") != null ){
 						   capitalSideLoanOther.setStatus(Integer.valueOf(map.get("AA_B2BSTATUS").toString()));  //状态
 
@@ -156,12 +168,15 @@ public class QuoteInfo  extends AbstractTask{
 					  
 					//还款计划
 					  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());   //还款日期
+							  String seconds = reList.get(i).get("RP_BACKDATE").toString();
+							  String BACKDATE = sdf.format(new Date(Long.valueOf(seconds)));
+							  capitalSideRepaymentPlanOther.setRepaymentData(BACKDATE); 
+							 // 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());    //业务币种
@@ -214,12 +229,12 @@ public class QuoteInfo  extends AbstractTask{
 		 */
 	private List<Map<String, Object>> getAccountApplyUpload() {
 			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,"
+        +" 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_MATURITYDATE,AA_DUEAMOUNT,AA_LENDRATE,aa_interestrate,aa_bank,aa_custaccount,"
-        +" aa_backbankno,aa_truster from ACCOUNTAPPLY "
-        +" where AA_UPLOADSTATUS = '待上传' order by aa_code) where rownum < 100");
+        +" 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");
 			System.out.println(maps);
 		 return maps;
 		}
@@ -325,7 +340,7 @@ 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+"',null,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+"','"+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"
     			        + ",'"+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,null,null,null,'"+Finance.getFinanceDemandInfo().getCode()+"','"+Finance.getAcceptOfferInfo().getCode()+"',"