Merge branch 'master' of ssh://10.10.100.21/source/uas_schedular

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

@@ -84,11 +84,11 @@ 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,CQ_ISEFFECT,CQ_QUOTA)" +
-						"	VALUES(CUSTOMERQUOTA_SEQ.NEXTVAL,'待上传','B2B','卖方客户',SYSDATE,'"+ currMaster.getMa_user()+"','卖方客户申请单'," +
+						"	VALUES(CUSTOMERQUOTA_SEQ.NEXTVAL,'" + (rest.getOfferQuoteInfo().getStatus() == 1401 ? "待上传" : "已上传") + "','B2B','卖方客户',SYSDATE,'"+ currMaster.getMa_user()+"','卖方客户申请单'," +
 						"	'" + rest.getOfferQuoteInfo().getCode() + "'," + rest.getOfferQuoteInfo().getCsEnuu() + ",'" + rest.getOfferQuoteInfo().getCsEnName() + "',ONERP.CU_CODE," + rest.getOfferQuoteInfo().getFsEnuu() + ",'" + rest.getOfferQuoteInfo().getFsEnName() + "'," +
 						"	" + rest.getOfferQuoteInfo().getQuotaAmount()*10000 + "," + rest.getOfferQuoteInfo().getCredDays() + "," + rest.getOfferQuoteInfo().getFinanceRate() + "," + rest.getOfferQuoteInfo().getOfferRate() + ",'" + rest.getOfferQuoteInfo().getRepayment() + "'," +
 						"	TO_DATE('" + rest.getOfferQuoteInfo().getApplyTime() + "','YYYY-MM-DD hh24:mi:ss'),'" + rest.getOfferQuoteInfo().getApplyUsername() + "'," + rest.getOfferQuoteInfo().getApplyUu() + ",TO_DATE('" + rest.getOfferQuoteInfo().getCheckerTime() + "','YYYY-MM-DD hh24:mi:ss')," +
-						"	'" + (rest.getOfferQuoteInfo().getStatus() == 1402 ? "AUDITED" : "ENTERING") + "','" + (rest.getOfferQuoteInfo().getStatus() == 1402 ? "已审核" : "在录入") + "','" + rest.getOfferQuoteInfo().getCheckerContent() + "','未生效','" + rest.getOfferQuoteInfo().getQuotaAmount() + "')");
+						"	'" + (rest.getOfferQuoteInfo().getStatus() == 1402 || rest.getOfferQuoteInfo().getStatus() == 1403? "AUDITED" : "ENTERING") + "','" + (rest.getOfferQuoteInfo().getStatus() == 1402 || rest.getOfferQuoteInfo().getStatus() == 1403 ? "已审核" : "在录入") + "','" + rest.getOfferQuoteInfo().getCheckerContent() + "','未生效','" + rest.getOfferQuoteInfo().getQuotaAmount()*10000 + "')");
 				enMap.put("CQ_CODE",rest.getOfferQuoteInfo().getCode());
 				enMap.put("CQ_CUSTUU", rest.getOfferQuoteInfo().getFsEnuu());
 				enMap.put("CQ_FACTORUU", rest.getOfferQuoteInfo().getCsEnuu());
@@ -99,9 +99,9 @@ public class B2BInformation  extends AbstractTask{
 			}
 		}
 		jdbcTemplate.batchExecute(sqls);
-		/*List<Map<String, Object>> list = jdbcTemplate.queryForList("select cq_custname,cq_auditdate, cq_status from CUSTOMERQUOTA where 1=?", 1);
+		/*List<Map<String, Object>> list = jdbcTemplate.queryForList("select cq_custname,cq_auditdate, cq_status from CUSTOMERQUOTA");
 		for(int i = 0;i<list.size();i++){
-			Object auditdate = jdbcTemplate.getObject("select to_char(max(cq_auditdate),'yyyy-MM-dd') from CUSTOMERQUOTA "
+			Object auditdate = jdbcTemplate.getObject("select to_char(max(cq_auditdate),'YYYY-MM-DD hh24:mi:ss') from CUSTOMERQUOTA "
 					+ " where cq_custname = ?",list.get(i).get("CQ_CUSTNAME"));
 			if(auditdate != null){
 				jdbcTemplate.execute("update CUSTOMERQUOTA set CQ_ISEFFECT = '已生效' where cq_custname = ? and "

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

@@ -1335,7 +1335,7 @@ public class CustInfomationTask extends AbstractTask{
             int custUU = Integer.valueOf(enMap.get("CQ_CUSTUU").toString());//融资方UU--客户
             //客户基本信息 CompanyBasicInfosByErmRest
             GetEnterpriseExtensionInfoReq.Builder req = GetEnterpriseExtensionInfoReq.newBuilder();
-            req.setEnuu(10042875);
+            req.setEnuu(10046945);
             GetEnterpriseExtensionInfoResp resp = tradingHallSdk.getEnterpriseExtensionInfo(req);
             System.out.println(ProtoBufUtil.toJSON(resp));
         }