Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/java/com/uas/erp/schedular/finance/task/B2BInformation.java

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

@@ -107,7 +107,7 @@ public class B2BInformation  extends AbstractTask{
 						"	CQ_APPLYQUOTA,CQ_EFFECTDAYS,CQ_LENDRATE,CQ_ANNUALRATE,CQ_REPAYMENTMEANS," +
 						"	CQ_INDATE,CQ_RECORDER,CQ_RECORDERUU,CQ_AUDITDATE," +
 						"	CQ_STATUSCODE,CQ_STATUS,CQ_BASICEVALUATION)" +
-						"	VALUES(CUSTOMERQUOTA_SEQ.NEXTVAL,'已上传','B2B','卖方客户',SYSDATE,'"+ currMaster.getMa_user()+"','卖方客户申请单'," +
+						"	VALUES(CUSTOMERQUOTA_SEQ.NEXTVAL,'待上传','B2B','卖方客户',SYSDATE,'"+ currMaster.getMa_user()+"','卖方客户申请单'," +
 						"	'" + rest.getCode() + "'," + rest.getCsEnuu() + ",'" + rest.getCsEnName() + "',ONERP.CU_CODE," + rest.getFsEnuu() + ",'" + rest.getFsEnName() + "'," +
 						"	" + rest.getQuotaAmount()*10000 + "," + rest.getCredDays() + "," + rest.getFinanceRate() + "," + rest.getOfferRate() + ",'" + rest.getRepayment() + "'," +
 						"	TO_DATE('" + rest.getApplyTime() + "','YYYY-MM-DD hh24:mi:ss'),'" + rest.getApplyUsername() + "'," + rest.getApplyUu() + ",TO_DATE('" + rest.getCheckerTime() + "','YYYY-MM-DD hh24:mi:ss')," +
@@ -149,7 +149,7 @@ public class B2BInformation  extends AbstractTask{
 			if(compBaseInfoByErmRest.getEnName()==null||compBaseInfoByErmRest.getEnName().equals("")){
 				break;
 			}
-			System.out.println("客户基本信息: "+ProtoBufUtil.toJSON(compBaseInfoByErmRest));
+			//System.out.println("客户基本信息: "+ProtoBufUtil.toJSON(compBaseInfoByErmRest));
 //			System.out.println("获取客户UU:"+compBaseInfoByErmRest.getEnuu());
 			//扩展信息 CompanyIndustryAndCommerceInfoRest
 			CompanyEnterpriseCrawlerListFinRest entCrawLFRest = entExtInfoResp.getCompanyEnterpriseCrawlerList();
@@ -212,7 +212,7 @@ public class B2BInformation  extends AbstractTask{
 							"WHERE CE_CUID = "+cuId);
 				}
 				//从表2 股东信息 CUSTOMERSHAREHOLDER
-				System.out.println("更新股东信息:"+compBaseInfoByErmRest.getEnShareholders());
+				//System.out.println("更新股东信息:"+compBaseInfoByErmRest.getEnShareholders());
 				JSONArray enShareholdersList = JSONArray.parseArray(compBaseInfoByErmRest.getEnShareholders());
 				if(enShareholdersList!=null && enShareholdersList.size()>0) {
 					for (int i = 0; i < enShareholdersList.size(); i++) {
@@ -602,7 +602,7 @@ public class B2BInformation  extends AbstractTask{
     				    + "'"+Finance.getAcceptOfferInfo().getStatus()+"',null,null,null)");
 			}
 		}
-
+		
 		System.out.println(sqls);
         jdbcTemplate.batchExecute(sqls);  //报价信息
         jdbcTemplate.batchExecute(sqlsDemand);   //融资信息
@@ -627,10 +627,10 @@ public class B2BInformation  extends AbstractTask{
 		GetFinanceOfferDetailsResp resp = capitalSideSdk.getFinanceOfferDetails(req);
 		FinanceOfferDetails adetaillist =  resp.getFinanceOfferInfo();
 		List<OfferDetailAndFinanceAccept> restlist = adetaillist.getOfferDetailAndFinanceAcceptInfoList();
-
+		
 		for(OfferDetailAndFinanceAccept rest :restlist){
 			
-			//判断主表是否存在明细 count>0
+			//判断主表是否存在明细 count>0 
 			int count = jdbcTemplate.count(" from ACCEPTFINANCEDEMANDDETAIL where code =?",rest.getFinanceDemandDetail().getCode());
 			if(count >0){
 				break;
@@ -663,7 +663,7 @@ public class B2BInformation  extends AbstractTask{
         		    + "'"+rest.getFinanceDemandDetailAccept().getAcceptCode()+"','"+rest.getFinanceDemandDetailAccept().getAcceptStatus()+"',"
         		    + "'"+rest.getFinanceDemandDetailAccept().getTitle()+"','"+rest.getFinanceDemandDetailAccept().getSpec()+"',"
         		    + "'"+rest.getFinanceDemandDetailAccept().getProductCode()+"','"+rest.getFinanceDemandDetailAccept().getStatus()+"','已上传')");
-
+		
 			/*acceptsqls.add("MERGE INTO FINANCEDEMANDDETAILACCEPT a"
 				    +" USING (SELECT nvl(max(id),0) ID from FINANCEDEMANDDETAILACCEPT where code = '"+rest.getFinanceDemandDetailAccept().getCode()+"') b"
 				    +" ON (a.ID = b.ID)"
@@ -856,31 +856,10 @@ public class B2BInformation  extends AbstractTask{
                 Object cq_recorderuu = map.get("CQ_RECORDERUU");
                 Integer cqRecorderuu =200040254;
                 //Integer cqRecorderuu =1000014617;  // 线上
-				if (cq_recorderuu!=null) {
-					cqRecorderuu = Integer.valueOf(cq_recorderuu.toString());
-				}
-				//审核结果
-				Object cq_approval = map.get("CQ_APPROVAL");
-				Integer cqApproval=1403;
-				if (Integer.valueOf(cq_approval.toString())==0){
-					cqApproval=1402;
-				}
-				//到期时间
-				SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-				Object cq_enddate = map.get("CQ_ENDDATE");
-				String cqEnddate = format.format(new Date());
-				if (cq_enddate!=null){
-					cqEnddate = cq_enddate.toString().substring(0,19);
-				}
-				//基本面评价
-				Object cq_basicevaluation = map.get("CQ_BASICEVALUATION");
-				String cqBasicevaluation = "";
-				if (cq_basicevaluation!=null){
-					cqBasicevaluation = cq_basicevaluation.toString();
-				}
-
-
-				SaveOfferQuotaInfoReq.Builder req = SaveOfferQuotaInfoReq.newBuilder();
+                if (cq_recorderuu!=null) {
+                    cqRecorderuu = Integer.valueOf(cq_recorderuu.toString());
+                }
+                SaveOfferQuotaInfoReq.Builder req = SaveOfferQuotaInfoReq.newBuilder();
 				req.setCsEnuu(cqFactoruu).setCsEnName("深圳市英唐保理有限公司").setFsEnuu(cqCustuu).setFsEnName(cqCustname).setQuotaAmount(cqQuota)
 						.setCredDays(cqEffectdays).setFinanceRate(cqLendrate).setOfferRate(cqAnnualrate).setRepayment(
                         cqRepaymentmeans).setApplyUu(cqRecorderuu);
@@ -889,16 +868,7 @@ public class B2BInformation  extends AbstractTask{
                 JSONObject jsonObject = JSONObject.parseObject(s);
                 Object code = JSONObject.parseObject(jsonObject.get("respHeader").toString()).get("code");
                 if ("0".equals(code.toString())){
-					UpdateOfferQuotaInfoReq.Builder builder = UpdateOfferQuotaInfoReq.newBuilder();
-					builder.setCsEnuu(cqFactoruu).setFsEnuu(cqCustuu).setStatus(cqApproval).setEndTime(cqEnddate)
-							.setCheckerContent(cqBasicevaluation).setCheckUu(cqRecorderuu);
-					UpdateOfferQuotaInfoResp infoResp = capitalSideSdk.updateOfferQuotaInfo(builder);
-					String ss = ProtoBufUtil.toJSON(infoResp);
-					JSONObject json = JSONObject.parseObject(ss);
-					Object code1 = JSONObject.parseObject(json.get("respHeader").toString()).get("code");
-					if ("0".equals(code1.toString())) {
-						sqlList.add("update customerQuota set CQ_UPLOADSTATUS = '已上传' where cq_id = " + map.get("CQ_ID"));
-					}
+                    sqlList.add("update customerQuota set CQ_UPLOADSTATUS = '已上传' where cq_id = " + map.get("CQ_ID"));
                 }
 			}
             if (!CollectionUtils.isEmpty(sqlList)) {
@@ -915,14 +885,12 @@ public class B2BInformation  extends AbstractTask{
 	private List<Map<String, Object>> getCustomerQuotaUpload() {
 		List<Map<String, Object>> maps = jdbcTemplate.queryForList("select * from (select cq_id,cq_factoruu," +
                 "cq_custuu,cq_custname,cq_effectdays,cq_quota,cq_lendrate,cq_annualrate," +
-                "cq_repaymentmeans,cq_recorderuu,cq_approval,cq_enddate,cq_basicevaluation from " +
+                "cq_repaymentmeans,cq_recorderuu from " +
                 "customerQuota where " +
-				"CQ_UPLOADSTATUS='待上传' and cq_status = '已审核' and cq_quotatype='卖方客户' order by cq_code ) where rownum " +
-                "< 100");
 				"CQ_UPLOADSTATUS='待上传'  and cq_quotatype='卖方客户' order by cq_code ) where rownum < 100");
 		return maps;
 	}
-
+	
 
 }