From 8abbd21d5635a6aa58a1ec20120cb7e7f7b803eb Mon Sep 17 00:00:00 2001 From: jianghongdong Date: Mon, 6 Aug 2018 18:38:46 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BD=92=E6=A1=A3=E4=BB=A5?= =?UTF-8?q?=E5=85=BC=E5=AE=B9=E8=BD=A6=E7=A7=9F=E4=B8=9A=E5=8A=A1=E7=9A=84?= =?UTF-8?q?=E5=BD=92=E6=A1=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Flow/FileManager/FileArchiving/FileArchivingInfo.jsp | 8 +++++++- .../com/tenwa/lease/app/cache/ContractInsuranceCache.java | 3 ++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/WebContent/Tenwa/Lease/Flow/FileManager/FileArchiving/FileArchivingInfo.jsp b/WebContent/Tenwa/Lease/Flow/FileManager/FileArchiving/FileArchivingInfo.jsp index 761e841ef..702661c8e 100644 --- a/WebContent/Tenwa/Lease/Flow/FileManager/FileArchiving/FileArchivingInfo.jsp +++ b/WebContent/Tenwa/Lease/Flow/FileManager/FileArchiving/FileArchivingInfo.jsp @@ -9,8 +9,14 @@ BizObjectManager ftManager = JBOFactory.getBizObjectManager(FLOW_TASK.CLASS_NAME); List fts = ftManager.createQuery("select * from o left join jbo.com.tenwa.entity.comm.flow.FLOW_BUSSINESS_OBJECT fbo on o.objectno=fbo.flow_unid where fbo.contract_id=:contractid and o.flowno='FundPaymentFlow' and o.phasetype='1040' order by endtime desc").setParameter("contractid",Id).getResultList(false); String flowUnid = ""; + String flowNo = ""; if(fts.size()>0){ flowUnid = fts.get(0).getAttribute("objectno").getString(); + flowNo = "FundPaymentFlow"; + }else{ + fts = ftManager.createQuery("select * from o left join jbo.com.tenwa.entity.comm.flow.FLOW_BUSSINESS_OBJECT fbo on o.objectno=fbo.flow_unid where fbo.contract_id=:contractid and o.flowno='FundPaymentCarFlow' and o.phasetype='1040' order by endtime desc").setParameter("contractid",Id).getResultList(false); + flowUnid = fts.get(0).getAttribute("objectno").getString(); + flowNo = "FundPaymentCarFlow"; } ASObjectModel doTemp = new ASObjectModel("LBFileArchivingInfo"); doTemp.setDefaultValue("ARCHIVING_PERSON", curUserId); @@ -20,7 +26,7 @@ dwTemp.Style = "2"; dwTemp.genHTMLObjectWindow(Id); String compClientID = request.getParameter("CompClientID"); - dwTemp.replaceColumn("doclist", "", CurPage.getObjectWindowOutput()); + dwTemp.replaceColumn("doclist", "", CurPage.getObjectWindowOutput()); String sButtons[][] =new String[][] { {"true","","Button","返回","返回","goBack()","","","","btn_icon_return"}, {"true","","Button","归档并返回","归档并返回","fileArchiving()","","","","btn_icon_edit"} diff --git a/src_tenwa/com/tenwa/lease/app/cache/ContractInsuranceCache.java b/src_tenwa/com/tenwa/lease/app/cache/ContractInsuranceCache.java index d94c292a9..f140bc48b 100644 --- a/src_tenwa/com/tenwa/lease/app/cache/ContractInsuranceCache.java +++ b/src_tenwa/com/tenwa/lease/app/cache/ContractInsuranceCache.java @@ -22,7 +22,8 @@ public class ContractInsuranceCache { Transaction Sqlca =null; try { Sqlca = Transaction.createTransaction(CacheLoaderFactory.getDataSource()); - String sql="SELECT lci.ID FROM LB_CONTRACT_INFO lci LEFT JOIN (SELECT CONTRACT_ID,SUM(EQUIP_AMT) cleanmoney FROM LC_CONTRACT_CONDITION GROUP BY CONTRACT_ID) lcc ON lcc.CONTRACT_ID= lci.ID LEFT JOIN (SELECT lfi.CONTRACT_ID,(SUM(lfi.FACT_MONEY)+SUM(lfi.FEE_ADJUST)) summoney FROM LC_FUND_INCOME lfi WHERE lfi.PAY_STATUS='have_paid' AND lfi.FEE_TYPE='feetype10' AND lfi.ROLL_BACK='0' GROUP BY lfi.CONTRACT_ID) lfisum ON lfisum.CONTRACT_ID=lci.ID WHERE lcc.cleanmoney=lfisum.summoney AND lci.ISFILEARCHIVED IS NULL "; +// String sql="SELECT lci.ID FROM LB_CONTRACT_INFO lci LEFT JOIN (SELECT CONTRACT_ID,SUM(EQUIP_AMT) cleanmoney FROM LC_CONTRACT_CONDITION GROUP BY CONTRACT_ID) lcc ON lcc.CONTRACT_ID= lci.ID LEFT JOIN (SELECT lfi.CONTRACT_ID,(SUM(lfi.FACT_MONEY)+SUM(lfi.FEE_ADJUST)) summoney FROM LC_FUND_INCOME lfi WHERE lfi.PAY_STATUS='have_paid' AND lfi.FEE_TYPE='feetype10' AND lfi.ROLL_BACK='0' GROUP BY lfi.CONTRACT_ID) lfisum ON lfisum.CONTRACT_ID=lci.ID WHERE lcc.cleanmoney=lfisum.summoney AND lci.ISFILEARCHIVED IS NULL "; + String sql="SELECT lci.ID FROM LB_CONTRACT_INFO lci LEFT JOIN (SELECT CONTRACT_ID,SUM(EQUIP_AMT) cleanmoney FROM LC_CONTRACT_CONDITION GROUP BY CONTRACT_ID) lcc ON lcc.CONTRACT_ID= lci.ID LEFT JOIN (SELECT lfi.CONTRACT_ID,(SUM(lfi.FACT_MONEY)+SUM(lfi.FEE_ADJUST)) summoney FROM LC_FUND_INCOME lfi WHERE lfi.PAY_STATUS='have_paid' AND lfi.FEE_TYPE='feetype10' AND lfi.ROLL_BACK='0' GROUP BY lfi.CONTRACT_ID) lfisum ON lfisum.CONTRACT_ID=lci.ID WHERE lci.CONTRACT_STATUS='31' AND lci.ISFILEARCHIVED IS NULL "; SqlObject asql = new SqlObject(sql); ASResultSet rs = null; rs = Sqlca.getASResultSet(asql);