【系统BUG】【下载额度申请已审核/已提交状态不再下拉数据】

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

@@ -83,7 +83,25 @@ public class B2BInformation  extends AbstractTask{
 			}
 			Map<String, Object> enMap = new HashMap<>();
 			if (rest.getOfferQuoteInfo().getFsEnuu() > 0) {
-				sqls.add("MERGE INTO CUSTOMERQUOTA INERP " +
+				int count = jdbcTemplate.count("from CustomerQuota where CQ_CODE ='"+rest.getOfferQuoteInfo().getCode()+"'");
+				String code = jdbcTemplate.getString("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() + "'");
+				if (count==0){
+
+					sqls.add("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,CQ_ISEFFECT,CQ_QUOTA,cq_assuremeans,cq_uinfo,CQ_DEPOSITRATE,CQ_APPROVAL) " +
+							"VALUES(CUSTOMERQUOTA_SEQ.NEXTVAL,'"+ (rest.getOfferQuoteInfo().getStatus() == 1401 ? "待上传" : "已上传") + "','B2B','卖方客户',SYSDATE,'"+ currMaster.getMa_user()+"','卖方客户申请单','" + rest.getOfferQuoteInfo().getCode() + "'," + rest.getOfferQuoteInfo().getCsEnuu() + ",'" + rest.getOfferQuoteInfo().getCsEnName() + "','"+code+"'," + rest.getOfferQuoteInfo().getFsEnuu() + ",'" + rest.getOfferQuoteInfo().getFsEnName() + "'," + rest.getOfferQuoteInfo().getQuotaAmount() + "," + 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 || rest.getOfferQuoteInfo().getStatus() == 1403? "AUDITED" : "ENTERING") + "','" + (rest.getOfferQuoteInfo().getStatus() == 1402 || rest.getOfferQuoteInfo().getStatus() == 1403 ? "已审核" : "在录入") + "','" + rest.getOfferQuoteInfo().getCheckerContent() + "','未生效','" + rest.getOfferQuoteInfo().getQuotaAmount() + "','"+buf.toString()+"','"+rest.getOfferQuoteInfo().getGuarantorJson()+"','"+rest.getOfferQuoteInfo().getDepositRate()+"',"+(rest.getOfferQuoteInfo().getStatus() == 1402?1:0)+")");
+				}else {
+					int count1 =
+                            jdbcTemplate.count("from CustomerQuota where CQ_CODE ='" + rest.getOfferQuoteInfo().getCode() + "' and (cq_status='已审核' or cq_status='已提交')");
+					if (count1==0){
+						sqls.add("UPDATE CustomerQuota SET CQ_UPDATEDATE = SYSDATE,CQ_UPLOADSTATUS='已上传'," +
+								"CQ_QUOTATYPE='卖方客户',CQ_COP='"+currMaster.getMa_user()+"',CQ_CLASS='卖方客户申请单'," +
+								"CQ_CUSTCODE ='"+code+"',CQ_CUSTUU = " + rest.getOfferQuoteInfo().getFsEnuu() + "," +
+                                "CQ_CUSTNAME='" + rest.getOfferQuoteInfo().getFsEnName() + "',CQ_APPLYQUOTA=" + rest.getOfferQuoteInfo().getQuotaAmount() + "CQ_EFFECTDAYS=" + rest.getOfferQuoteInfo().getCredDays() + ",CQ_LENDRATE=" + rest.getOfferQuoteInfo().getFinanceRate() + ",CQ_ANNUALRATE=" + rest.getOfferQuoteInfo().getOfferRate() + ",CQ_REPAYMENTMEANS='" + rest.getOfferQuoteInfo().getRepayment() + "',CQ_AUDITDATE = TO_DATE('" + rest.getOfferQuoteInfo().getCheckerTime() + "','YYYY-MM-DD hh24:mi:ss'),CQ_STATUSCODE='" + (rest.getOfferQuoteInfo().getStatus() == 1402||rest.getOfferQuoteInfo().getStatus() == 1403 ? "AUDITED" : "ENTERING") + "',CQ_STATUS='" + (rest.getOfferQuoteInfo().getStatus() == 1402||rest.getOfferQuoteInfo().getStatus() == 1403 ? "已审核" : "在录入")+"',CQ_QUOTA=" + rest.getOfferQuoteInfo().getQuotaAmount()+ ",CQ_BASICEVALUATION='" + rest.getOfferQuoteInfo().getCheckerContent() + "',CQ_APPROVAL="+(rest.getOfferQuoteInfo().getStatus() == 1402?1:0)+" where CQ_CODE ='"+rest.getOfferQuoteInfo().getCode()+"'");
+					}
+				}
+				/*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 " +
@@ -113,7 +131,7 @@ public class B2BInformation  extends AbstractTask{
 						"	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 || rest.getOfferQuoteInfo().getStatus() == 1403? "AUDITED" : "ENTERING") + "',"
 							+ "'" + (rest.getOfferQuoteInfo().getStatus() == 1402 || rest.getOfferQuoteInfo().getStatus() == 1403 ? "已审核" : "在录入") + "',"
-							+ "'" + rest.getOfferQuoteInfo().getCheckerContent() + "','未生效','" + rest.getOfferQuoteInfo().getQuotaAmount() + "','"+buf.toString()+"','"+rest.getOfferQuoteInfo().getGuarantorJson()+"','"+rest.getOfferQuoteInfo().getDepositRate()+"',"+(rest.getOfferQuoteInfo().getStatus() == 1402?1:0)+")");
+							+ "'" + rest.getOfferQuoteInfo().getCheckerContent() + "','未生效','" + rest.getOfferQuoteInfo().getQuotaAmount() + "','"+buf.toString()+"','"+rest.getOfferQuoteInfo().getGuarantorJson()+"','"+rest.getOfferQuoteInfo().getDepositRate()+"',"+(rest.getOfferQuoteInfo().getStatus() == 1402?1:0)+")");*/
 				enMap.put("CQ_CODE",rest.getOfferQuoteInfo().getCode());
 				enMap.put("CQ_CUSTUU", rest.getOfferQuoteInfo().getFsEnuu());
 				enMap.put("CQ_FACTORUU", rest.getOfferQuoteInfo().getCsEnuu());