From 0426c41442b2451dc98c0269c6b998c0c514c13c Mon Sep 17 00:00:00 2001 From: tangfutang Date: Fri, 9 Nov 2018 19:41:29 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=86=E7=94=B5=E5=AD=90=E7=AD=BE=E7=BA=A6?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E6=94=B9=E5=AD=98=E5=85=A5=E4=B8=B4=E6=97=B6?= =?UTF-8?q?=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Comm/LBContract/LBContractPrintList.jsp | 2 +- .../action/ContractSignAction.java | 19 +++++++++++++------ .../contractaward/ContractAward.java | 7 +++++-- 3 files changed, 19 insertions(+), 9 deletions(-) diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LBContract/LBContractPrintList.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBContract/LBContractPrintList.jsp index d2449f7d0..29d7139b1 100644 --- a/WebContent/Tenwa/Lease/Flow/Comm/LBContract/LBContractPrintList.jsp +++ b/WebContent/Tenwa/Lease/Flow/Comm/LBContract/LBContractPrintList.jsp @@ -165,7 +165,7 @@ AsDebug.showMessage("提示","没有发起电子签约,无法获取签约状态！","","",true); return; } - var sParams="ProjectId=<%=projectId%>,customerType=<%=custtype%>,CurUserID=<%=CurUser.getUserID()%>"; + var sParams="ProjectId=<%=projectId%>,customerType=<%=custtype%>,FlowUnid=<%=flowunid%>,CurUserID=<%=CurUser.getUserID()%>"; var sReturn=RunJavaMethodTrans("com.tenwa.channelportal.action.ContractSignAction","contractSignStatus",sParams); AsDebug.showMessage("提示",sReturn,"","",true,'','','',function(){ <%-- var sReturns = RunJavaMethodTrans("com.tenwa.channelportal.action.ContractSignAction","downloadDoc","ProjectId=<%=projectId%>,CurUserID=<%=CurUser.getUserID()%>"); --%> diff --git a/src/com/tenwa/channelportal/action/ContractSignAction.java b/src/com/tenwa/channelportal/action/ContractSignAction.java index f49ee7f24..10121dffe 100644 --- a/src/com/tenwa/channelportal/action/ContractSignAction.java +++ b/src/com/tenwa/channelportal/action/ContractSignAction.java @@ -27,6 +27,7 @@ import jbo.com.tenwa.lease.carbrand.LB_CONTRACT_SIGN_LOG; import jbo.com.tenwa.lease.comm.LB_CONTRACT_TEMPLATE; import jbo.com.tenwa.lease.comm.LB_GUARANTEE_UNIT_TEMP; import jbo.com.tenwa.lease.comm.LB_PROJECT_INFO; +import jbo.com.tenwa.lease.comm.LB_PROJECT_INFO_TEMP; import jbo.com.tenwa.lease.comm.LB_UNION_LESSEE; import jbo.com.tenwa.lease.comm.LB_UNION_LESSEE_TEMP; import jbo.sys.CODE_LIBRARY; @@ -217,7 +218,8 @@ public class ContractSignAction{ @SuppressWarnings("unchecked") public String signIng(JBOTransaction tx) throws Exception { requestService = (HttpRequestAppService) factory.create(HttpRequestAppService.class, this.getConfigRequestUrl()); - BizObjectManager pbm = JBOFactory.getBizObjectManager(LB_PROJECT_INFO.CLASS_NAME, tx); + //BizObjectManager pbm = JBOFactory.getBizObjectManager(LB_PROJECT_INFO.CLASS_NAME, tx); + BizObjectManager pbm = JBOFactory.getBizObjectManager(LB_PROJECT_INFO_TEMP.CLASS_NAME, tx); BizObjectManager contBom = JBOFactory.getBizObjectManager(LB_DOC_CONTRACT_LIST.CLASS_NAME, tx); BizObjectManager lcslBom = JBOFactory.getBizObjectManager(LB_CONTRACT_SIGN_LOG.CLASS_NAME,tx); Map> map = new HashMap>(); @@ -225,7 +227,8 @@ public class ContractSignAction{ List bo = null; BizObject ldclBo = null; try { - BizObject pbo = pbm.createQuery("id=:id").setParameter("id", ProjectId).getSingleResult(true); + //BizObject pbo = pbm.createQuery("id=:id").setParameter("id", ProjectId).getSingleResult(true); + BizObject pbo = pbm.createQuery("FLOWUNID=:flowunid").setParameter("flowunid", FlowUnid).getSingleResult(true); // 查询lb_doc_contract_list表 bo = contBom.createQuery("project_id=:projectId and file_flag='yes' and (sendprocess='0' or sendprocess='2' ) ").setParameter("projectId", ProjectId).getResultList(true); for (BizObject keys : bo) { @@ -355,14 +358,16 @@ public class ContractSignAction{ @SuppressWarnings("unchecked") public String compnySignIng(JBOTransaction tx) throws Exception { requestService = (HttpRequestAppService) factory.create(HttpRequestAppService.class, this.getConfigRequestUrl()); - BizObjectManager pbm = JBOFactory.getBizObjectManager(LB_PROJECT_INFO.CLASS_NAME, tx); + //BizObjectManager pbm = JBOFactory.getBizObjectManager(LB_PROJECT_INFO.CLASS_NAME, tx); + BizObjectManager pbm = JBOFactory.getBizObjectManager(LB_PROJECT_INFO_TEMP.CLASS_NAME, tx); BizObjectManager contBom = JBOFactory.getBizObjectManager(LB_DOC_CONTRACT_LIST.CLASS_NAME, tx); Map map = new HashMap(); ContractSignInfo con = null; List bo = null; BizObject ldclBo = null; try { - BizObject pbo = pbm.createQuery("id=:id").setParameter("id", ProjectId).getSingleResult(true); + //BizObject pbo = pbm.createQuery("id=:id").setParameter("id", ProjectId).getSingleResult(true); + BizObject pbo = pbm.createQuery("FLOWUNID=:flowunid").setParameter("flowunid", FlowUnid).getSingleResult(true); // 查询lb_doc_contract_list表 bo = contBom.createQuery("project_id=:projectId and file_flag='yes' and (sendprocess='0' or sendprocess='2' ) ").setParameter("projectId", ProjectId).getResultList(true); for (BizObject keys : bo) { @@ -988,11 +993,13 @@ public class ContractSignAction{ */ public String contractSignStatus(JBOTransaction tx) throws Exception { requestService = (HttpRequestAppService) factory.create(HttpRequestAppService.class, this.getConfigRequestUrl()); - BizObjectManager pbm = JBOFactory.getBizObjectManager(LB_PROJECT_INFO.CLASS_NAME, tx); + //BizObjectManager pbm = JBOFactory.getBizObjectManager(LB_PROJECT_INFO.CLASS_NAME, tx); + BizObjectManager pbm = JBOFactory.getBizObjectManager(LB_PROJECT_INFO_TEMP.CLASS_NAME, tx); BizObjectManager clBom = JBOFactory.getBizObjectManager(CODE_LIBRARY.CLASS_NAME, tx); BizObjectManager contBom = JBOFactory.getBizObjectManager(LB_DOC_CONTRACT_LIST.CLASS_NAME, tx); BizObjectManager ldBom = JBOFactory.getBizObjectManager(LB_DOCATTRIBUTE.CLASS_NAME, tx); - BizObject pbo = pbm.createQuery("id=:id").setParameter("id", ProjectId).getSingleResult(true); + //BizObject pbo = pbm.createQuery("id=:id").setParameter("id", ProjectId).getSingleResult(true); + BizObject pbo = pbm.createQuery("FLOWUNID=:flowunid").setParameter("flowunid", FlowUnid).getSingleResult(true); String status = ""; String peopleStatus=""; String sql = ""; diff --git a/src_tenwa/com/tenwa/action/channelportal/businesshanding/contractaward/ContractAward.java b/src_tenwa/com/tenwa/action/channelportal/businesshanding/contractaward/ContractAward.java index 0a2ca5552..36766d94c 100644 --- a/src_tenwa/com/tenwa/action/channelportal/businesshanding/contractaward/ContractAward.java +++ b/src_tenwa/com/tenwa/action/channelportal/businesshanding/contractaward/ContractAward.java @@ -14,6 +14,7 @@ import jbo.com.tenwa.lease.carbrand.BUSINESS_STATUS; import jbo.com.tenwa.lease.carbrand.VI_CONTRACTMAKEPRINTLIST; import jbo.com.tenwa.lease.comm.LB_CONTRACT_STATUS; import jbo.com.tenwa.lease.comm.LB_PROJECT_INFO; +import jbo.com.tenwa.lease.comm.LB_PROJECT_INFO_TEMP; import jbo.sys.CHANNEL_SUBMIT_APPLICATIONS; import com.amarsoft.app.als.bizobject.customer.CustomerManager; @@ -261,7 +262,8 @@ public void setProject_id(String project_id) { } public String projectStatus(JBOTransaction tx) throws JBOException{ - BizObjectManager bom = JBOFactory.getBizObjectManager(LB_PROJECT_INFO.CLASS_NAME,tx); + //BizObjectManager bom = JBOFactory.getBizObjectManager(LB_PROJECT_INFO.CLASS_NAME,tx); + BizObjectManager bom = JBOFactory.getBizObjectManager(LB_PROJECT_INFO_TEMP.CLASS_NAME,tx); BizObjectManager bomstatus = JBOFactory.getBizObjectManager(LB_CONTRACT_STATUS.CLASS_NAME,tx); BizObjectManager ldclBom = JBOFactory.getBizObjectManager(LB_DOC_CONTRACT_LIST.CLASS_NAME,tx); BizObjectManager vc = JBOFactory.getBizObjectManager(VI_CONTRACTMAKEPRINTLIST.CLASS_NAME,tx); @@ -275,7 +277,8 @@ public void setProject_id(String project_id) { if(vcs.size()>0){ unflag=false; } - BizObject bo=bom.createQuery("id='"+project_id+"'").getSingleResult(false); + //BizObject bo=bom.createQuery("id='"+project_id+"'").getSingleResult(false); + BizObject bo=bom.createQuery("FLOWUNID='"+FlowUnid+"'").getSingleResult(false); BizObject bostatus=bomstatus.createQuery("status_code='"+bo.getAttribute("PROJECT_STATUS").toString()+"'").getSingleResult(false); String projstatus=bostatus!=null?bostatus.getAttribute("STATUS_NAME").toString():""; return bo.getAttribute("DATA_STATE").toString()+"@"+projstatus+"@"+flag+"@"+unflag;