diff --git a/WebContent/Accounting/LoanSimulation/LoanBasicInfoBusiness.jsp b/WebContent/Accounting/LoanSimulation/LoanBasicInfoBusiness.jsp index a8da24b1c..a28ebe41a 100644 --- a/WebContent/Accounting/LoanSimulation/LoanBasicInfoBusiness.jsp +++ b/WebContent/Accounting/LoanSimulation/LoanBasicInfoBusiness.jsp @@ -15,11 +15,20 @@ <% /*获取参数*/ String flowunid = CurPage.getParameter("FlowUnid"); + String flowNo = CurPage.getParameter("FlowNo"); String plannumber=CurPage.getParameter("plannumber"); String productId=CurPage.getParameter("ProductId"); String ishistory=CurPage.getParameter("IsHistory"); String nodeNo=CurPage.getParameter("NodeNo"); String RightType= CurPage.getParameter("RightType"); + String contractId = CurPage.getParameter("ContractId"); + String param = flowunid; + String sTempletNo = "LoanSimulationBasicInfoBusiness";//--模板号-- + if("FundPaymentFlow".equals(flowNo)){ + RightType="ReadOnly"; + sTempletNo = "LoanSimulationBusiness_Query"; + param = contractId; + } String calType = CurPage.getParameter("calType"); //判断是否为汽车业务 boolean isCarProduct = "004".equals(productId) ? false : true; @@ -67,7 +76,8 @@ } /*根据参数判断 是否去数据库查询*/ - String sTempletNo = "LoanSimulationBasicInfoBusiness";//--模板号-- + + ASObjectModel doTemp = new ASObjectModel(sTempletNo); @@ -134,7 +144,7 @@ dwTemp.setAttr("inputWidth","120"); dwTemp.setAttr("spanWidth","107"); dwTemp.setAttr("showRatio", true); - dwTemp.genHTMLObjectWindow(flowunid); + dwTemp.genHTMLObjectWindow(param); CurPage.getCurComp().setAttribute("RightType", RightType); String compClientID = request.getParameter("CompClientID"); @@ -144,7 +154,7 @@ String businessDate = DateHelper.getBusinessDate(); String sButtons[][] = { //{"true","All","Button","重置","重置","reloadSelf()","","","",""}, - {"true","","Button","租金测算","租金测算","saveRecord()","","","","btn_icon_save"}, + {"true","All","Button","租金测算","租金测算","saveRecord()","","","","btn_icon_save"}, // {((isCarProduct) && ("proj_process".equals(calType)||"cont_process".equals(calType)))?"true":"false","","Button","引入客户报价","引入客户报价","importCustomerQuot()","","","","btn_icon_edit"} }; %><%@ include file="/Frame/resources/include/ui/include_info.jspf"%> diff --git a/src_cmb/com/tenwa/sdk/controller/CmbToCallbackController.java b/src_cmb/com/tenwa/sdk/controller/CmbToCallbackController.java index 9d1b443af..e5de982ac 100644 --- a/src_cmb/com/tenwa/sdk/controller/CmbToCallbackController.java +++ b/src_cmb/com/tenwa/sdk/controller/CmbToCallbackController.java @@ -212,16 +212,16 @@ public class CmbToCallbackController extends BaseFlowStartAction { public void sql(JBOTransaction tx) throws JBOException{ BizObjectManager callback_detail_bom1 = JBOFactory.getBizObjectManager(LC_FUND_INCOME_CALLBACK_DETAIL_TEMP.CLASS_NAME) ; tx.join(callback_detail_bom1); - List callback_detail_di = callback_detail_bom1.createQuery("select o.DISTRIBUTOR_ID from o where FLOWUNID=:FLOWUNID").setParameter("FLOWUNID", FLOWUNID).getResultList(); + List callback_detail_di = callback_detail_bom1.createQuery("select o.CONTRACT_ID from o where FLOWUNID=:FLOWUNID").setParameter("FLOWUNID", FLOWUNID).getResultList(false); String sql1="update O set O.EBANK_STATUS='04' where O.FLOWUNID='"+FLOWUNID+"'"; JBOFactory.createBizObjectQuery(LC_FUND_INCOME_TEMP.CLASS_NAME,sql1).executeUpdate(); - String distributor_id=null; + String contract_id=null; if(callback_detail_di!=null||(!"".equals(callback_detail_di))){ for(BizObject di:callback_detail_di){ - distributor_id=di.getAttribute("DISTRIBUTOR_ID").toString(); + contract_id=di.getAttribute("CONTRACT_ID").toString(); String sql2 = "update O left join jbo.com.tenwa.lease.comm.LB_CONTRACT_INFO lci on lci.id=O.contract_id" - +" left join jbo.com.tenwa.lease.comm.LC_FUND_INCOME_CALLBACK_DETAIL_TEMP tt on tt.DISTRIBUTOR_ID=lci.distributor_id" - +" and O.FLOWUNID=tt.FLOWUNID set O.EBANK_STATUS=case when tt.RTNFLG='S' then '05' when tt.RTNFLG is null or tt.RTNFLG='' then '03' else '04' end where O.FLOWUNID='"+FLOWUNID+"'and tt.DISTRIBUTOR_ID='"+distributor_id+"'" ; + +" left join jbo.com.tenwa.lease.comm.LC_FUND_INCOME_CALLBACK_DETAIL_TEMP tt on tt.CONTRACT_ID=lci.id" + +" and O.FLOWUNID=tt.FLOWUNID set O.EBANK_STATUS=case when tt.RTNFLG='S' then '05' when tt.RTNFLG is null or tt.RTNFLG='' then '03' else '04' end where O.FLOWUNID='"+FLOWUNID+"'and tt.CONTRACT_ID='"+contract_id+"'" ; JBOFactory.createBizObjectQuery(LC_FUND_INCOME_TEMP.CLASS_NAME,sql2).executeUpdate(); } }