diff --git a/WebContent/Tenwa/Lease/Flow/Fund/ActualPayment/ActualPaymentCarTempList.jsp b/WebContent/Tenwa/Lease/Flow/Fund/ActualPayment/ActualPaymentCarTempList.jsp index b50e2b2cc..f88146a8b 100644 --- a/WebContent/Tenwa/Lease/Flow/Fund/ActualPayment/ActualPaymentCarTempList.jsp +++ b/WebContent/Tenwa/Lease/Flow/Fund/ActualPayment/ActualPaymentCarTempList.jsp @@ -18,6 +18,7 @@ if("cgb".equals(payMode)){ doTemp.setVisible("REQSTS",false); doTemp.setVisible("RTNFLG",false); + doTemp.setVisible("RTNNAR",true); } ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request); dwTemp.Style="1"; //--设置为Grid风格-- @@ -142,10 +143,6 @@ } function cmb_tp_callback(){ var contractId = getItemValueArray(0,"CONTRACT_ID")+""; - if(typeof(contractId)=="undefined" || contractId.length==0 ){ - alert("请至少选择一条记录!"); - return ; - } var contractIds = contractId.replace(",","@"); if('cmb'=='<%=payMode%>'){ var sParams = "CurUserID=<%=CurUser.getUserID()%>,FLOWUNID=<%=flowunid%>,contractIds="+contractIds; @@ -158,7 +155,7 @@ reloadSelf(); } }else if('cgb'=='<%=payMode%>'){ - var sParams = "userId=<%=CurUser.getUserID()%>,contractIds="+contractIds+",flowUnid=<%=flowunid%>,orgId=<%=CurUser.getOrgID()%>"; + var sParams = "userId=<%=CurUser.getUserID()%>,flowUnid=<%=flowunid%>,orgId=<%=CurUser.getOrgID()%>"; var sReturn = RunJavaMethodTrans("com.tenwa.cgb.controller.OperateOfCGBController", "batchQueryOfCGB",sParams ); if('success'==sReturn.substring(0,7)){ alert(sReturn.substring(7)); diff --git a/src_cmb/com/tenwa/cgb/controller/OperateOfCGBController.java b/src_cmb/com/tenwa/cgb/controller/OperateOfCGBController.java index 1f4a1c2d9..910882247 100644 --- a/src_cmb/com/tenwa/cgb/controller/OperateOfCGBController.java +++ b/src_cmb/com/tenwa/cgb/controller/OperateOfCGBController.java @@ -123,7 +123,7 @@ public class OperateOfCGBController { */ public String batchQueryOfCGB(JBOTransaction tx) throws Exception { BizObjectManager bm = JBOFactory.getBizObjectManager(LC_FUND_INCOME_CALLBACK_DETAIL_TEMP.CLASS_NAME); - List bizObjects = bm.createQuery(" flowunid = :flowunid and contract_id in ('" + contractIds.replaceAll("@", "','") + "') and cmb_pay_log is not null and ERRTXT='付款中' ") + List bizObjects = bm.createQuery(" flowunid = :flowunid and cmb_pay_log is not null and ERRTXT='付款中' ") .setParameter("flowunid", flowUnid).getResultList(false); if (bizObjects.isEmpty()) return "待回盘数据为空,请检查"; String customerBatchNo = null, customerSalarySeq = null; @@ -161,9 +161,10 @@ public class OperateOfCGBController { } errText = batchQueryResult.get("errorreason") == null ? errText : batchQueryResult.get("errorreason"); //更新回调结果状态 - SqlObject sqlObject = new SqlObject("update LC_FUND_INCOME_CALLBACK_DETAIL_TEMP set ERRCOD=:errCode,ERRTXT=:errText where id =:id") + SqlObject sqlObject = new SqlObject("update LC_FUND_INCOME_CALLBACK_DETAIL_TEMP set ERRCOD=:errCode,ERRTXT=:errText,RTNNAR=:rtnNar where id =:id") .setParameter("errCode", bankstatus) .setParameter("errText", errText) + .setParameter("rtnNar", getbankstatusMsg(bankstatus)) .setParameter("id", bizObject.getAttribute("id").getString()); sqlca.executeSQL(sqlObject); if (business_status != null) { @@ -451,6 +452,8 @@ public class OperateOfCGBController { case "9": msg = "查证取消交易"; break; + default: + msg = bankstatus; } return msg; }