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

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

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

@@ -14,6 +14,7 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.uas.erp.schedular.entity.Master;
 import com.uas.erp.schedular.task.support.Method;
+import com.uas.erp.schedular.util.ContextHolder;
 import com.usoft.fin.external.open.api.entity.CapitalSideLoan;
 import com.usoft.fin.external.open.api.entity.FinanceOfferListOrBuilder;
 import com.usoft.fin.external.open.api.entity.OfferQuotaInfoRest;
@@ -28,6 +29,7 @@ import org.springframework.util.CollectionUtils;
 
 import com.uas.erp.schedular.task.support.Role;
 import com.uas.erp.schedular.task.support.TaskMapping;
+import com.uas.erp.schedular.util.CollectionUtil;
 import com.uas.erp.schedular.util.ContextHolder;
 import com.usoft.fin.external.open.api.entity.CompanyBasicInfosByErmRest;
 import com.usoft.fin.external.open.api.entity.CompanyEnterpriseCrawlerListFinRest;
@@ -55,28 +57,28 @@ import com.usoft.sdk.fin.utils.ProtoBufUtil;
 @Component
 @TaskMapping(title = "U智融对接服务", role = Role.SELLER)
 public class B2BInformation  extends AbstractTask{
-	
 	private CapitalSideSdk capitalSideSdk = new CapitalSideSdk("https://finrest.uuzcc.cn", "10050877", "b78d577449b64f56a8a6cf1feeb3fbf5");
 	private TradingHallSdk tradingHallSdk = new TradingHallSdk("https://finrest.uuzcc.cn", "10050877", "b78d577449b64f56a8a6cf1feeb3fbf5");
-	
+
 	/**
      * 额度申请
      * @throws Exception
      */
-	@TaskMapping(title = "额度申请下载", fixedDelay = 360000, method = Method.DOWNLOAD)
+	@TaskMapping(title = "额度申请下载", fixedDelay = 30000, method = Method.DOWNLOAD)
     public void getOfferQuotaInfoList() throws Exception {
 		List<String> sqls = new ArrayList<>();
-		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 		Calendar beforeTime = Calendar.getInstance();
 		beforeTime.add(Calendar.MINUTE, -7);// 7分钟之前的时间
 		Date beforeD = beforeTime.getTime();
+		Master currMaster = ContextHolder.getMaster();
     	GetOfferQuotaInfoListReq.Builder req = GetOfferQuotaInfoListReq.newBuilder();
-    	req.setCsEnuu(10042875);
+    	req.setCsEnuu(Integer.valueOf(currMaster.getMa_uu().toString()));
 		req.setPageNumber(1);
 		req.setPageSize(50);
 		req.setUpdateTime(beforeD.getTime());//获取最近7分钟更新的单据列表
 		GetOfferQuotaInfoListResp resp = capitalSideSdk.getOfferQuotaInfoList(req);
 		java.util.List<OfferQuotaInfoRest> restlist = resp.getOfferQuoteInfoList();
+		//System.out.println("restlist-size:"+restlist.size());
 		List<Map<String, Object>> enUUList = new ArrayList<>();
 		for(OfferQuotaInfoRest rest : restlist) {
 			Map<String, Object> enMap = new HashMap<>();
@@ -90,22 +92,24 @@ public class B2BInformation  extends AbstractTask{
 						"	FROM CustomerQuota WHERE CQ_CODE = '" + rest.getCode() + "' ) ONERP " +
 						"	ON (INERP.CQ_ID = ONERP.CQ_ID) " +
 						"	WHEN MATCHED THEN " +
-						"	UPDATE SET INERP.CQ_UPDATEDATE = SYSDATE,INERP.CQ_UPLOADSTATUS='已上传',INERP.CQ_QUOTATYPE='卖方客户'," +
+						"	UPDATE SET INERP.CQ_UPDATEDATE = SYSDATE,INERP.CQ_UPLOADSTATUS='已上传',INERP.CQ_QUOTATYPE='卖方客户',INERP.CQ_COP='"+currMaster.getMa_user()+"',INERP.CQ_CLASS='卖方客户申请单'," +
 						"	INERP.CQ_CUSTCODE = ONERP.CU_CODE," +
 						"	INERP.CQ_CUSTUU = " + rest.getFsEnuu() + ",INERP.CQ_CUSTNAME='" + rest.getFsEnName() + "'," +
-						"	INERP.CQ_APPLYQUOTA=" + rest.getQuotaAmount() + ",INERP.CQ_EFFECTDAYS=" + rest.getCredDays() + ",INERP.CQ_LENDRATE=" + rest.getFinanceRate() + "," +
+						"	INERP.CQ_APPLYQUOTA=" + rest.getQuotaAmount()*10000 + ",INERP.CQ_EFFECTDAYS=" + rest.getCredDays() + ",INERP.CQ_LENDRATE=" + rest.getFinanceRate() + "," +
 						"	INERP.CQ_ANNUALRATE=" + rest.getOfferRate() + ",INERP.CQ_REPAYMENTMEANS='" + rest.getRepayment() + "'," +
 						"	INERP.CQ_AUDITDATE = TO_DATE('" + rest.getCheckerTime() + "','YYYY-MM-DD hh24:mi:ss')," +
 						"	INERP.CQ_STATUSCODE='" + (rest.getStatus() == 1402 ? "AUDITED" : "ENTERING") + "'," +
 						"	INERP.CQ_STATUS='" + (rest.getStatus() == 1402 ? "已审核" : "在录入") + "'," +
 						"	INERP.CQ_BASICEVALUATION='" + rest.getCheckerContent() + "'" +
 						"	WHEN NOT MATCHED THEN " +
-						"	INSERT (CQ_ID,CQ_UPLOADSTATUS,CQ_SOURCETYPE,CQ_QUOTATYPE,CQ_UPDATEDATE,CQ_CODE,CQ_FACTORUU,CQ_FACTORNAME,CQ_CUSTCODE,CQ_CUSTUU,CQ_CUSTNAME," +
+						"	INSERT (CQ_ID,CQ_UPLOADSTATUS,CQ_SOURCETYPE,CQ_QUOTATYPE,CQ_UPDATEDATE,CQ_COP,CQ_CLASS," +
+						"	CQ_CODE,CQ_FACTORUU,CQ_FACTORNAME,CQ_CUSTCODE,CQ_CUSTUU,CQ_CUSTNAME," +
 						"	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,'" + rest.getCode() + "'," + rest.getCsEnuu() + ",'" + rest.getCsEnName() + "',ONERP.CU_CODE," + rest.getFsEnuu() + ",'" + rest.getFsEnName() + "'," +
-						"	" + rest.getQuotaAmount() + "," + rest.getCredDays() + "," + rest.getFinanceRate() + "," + rest.getOfferRate() + ",'" + rest.getRepayment() + "'," +
+						"	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')," +
 						"	'" + (rest.getStatus() == 1402 ? "AUDITED" : "ENTERING") + "','" + (rest.getStatus() == 1402 ? "已审核" : "在录入") + "','" + rest.getCheckerContent() + "')");
 				enMap.put("CQ_CUSTUU", rest.getFsEnuu());
@@ -132,7 +136,7 @@ public class B2BInformation  extends AbstractTask{
 	public void getCustInfomation(List<Map<String, Object>> enUUList) throws Exception {
 		List<String> sqls = new ArrayList<>();
 		for(Map<String, Object> enMap : enUUList){
-			int facUU = enMap.get("CQ_FACTORUU") ==null ? 10042875 :Integer.valueOf(enMap.get("CQ_FACTORUU").toString());//资金方UU
+			int facUU = enMap.get("CQ_FACTORUU") ==null ? 10050877 :Integer.valueOf(enMap.get("CQ_FACTORUU").toString());//资金方UU
 			int custUU = Integer.valueOf(enMap.get("CQ_CUSTUU").toString());//融资方UU--客户
 			int userUU = enMap.get("CQ_RECORDERUU") ==null ? 0 :Integer.valueOf(enMap.get("CQ_RECORDERUU").toString());//操作人UU
 //			System.out.println("facUU:"+facUU);
@@ -145,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();
@@ -184,7 +188,7 @@ public class B2BInformation  extends AbstractTask{
 						" CU_LICENSEDATE = "+cu_licensedate+",CU_PAPERSCODE='"+compBaseInfoByErmRest.getEnCodeCrawled()+"'," +
 						" CU_TAXCREDIT ='"+compIndusAndCommInforRest.getUnifiedSocialCreditCode()+"',CU_REGISTSTATUS='"+compBaseInfoByErmRest.getEnRegStatus()+"',CU_BUSINSSCOPE='"+compBaseInfoByErmRest.getEnOpRange()+"',CU_BUSINESSMAIN='"+restBaseInfo.getEnBusinessMain()+"'," +
 						" CU_CONTACT='"+restBaseInfo.getFsContactsMan()+"',CU_CONTACTNUM='"+restBaseInfo.getFsContactsPhone()+"',CU_REGCAPITAL="+cu_regcapital+",CU_PAIDINCAPITAL="+cu_paidincapital+"," +
-						" CU_REGADD='"+restBaseInfo.getFsContactsMan()+"',CU_OFFICEADD='"+restBaseInfo.getFsContactsPhone()+"',CU_INTRODUCTION='"+compLawInfoRest.getEnIntro()+"'," +
+						" CU_REGADD='"+compBaseInfoByErmRest.getEnRegLocation()+"',CU_OFFICEADD='"+restBaseInfo.getEnAddress()+"',CU_INTRODUCTION='"+compLawInfoRest.getEnIntro()+"'," +
 						" CU_EMPLOYEESNUM=" +cu_employeesnum+
 						" WHERE CU_ENUU = "+custUU+" AND CU_STATUSCODE <> 'DISABLE'");
 				//从表1 高管信息 CUSTOMEREXCUTIVE
@@ -208,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++) {
@@ -413,7 +417,7 @@ public class B2BInformation  extends AbstractTask{
 	 * 下载放款记录列表
 	 * @throws Exception
 	 */
-	@TaskMapping(title = "放款记录下载", fixedDelay = 360000, method = Method.DOWNLOAD)
+	@TaskMapping(title = "放款记录下载", fixedDelay = 30000, method = Method.DOWNLOAD)
     public void getCapitalSideLoan() throws Exception {
 		final List<String> sqls = new ArrayList<>();
         GetCapitalSideLoanReq.Builder req = GetCapitalSideLoanReq.newBuilder();
@@ -507,7 +511,7 @@ public class B2BInformation  extends AbstractTask{
      * 报价记录下载
      * @throws Exception
      */
-	@TaskMapping(title = "报价记录下载", fixedDelay = 360000, method = Method.DOWNLOAD)
+	@TaskMapping(title = "报价记录下载", fixedDelay = 30000, method = Method.DOWNLOAD)
     public void getFinanceOfferList() throws Exception {
     	final List<String> sqls = new ArrayList<>();
     	final List<String> sqlsDemand = new ArrayList<>();
@@ -522,9 +526,7 @@ public class B2BInformation  extends AbstractTask{
 		//Date beforeD = beforeTime.getTime();
 		//req.setUpdateTime(beforeD.getTime());//获取最近7分钟更新的单据列表
 		GetFinanceOfferListResp resp = capitalSideSdk.getFinanceOfferList(req);
-		
 		List<? extends FinanceOfferListOrBuilder> flist = resp.getFinanceOfferInfoOrBuilderList();
-		
 		for(FinanceOfferListOrBuilder Finance :flist){
 			sqls.add("MERGE INTO AcceptOffer ao"
 			+" USING (SELECT nvl(max(id),0) ID FROM AcceptOffer where CODE = '"+Finance.getAcceptOfferInfo().getCode()+"') b"
@@ -563,7 +565,6 @@ public class B2BInformation  extends AbstractTask{
     				    + "'"+Finance.getFinanceDemandInfo().getCsContactsPhone()+"','"+Finance.getFinanceDemandInfo().getPubTime()+"','"+Finance.getFinanceDemandInfo().getEndTime()+"'"
     				    + ",'"+Finance.getFinanceDemandInfo().getDealTime()+"','"+Finance.getFinanceDemandInfo().getOfferCount()+"','"+Finance.getFinanceDemandInfo().getFsDemandAmount()+"'"
     				    + ",'已上传')");
-			
 			if(Finance.getAcceptOfferInfo().getStatus() == 1002){
 				String aaCode = jdbcTemplate.generateCode("AccountApply!YSB2", 2);
 				sqlloand.add("MERGE INTO AccountApply a"
@@ -601,6 +602,7 @@ public class B2BInformation  extends AbstractTask{
     				    + "'"+Finance.getAcceptOfferInfo().getStatus()+"',null,null,null)");
 			}
 		}
+
 		System.out.println(sqls);
         jdbcTemplate.batchExecute(sqls);  //报价信息
         jdbcTemplate.batchExecute(sqlsDemand);   //融资信息
@@ -615,7 +617,7 @@ public class B2BInformation  extends AbstractTask{
     /**
      * 下载报价详情
      */
-	@TaskMapping(title = "报价详情下载", fixedDelay = 360000, method = Method.DOWNLOAD)
+	@TaskMapping(title = "报价详情下载", fixedDelay = 30000, method = Method.DOWNLOAD)
 	public void getFinanceOfferDetails() throws Exception {
 		final List<String> ordersqls = new ArrayList<>();   //订单详情
 		final List<String> acceptsqls = new ArrayList<>();   //验收单详情
@@ -625,9 +627,20 @@ public class B2BInformation  extends AbstractTask{
 		GetFinanceOfferDetailsResp resp = capitalSideSdk.getFinanceOfferDetails(req);
 		FinanceOfferDetails adetaillist =  resp.getFinanceOfferInfo();
 		List<OfferDetailAndFinanceAccept> restlist = adetaillist.getOfferDetailAndFinanceAcceptInfoList();
+
 		for(OfferDetailAndFinanceAccept rest :restlist){
 			
-			ordersqls.add("MERGE INTO ACCEPTFINANCEDEMANDDETAIL a"
+			//判断主表是否存在明细 count>0
+			int count = jdbcTemplate.count(" from ACCEPTFINANCEDEMANDDETAIL where code =?",rest.getFinanceDemandDetail().getCode());
+			if(count >0){
+				break;
+			}
+			ordersqls.add("insert into ACCEPTFINANCEDEMANDDETAIL(ID,CODE,FINANCEDEMANDCODE,CUSTENUU,CUSTENNAME,CUSTGRADE,PAYMENTS,ORDERID,ORDERCODE,ORDERTOTAL,"
+					+ "ACCEPTAMOUNT,UPLOADSTATUS) "
+					+ "values (ACCEPTFINANCEDEMANDDETAIL_seq.nextval,'"+rest.getFinanceDemandDetail().getCode()+"','"+rest.getFinanceDemandDetail().getFinanceDemandCode()+"','"+rest.getFinanceDemandDetail().getCustEnuu()+"',"
+					+ "'"+rest.getFinanceDemandDetail().getCustEnName()+"','"+rest.getFinanceDemandDetail().getCustGrade()+"','"+rest.getFinanceDemandDetail().getPayments()+"','"+rest.getFinanceDemandDetail().getOrderId()+"',"
+					+ "'"+rest.getFinanceDemandDetail().getOrderCode()+"','"+rest.getFinanceDemandDetail().getOrderTotal()+"','"+rest.getFinanceDemandDetail().getAcceptAmount()+"','已上传')");
+		/*ordersqls.add("MERGE INTO ACCEPTFINANCEDEMANDDETAIL a"
 				    +" USING (SELECT nvl(max(id),0) ID from ACCEPTFINANCEDEMANDDETAIL where code = '"+rest.getFinanceDemandDetail().getCode()+"') b"
 				    +" ON (a.ID = b.ID)"
 				    +" WHEN MATCHED THEN "
@@ -638,10 +651,20 @@ public class B2BInformation  extends AbstractTask{
 				    + "ACCEPTAMOUNT,UPLOADSTATUS)"
 				    + "values (ACCEPTFINANCEDEMANDDETAIL_seq.nextval,'"+rest.getFinanceDemandDetail().getCode()+"','"+rest.getFinanceDemandDetail().getFinanceDemandCode()+"','"+rest.getFinanceDemandDetail().getCustEnuu()+"',"
 					+ "'"+rest.getFinanceDemandDetail().getCustEnName()+"','"+rest.getFinanceDemandDetail().getCustGrade()+"','"+rest.getFinanceDemandDetail().getPayments()+"','"+rest.getFinanceDemandDetail().getOrderId()+"',"
-				    + "'"+rest.getFinanceDemandDetail().getOrderCode()+"','"+rest.getFinanceDemandDetail().getOrderTotal()+"','"+rest.getFinanceDemandDetail().getAcceptAmount()+"','已上传')");
-			
+				    + "'"+rest.getFinanceDemandDetail().getOrderCode()+"','"+rest.getFinanceDemandDetail().getOrderTotal()+"','"+rest.getFinanceDemandDetail().getAcceptAmount()+"','已上传')");*/
+			int countAccept = jdbcTemplate.count(" from FINANCEDEMANDDETAILACCEPT where code =?",rest.getFinanceDemandDetailAccept().getCode());
+			if(countAccept >0){
+				break;
+			}
+			acceptsqls.add("insert into FINANCEDEMANDDETAILACCEPT(ID,CODE,FINANCEDEMANDCODE,FINANCEDEMANDDETAILCODE,ORDERITEMID,ACCEPTITEMID,ACCEPTID,ACCEPTAMOUNT,ACCEPTDATE,ACCEPTCODE,"
+        			+ "ACCEPTSTATUS,TITLE,SPEC,PRODUCTCODE,STATUS,UPLOADSTATUS) "
+        			+ "values (FINANCEDEMANDDETAILACCEPT_seq.nextval,'"+rest.getFinanceDemandDetailAccept().getCode()+"','"+rest.getFinanceDemandDetailAccept().getFinanceDemandCode()+"','"+rest.getFinanceDemandDetailAccept().getFinanceDemandDetailCode()+"',"
+        			+ "'"+rest.getFinanceDemandDetailAccept().getOrderItemId()+"','"+rest.getFinanceDemandDetailAccept().getAcceptItemId()+"','"+rest.getFinanceDemandDetailAccept().getAcceptId()+"','"+rest.getFinanceDemandDetailAccept().getAcceptAmount()+"','"+rest.getFinanceDemandDetailAccept().getAcceptDate()+"',"
+        		    + "'"+rest.getFinanceDemandDetailAccept().getAcceptCode()+"','"+rest.getFinanceDemandDetailAccept().getAcceptStatus()+"',"
+        		    + "'"+rest.getFinanceDemandDetailAccept().getTitle()+"','"+rest.getFinanceDemandDetailAccept().getSpec()+"',"
+        		    + "'"+rest.getFinanceDemandDetailAccept().getProductCode()+"','"+rest.getFinanceDemandDetailAccept().getStatus()+"','已上传')");
 
-			acceptsqls.add("MERGE INTO FINANCEDEMANDDETAILACCEPT a"
+			/*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)"
 				    +" WHEN MATCHED THEN "
@@ -654,13 +677,11 @@ public class B2BInformation  extends AbstractTask{
 				    + "values (FINANCEDEMANDDETAILACCEPT_seq.nextval,'"+rest.getFinanceDemandDetailAccept().getCode()+"','"+rest.getFinanceDemandDetailAccept().getFinanceDemandCode()+"','"+rest.getFinanceDemandDetailAccept().getFinanceDemandDetailCode()+"',"
         			+ "'"+rest.getFinanceDemandDetailAccept().getOrderItemId()+"','"+rest.getFinanceDemandDetailAccept().getAcceptItemId()+"','"+rest.getFinanceDemandDetailAccept().getAcceptId()+"','"+rest.getFinanceDemandDetailAccept().getAcceptAmount()+"','"+rest.getFinanceDemandDetailAccept().getAcceptDate()+"',"
         		    + "'"+rest.getFinanceDemandDetailAccept().getAcceptCode()+"','"+rest.getFinanceDemandDetailAccept().getAcceptStatus()+"','"+rest.getFinanceDemandDetailAccept().getTitle()+"',"
-        		    + "'"+rest.getFinanceDemandDetailAccept().getSpec()+"','"+rest.getFinanceDemandDetailAccept().getProductCode()+"','"+rest.getFinanceDemandDetailAccept().getStatus()+"','已上传')");
+        		    + "'"+rest.getFinanceDemandDetailAccept().getSpec()+"','"+rest.getFinanceDemandDetailAccept().getProductCode()+"','"+rest.getFinanceDemandDetailAccept().getStatus()+"','已上传')");*/
 			
-		}
-		System.out.println(acceptsqls);
-		System.out.println(ordersqls);
-		jdbcTemplate.batchExecute(acceptsqls);
-		jdbcTemplate.batchExecute(ordersqls);
+			}
+			jdbcTemplate.batchExecute(acceptsqls);
+			jdbcTemplate.batchExecute(ordersqls);
 		
 	}
 	
@@ -799,7 +820,7 @@ public class B2BInformation  extends AbstractTask{
 	 * 上传卖方客户额度申请
 	 * @throws Exception
 	 */
-	@TaskMapping(title = "上传卖方客户额度申请", fixedDelay = 60000, method = Method.DOWNLOAD)
+	@TaskMapping(title = "上传卖方客户额度申请", fixedDelay = 60000, method = Method.UPLOAD)
 	public void saveOfferQuotaInfoReq() throws Exception{
 		List<Map<String, Object>> customerQuotaUpload = getCustomerQuotaUpload();
 		if (!CollectionUtils.isEmpty(customerQuotaUpload)) {
@@ -898,8 +919,11 @@ public class B2BInformation  extends AbstractTask{
                 "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;
 	}
+
+
 }