保理接口调整

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

@@ -84,7 +84,7 @@ public class B2BInformation  extends AbstractTask{
 				sqls.add("MERGE INTO CUSTOMERQUOTA INERP " +
 						"	USING ( SELECT nvl(MAX(CQ_ID),-1) CQ_ID," +
 						"	MAX((select MAX(CU_CODE) from CUSTOMERINFOR WHERE CU_STATUSCODE <> 'DISABLE' AND NVL(CU_ENUU,0) = "+rest.getOfferQuoteInfo().getFsEnuu()+" )) CU_CODE " +
-						"	FROM CustomerQuota WHERE CQ_CODE = '" + rest.getOfferQuoteInfo().getCode() + "' ) ONERP " +
+						"	FROM CustomerQuota where CQ_STATUS <>'已审核' and CQ_CODE = '" + rest.getOfferQuoteInfo().getCode() + "' ) ONERP " +
 						"	ON (INERP.CQ_ID = ONERP.CQ_ID) " +
 						"	WHEN MATCHED THEN " +
 						"	UPDATE SET INERP.CQ_UPDATEDATE = SYSDATE,INERP.CQ_UPLOADSTATUS='已上传',INERP.CQ_QUOTATYPE='卖方客户',INERP.CQ_COP='"+currMaster.getMa_user()+"',INERP.CQ_CLASS='卖方客户申请单'," +

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

@@ -42,7 +42,7 @@ public class CustInfomationTask extends AbstractTask{
             if(compBaseInfoByErmRest.getEnName()==null||compBaseInfoByErmRest.getEnName().equals("")){
                 break;
             }
-            int cuId = jdbcTemplate.getInt("SELECT NVL(MAX(CU_ID),0) FROM CUSTOMERINFOR WHERE CU_STATUSCODE <> 'DISABLE' AND CU_ENUU = ? ", custUU);
+            int cuId = jdbcTemplate.getInt("SELECT NVL(MAX(CU_ID),0) FROM CUSTOMERINFOR WHERE CU_ENUU = ? ", custUU);
             //System.out.println("cuId:"+cuId);
             String type = "UPDATE";
             String cuCode = compBaseInfoByErmRest.getCode();
@@ -54,7 +54,7 @@ public class CustInfomationTask extends AbstractTask{
             //主表 客户资料
             sqls.addAll(getMainSqls(type,cuId,cuCode,enMap,entExtInfoResp));
             //从表1 高管信息 CUSTOMEREXCUTIVE
-            sqls.addAll(getOneSqls(type,cuId,compBaseInfoByErmRest.getEnKeyPersonnel()));
+            /*sqls.addAll(getOneSqls(type,cuId,compBaseInfoByErmRest.getEnKeyPersonnel()));
             //从表2 股东信息 CUSTOMERSHAREHOLDER
             sqls.addAll(getTwoSqls(type,cuId,compBaseInfoByErmRest.getEnShareholders()));
             //TODO 从表3 主要关联企业 CUSTOMERUDSTREAM 暂未提供
@@ -141,7 +141,7 @@ public class CustInfomationTask extends AbstractTask{
             //sqls.addAll(get28Sqls(type,cuId,manageRiskEnId));
             //从表29 土地抵押   MORTGAGELAND
             String landMortgage = companyManageRisk.getLandMortgage();
-            sqls.addAll(get29Sqls(type,cuId,landMortgage));
+            sqls.addAll(get29Sqls(type,cuId,landMortgage));*/
 
         }
         System.out.println("COMMONSQLS:"+sqls);
@@ -681,10 +681,10 @@ public class CustInfomationTask extends AbstractTask{
         String cu_regcapital = (compBaseInfoByErmRest.getEnRegCapital() ==null || compBaseInfoByErmRest.getEnRegCapital().equals("") ? "null":compBaseInfoByErmRest.getEnRegCapital());
         String cu_paidincapital =(compIndusAndCommInforRest.getContributedCapital() ==null ||compIndusAndCommInforRest.getContributedCapital().equals("") ? "null" : compIndusAndCommInforRest.getContributedCapital());
         String cu_employeesnum = (compIndusAndCommInforRest.getInsuredNumberOfPeople() == null || compIndusAndCommInforRest.getInsuredNumberOfPeople().equals("") ? "null":compIndusAndCommInforRest.getInsuredNumberOfPeople());
+        if(cu_employeesnum.equals("-") ){
+    		cu_employeesnum = null;
+    	}
         if(type.equals("INSERT")){
-        	if(cu_employeesnum.equals("-") ){
-        		cu_employeesnum = "0";
-        	}
             sqls.add("INSERT INTO CUSTOMERINFOR(CU_ID,CU_CODE,CU_ENUU,CU_STATUS,CU_STATUSCODE,CU_UPDATEDATE,CU_NAME,CU_LEGALPERSON," +
                     "CU_TERM,CU_ENTERPTYPE,CU_PLAFORMLEVEL,CU_LICENSEDATE,CU_PAPERSCODE," +
                     "CU_TAXCREDIT,CU_REGISTSTATUS,CU_BUSINSSCOPE,CU_BUSINESSMAIN," +