From 0150d437e1d09f9f98ef83088b3575446676f498 Mon Sep 17 00:00:00 2001 From: G Date: Tue, 30 Oct 2018 18:22:50 +0800 Subject: [PATCH 01/15] =?UTF-8?q?=E7=A7=9F=E9=87=91=E8=B0=83=E6=95=B4?= =?UTF-8?q?=E9=80=9A=E7=9F=A5=E4=B9=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- WebContent/fileTemplate/租金调整通知书.docx | Bin 36298 -> 36335 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/WebContent/fileTemplate/租金调整通知书.docx b/WebContent/fileTemplate/租金调整通知书.docx index aeb83e17c5646ca672aefed574ba80c1496c584b..8f23cf31477ee38529e570e9673d67b802eaebaa 100644 GIT binary patch delta 9540 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 Date: Mon, 5 Nov 2018 14:00:22 +0800 Subject: [PATCH 02/15] =?UTF-8?q?=E5=9C=A8=E5=90=88=E5=90=8C=E5=AE=A1?= =?UTF-8?q?=E6=89=B9=E9=80=9A=E8=BF=87=E5=90=8E=EF=BC=8C=E4=B8=8D=E5=85=81?= =?UTF-8?q?=E8=AE=B8=E5=88=A0=E9=99=A4=E5=90=88=E5=90=8C=E6=A8=A1=E6=9D=BF?= =?UTF-8?q?=E5=92=8C=E7=94=9F=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LBContractTemplateList.jsp | 3 +++ .../LBContractTemplate/contract_template.jsp | 6 +++--- .../ContractChangeApplyList_Car.jsp | 3 ++- .../合同(售后回租)和抵押合同-修订版.docx | Bin 0 -> 53731 bytes 4 files changed, 8 insertions(+), 4 deletions(-) create mode 100644 WebContent/fileTemplate/合同(售后回租)和抵押合同-修订版.docx diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LBContractTemplate/LBContractTemplateList.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBContractTemplate/LBContractTemplateList.jsp index 6196384c1..089eb856c 100644 --- a/WebContent/Tenwa/Lease/Flow/Comm/LBContractTemplate/LBContractTemplateList.jsp +++ b/WebContent/Tenwa/Lease/Flow/Comm/LBContractTemplate/LBContractTemplateList.jsp @@ -44,6 +44,9 @@ if("01".equals(customertype)&&!"ͬ".equals(flowName)){ falg = "false"; } + if(RightType.equals("ReadOnly")){ + falg = "false"; + } //0Ƿչʾ 1 Ȩ޿ 2 չʾ 3ťʾ 4ť 5ť¼ 6 7 8 9ͼ꣬CSSʽ 10 String sButtons[][]=new String[][]{ {"false","","Button","","","newRecord()","","","","btn_icon_add",""}, diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LBContractTemplate/contract_template.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBContractTemplate/contract_template.jsp index fc3266539..76bd3deca 100644 --- a/WebContent/Tenwa/Lease/Flow/Comm/LBContractTemplate/contract_template.jsp +++ b/WebContent/Tenwa/Lease/Flow/Comm/LBContractTemplate/contract_template.jsp @@ -124,17 +124,17 @@ //isShowButton=false; String compClientID = request.getParameter("CompClientID"); String sparm=""; - dwTemp.replaceColumn("LBContractTemplateList", "", CurPage.getObjectWindowOutput()); + dwTemp.replaceColumn("LBContractTemplateList", "", CurPage.getObjectWindowOutput()); String sButtons[][] = null; if((null!=RightType&&RightType.equals("ReadOnly"))||(null!=ishistory&&ishistory.equals("true"))){ dwTemp.ReadOnly = "-2"; sButtons=new String[][]{ - {phaseno.equals("0010")?"true":"false","","Button","ɺͬ","ɺͬ","createContractByTemplate()","","","","btn_icon_up",""} + {phaseno.equals("0010")&&(!RightType.equals("ReadOnly"))?"true":"false","","Button","ɺͬ","ɺͬ","createContractByTemplate()","","","","btn_icon_up",""} }; }else{ sButtons=new String[][] { - {phaseno.equals("0010")?"true":"false","","Button","ɺͬ","ɺͬ","createContractByTemplate()","","","","btn_icon_up",""} + {phaseno.equals("0010")&&(!RightType.equals("ReadOnly"))?"true":"false","","Button","ɺͬ","ɺͬ","createContractByTemplate()","","","","btn_icon_up",""} }; } dwTemp.replaceColumn("contracttemplate", "
Եȡ
", CurPage.getObjectWindowOutput()); diff --git a/WebContent/Tenwa/Lease/Flow/Contract/ContractChange/ContractChangeApplyList_Car.jsp b/WebContent/Tenwa/Lease/Flow/Contract/ContractChange/ContractChangeApplyList_Car.jsp index ccba5eddc..b94f76d44 100644 --- a/WebContent/Tenwa/Lease/Flow/Contract/ContractChange/ContractChangeApplyList_Car.jsp +++ b/WebContent/Tenwa/Lease/Flow/Contract/ContractChange/ContractChangeApplyList_Car.jsp @@ -20,8 +20,9 @@ var customertype = sReturn[6]; var leasform = sReturn[7]; var carAttributes = sReturn[8]; + var isNetCar = sReturn[9]; var sParams = "ApplyType=<%=sApplyType%>,CurUserID=<%=CurUser.getUserID()%>"; - sParams =sParams+",carAttributes="+carAttributes+",leasform="+leasform+",customertype="+customertype+",ProjectId="+project_id+",FlowKey="+contract_number+",ProductId="+product_id+",ProjectNo="+project_no+",ContractId="+contract_id+",ProjectName="+project_name+",ApplyType=<%=sApplyType%>"; + sParams =sParams+",isNetCar="+isNetCar+",carAttributes="+carAttributes+",leasform="+leasform+",customertype="+customertype+",ProjectId="+project_id+",FlowKey="+contract_number+",ProductId="+product_id+",ProjectNo="+project_no+",ContractId="+contract_id+",ProjectName="+project_name+",ApplyType=<%=sApplyType%>"; var sReturnInfo = RunJavaMethodTrans("com.tenwa.flow.action.comm.BaseFlowStartAction","initFLow",sParams); if(typeof(sReturnInfo)=="undefined" || sReturnInfo=="" || sReturnInfo=="_CANCEL_") return; var sReturnInfos=sReturnInfo.split("@"); diff --git a/WebContent/fileTemplate/合同(售后回租)和抵押合同-修订版.docx b/WebContent/fileTemplate/合同(售后回租)和抵押合同-修订版.docx new file mode 100644 index 0000000000000000000000000000000000000000..f0e4cc24c471f106a0bb43b1331eedd1e88ed96d GIT binary patch literal 53731 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

*r?!n|pprmMjZ-X^jgMqqSA0?wI}jT&hrX znmj8@Pl>Rs*zuyTjCQLg)mHJI>!A`9uGcdzm~u!pyP44yUUPJPFIpx=nHu)0QHy$t z@igiXqxIB`@}CjoC_TlI8M9Gpm%DjMSkl|<(kxec!IPOMMK0QB<|E`^c7Ds4D-b!i z&*t~Tk&^t#BIdPGeJg37$?8gKD4xO4EwVXp4T@ zv{cOCPT?gF!myn(mNBe#@*`*L5FjYzj2^eLCj1Bo^=3EdPP%0!ZfUFJ<_KO*AT&E% zqgBw{wFN$OxH_0)tC?#A%U0k9;JRFnflKi#hXNVksC0is2#_Hzwk2vn31C6NlL|Kz zbFrIx1HhV31kWl2FK@Y2o{(FJP5y imt<=)IbKt^fh;)d(Z<9W$*KTS2q}aexbu1pf&K!*kNm{| literal 0 HcmV?d00001 From 4c249f5fa9556e72b285271fd6f6d1c290b0f161 Mon Sep 17 00:00:00 2001 From: G Date: Mon, 5 Nov 2018 15:11:19 +0800 Subject: [PATCH 03/15] =?UTF-8?q?=E7=A7=9F=E8=B5=81=E7=B3=BB=E7=BB=9F?= =?UTF-8?q?=E7=89=88=E6=9C=AC=E9=85=8D=E7=BD=AE=E5=88=97=E8=A1=A8=EF=BC=9B?= =?UTF-8?q?=20=E5=8E=BBdebugger?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LBEquipmentInfo.jsp | 1 - WebContent/Version/VersionInfo.jsp | 45 ++++++++++++++ WebContent/Version/VersionList.jsp | 62 +++++++++++++++++++ WebContent/WEB-INF/etc/jbo/jbo_lease.xml | 19 ++++++ 4 files changed, 126 insertions(+), 1 deletion(-) create mode 100644 WebContent/Version/VersionInfo.jsp create mode 100644 WebContent/Version/VersionList.jsp diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LBAssetTransferRegistration/LBEquipmentInfo.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBAssetTransferRegistration/LBEquipmentInfo.jsp index ec4362360..41e4ceb13 100644 --- a/WebContent/Tenwa/Lease/Flow/Comm/LBAssetTransferRegistration/LBEquipmentInfo.jsp +++ b/WebContent/Tenwa/Lease/Flow/Comm/LBAssetTransferRegistration/LBEquipmentInfo.jsp @@ -82,7 +82,6 @@ /*~[Describe=¼;InputParam=;OutPutParam=;]~*/ function saveRecord(){ - debugger; var ids="<%=ids%>"; ids=ids.replace(/,/ig,"@"); var ASSETTRANSFERER=getItemValue(0,getRow(0),"ASSETTRANSFERER"); diff --git a/WebContent/Version/VersionInfo.jsp b/WebContent/Version/VersionInfo.jsp new file mode 100644 index 000000000..bd926275c --- /dev/null +++ b/WebContent/Version/VersionInfo.jsp @@ -0,0 +1,45 @@ +<%@ page contentType="text/html; charset=GBK"%><%@ +include + file="/Frame/resources/include/include_begin_info.jspf"%> +<% + //ò + String id = CurPage.getParameter("id"); + if (id == null) + id = ""; + + String sUserID = CurPage.getParameter("UserID"); + if (sUserID == null) + sUserID = ""; + + java.util.Date dateNow = new java.util.Date(); + SimpleDateFormat sdfTemp = new SimpleDateFormat( + "yyyy/MM/dd"); + String date = sdfTemp.format(dateNow); + + ASObjectModel doTemp = new ASObjectModel("VERSION_INFO"); + ASObjectWindow dwTemp = new ASObjectWindow(CurPage, doTemp, + request); + dwTemp.Style = "2"; //DW 1:Grid 2:Freeform + dwTemp.ReadOnly = "0"; //Ƿֻ 1:ֻ 0:д + dwTemp.genHTMLObjectWindow(id); + + String sButtons[][] = {{"true", "All", "Button", "", + "޸", "saveRecord()", "", "", "", "btn_icon_save"},}; +%><%@ include file="/Frame/resources/include/ui/include_info.jspf"%> + +<%@ include file="/Frame/resources/include/include_end.jspf"%> diff --git a/WebContent/Version/VersionList.jsp b/WebContent/Version/VersionList.jsp new file mode 100644 index 000000000..d4cd59cc6 --- /dev/null +++ b/WebContent/Version/VersionList.jsp @@ -0,0 +1,62 @@ +<%@ page contentType="text/html; charset=GBK"%><%@ + include + file="/Frame/resources/include/include_begin_list.jspf"%> +<% + ASObjectModel doTemp = new ASObjectModel("VERSION_LIST"); + doTemp.setLockCount(2); // + ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request); + + dwTemp.Style="1"; //ΪGrid + dwTemp.ReadOnly = "1";//༭ģʽ + dwTemp.setPageSize(10); + dwTemp.ConvertCode2Title = "1"; + dwTemp.genHTMLObjectWindow(""); + + String sButtons[][] = { + {"true","","Button","Ӧ","һ汾","newRecord()","","","","btn_icon_add"}, + {"true","","Button","ӦϢ","鿴汾Ϣ","viewAndEdit()","","","","btn_icon_detail"}, + {"true","","Button","ɾӦ","ɾð汾","if(confirm('ȷʵҪɾ?'))as_delete(0,'')","","","","btn_icon_delete"}, + }; +%><%@include file="/Frame/resources/include/ui/include_list.jspf"%> + +<%@ include file="/Frame/resources/include/include_end.jspf"%> \ No newline at end of file diff --git a/WebContent/WEB-INF/etc/jbo/jbo_lease.xml b/WebContent/WEB-INF/etc/jbo/jbo_lease.xml index fefb5ba02..aedc6d2af 100644 --- a/WebContent/WEB-INF/etc/jbo/jbo_lease.xml +++ b/WebContent/WEB-INF/etc/jbo/jbo_lease.xml @@ -4717,6 +4717,25 @@ + + + + + + + + + + + + + + + + + + + From d386e945f34b97c1b23c12265d3c4641311e72fd Mon Sep 17 00:00:00 2001 From: liuzhao Date: Mon, 5 Nov 2018 15:22:08 +0800 Subject: [PATCH 04/15] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BA=8B=E7=89=A9?= =?UTF-8?q?=E5=85=B3=E9=97=AD=E9=93=BE=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../reriod/uploadReriodOperator.jsp | 2 +- .../upload/uploadRentOperator.jsp | 2 +- .../RentPlanIncomeList.jsp | 1 + .../FormatDoc/FDConfig/ChangeHtmlData2DB.jsp | 2 ++ WebContent/Common/WorkFlow/PassRound.jsp | 2 +- WebContent/Common/WorkFlow/TaskAssign.jsp | 2 +- WebContent/Frame/jbpmdesigner/GetNodeInfo.jsp | 2 +- .../ChannelDistributorAccountInfo.jsp | 1 + .../FlowBussinessView/ProductView.jsp | 1 + .../Lease/App/InformationTable/InfoView.jsp | 1 + .../LBContractTemplate/ContractListUpload.jsp | 1 + .../NormalContractListUpload.jsp | 1 + .../Flow/Fund/PaymentPlan/PaymentPlanList.jsp | 1 + .../impl/AmarScriptDataFetcher.java | 14 +++++--- .../tenwa/apzl/commission/commissionSet.java | 20 +++++++++++ .../cache/CollectAuditInfoCache.java | 4 ++- .../util/example/sqlOperatorExample.java | 3 ++ .../ContractRentCollectionHandler.java | 6 +++- .../FundIncomeEndRentPlanModify.java | 4 +++ .../rent/rentincome/RentIncomeMethod.java | 13 +++++-- .../tenwa/lease/app/cache/VoucherCache.java | 2 +- .../app/message/UpdateMessageHandler.java | 12 ++++++- .../lease/app/quartzmession/Commission.java | 17 ++++++--- .../lease/app/quartzmession/LBTESTinfo.java | 35 ++++++++++--------- .../lease/app/quartzmession/SplitInts3.java | 9 +++-- .../businessapply/CheckGuaranteeUnit.java | 7 ++++ .../project/businessapply/CustomerAction.java | 7 ++++ 27 files changed, 134 insertions(+), 38 deletions(-) diff --git a/WebContent/Accounting/LoanSimulation/reriod/uploadReriodOperator.jsp b/WebContent/Accounting/LoanSimulation/reriod/uploadReriodOperator.jsp index ab8e498e7..71f5daf3c 100644 --- a/WebContent/Accounting/LoanSimulation/reriod/uploadReriodOperator.jsp +++ b/WebContent/Accounting/LoanSimulation/reriod/uploadReriodOperator.jsp @@ -19,7 +19,7 @@ String cmessage=""; if (!myAmarsoftUpload.getFiles().getFile(0).isMissing()){ try { - JBOTransaction tx=JBOFactory.getFactory().createTransaction(); + //JBOTransaction tx=JBOFactory.getFactory().createTransaction(); String importparam= CurPage.getParameter("importparam"); importparam=importparam.replaceAll("@", ","); JSONObject paramJson=JSONDecoder.decode(importparam); diff --git a/WebContent/Accounting/LoanSimulation/upload/uploadRentOperator.jsp b/WebContent/Accounting/LoanSimulation/upload/uploadRentOperator.jsp index 619b5d097..5d33acd8d 100644 --- a/WebContent/Accounting/LoanSimulation/upload/uploadRentOperator.jsp +++ b/WebContent/Accounting/LoanSimulation/upload/uploadRentOperator.jsp @@ -20,7 +20,7 @@ String cmessage=""; if (!myAmarsoftUpload.getFiles().getFile(0).isMissing()){ try { - JBOTransaction tx=JBOFactory.getFactory().createTransaction(); + //JBOTransaction tx=JBOFactory.getFactory().createTransaction(); String importparam= CurPage.getParameter("importparam"); importparam=importparam.replaceAll("@", ","); JSONObject paramJson=JSONDecoder.decode(importparam); diff --git a/WebContent/Accounting/LoanSimulation_formal/RentPlanIncomeList.jsp b/WebContent/Accounting/LoanSimulation_formal/RentPlanIncomeList.jsp index 95dc975bf..2b539a48d 100644 --- a/WebContent/Accounting/LoanSimulation_formal/RentPlanIncomeList.jsp +++ b/WebContent/Accounting/LoanSimulation_formal/RentPlanIncomeList.jsp @@ -46,6 +46,7 @@ JBOTransaction tx=JBOFactory.createJBOTransaction(); Map params=new HashMap(); list=DataOperatorUtil.getDataBySql(tx, sql, params); + tx.commit(); String[][] displayData = new String[list.size()][headers.length]; for(int i=0;i <%@ page contentType="text/html; charset=GBK"%> <%@ include file="/IncludeBeginMDAJAX.jsp"%><% - JBOTransaction tx = JBOFactory.createJBOTransaction(); + //JBOTransaction tx = JBOFactory.createJBOTransaction(); String result = ""; String xCoordinate = CurPage.getParameter("xcoordinate"); String yCoordinate = CurPage.getParameter("ycoordinate"); diff --git a/WebContent/Tenwa/ChannelPortal/DistributorManage/DistributorRegister/ChannelDistributorAccountInfo.jsp b/WebContent/Tenwa/ChannelPortal/DistributorManage/DistributorRegister/ChannelDistributorAccountInfo.jsp index b5bc698d1..e182b631a 100644 --- a/WebContent/Tenwa/ChannelPortal/DistributorManage/DistributorRegister/ChannelDistributorAccountInfo.jsp +++ b/WebContent/Tenwa/ChannelPortal/DistributorManage/DistributorRegister/ChannelDistributorAccountInfo.jsp @@ -29,6 +29,7 @@ searchCondtion.put("id",distributor_id); JBOTransaction tx = JBOFactory.createJBOTransaction(); BizObject bo = DataOperatorUtil.getSingleJBO(DISTRIBUTOR_INFO.CLASS_NAME,searchCondtion,tx); + tx.commit(); int size = bo==null? 0:1; String sTempletNo = "CustomerDistributorAccountInfo";//--ģ-- diff --git a/WebContent/Tenwa/Core/FlowManager/FlowBussinessView/ProductView.jsp b/WebContent/Tenwa/Core/FlowManager/FlowBussinessView/ProductView.jsp index 7ba9a8138..948c52ba9 100644 --- a/WebContent/Tenwa/Core/FlowManager/FlowBussinessView/ProductView.jsp +++ b/WebContent/Tenwa/Core/FlowManager/FlowBussinessView/ProductView.jsp @@ -55,6 +55,7 @@ <% OHTMLTreeView tviTemp = new OHTMLTreeView(CurPage,"ҵ","right"); FlowTaskViewTabService.initOHTMLTreeViewProduct(tx,tviTemp,FlowFixedParam); + tx.commit(); %> <%/*~END~*/%> diff --git a/WebContent/Tenwa/Lease/App/InformationTable/InfoView.jsp b/WebContent/Tenwa/Lease/App/InformationTable/InfoView.jsp index c986bf7b7..373976f75 100644 --- a/WebContent/Tenwa/Lease/App/InformationTable/InfoView.jsp +++ b/WebContent/Tenwa/Lease/App/InformationTable/InfoView.jsp @@ -34,6 +34,7 @@ <% OHTMLTreeView tviTemp = new OHTMLTreeView(CurPage,"ҵ","right"); FlowTaskViewTabService.initOHTMLTreeViewProjectContract(tx,tviTemp,CurPage); + tx.commit(); String FlowUnid=CurPage.getParameter("FlowUnid"); %> <%/*~END~*/%> diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LBContractTemplate/ContractListUpload.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBContractTemplate/ContractListUpload.jsp index fa1ff2b16..33972bba2 100644 --- a/WebContent/Tenwa/Lease/Flow/Comm/LBContractTemplate/ContractListUpload.jsp +++ b/WebContent/Tenwa/Lease/Flow/Comm/LBContractTemplate/ContractListUpload.jsp @@ -41,6 +41,7 @@ if(list.size()>0){ libraryId=list.get(0).get("ID"); } + tx.commit(); } BizObjectManager libBm=JBOFactory.getBizObjectManager("jbo.app.tenwa.doc.LB_DOCLIBRARY"); BizObjectManager attrBm=JBOFactory.getBizObjectManager("jbo.app.tenwa.doc.LB_DOCATTRIBUTE"); diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LBContractTemplate/NormalContractListUpload.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBContractTemplate/NormalContractListUpload.jsp index 82cf7f122..6f593ef85 100644 --- a/WebContent/Tenwa/Lease/Flow/Comm/LBContractTemplate/NormalContractListUpload.jsp +++ b/WebContent/Tenwa/Lease/Flow/Comm/LBContractTemplate/NormalContractListUpload.jsp @@ -29,6 +29,7 @@ map.clear(); map.put("flow_unid", FlowUnid); List> list=DataOperatorUtil.getDataBySql(tx, sql, map); + tx.commit(); if(list.size()==0){ %> diff --git a/WebContent/Tenwa/Lease/Flow/Fund/PaymentPlan/PaymentPlanList.jsp b/WebContent/Tenwa/Lease/Flow/Fund/PaymentPlan/PaymentPlanList.jsp index 41a45628e..e67b85898 100644 --- a/WebContent/Tenwa/Lease/Flow/Fund/PaymentPlan/PaymentPlanList.jsp +++ b/WebContent/Tenwa/Lease/Flow/Fund/PaymentPlan/PaymentPlanList.jsp @@ -47,6 +47,7 @@ JBOTransaction tx=JBOFactory.createJBOTransaction(); Map params=new HashMap(); list=DataOperatorUtil.getDataBySql(tx, sql, params); + tx.commit(); displayData = new String[list.size()][headers.length]; for(int i=0;i=start){ return "fail"; diff --git a/src_tenwa/com/tenwa/collectaudit/cache/CollectAuditInfoCache.java b/src_tenwa/com/tenwa/collectaudit/cache/CollectAuditInfoCache.java index 2204f99fb..3f430ff67 100644 --- a/src_tenwa/com/tenwa/collectaudit/cache/CollectAuditInfoCache.java +++ b/src_tenwa/com/tenwa/collectaudit/cache/CollectAuditInfoCache.java @@ -354,6 +354,7 @@ public class CollectAuditInfoCache { j++; } if (map.containsKey("RET_CODE") && "0000".equals(map.get("RET_CODE"))) { + Transaction Sqlca =null; String cerrentDate = DateAssistant.getToday(); JBOTransaction transaction = JBOFactory.createJBOTransaction(); BizObjectManager bmi = JBOFactory.getFactory().getManager(LC_RENT_PLAN.CLASS_NAME,transaction); @@ -372,12 +373,12 @@ public class CollectAuditInfoCache { + "'"+boi.getAttribute("CONTRACT_ID")+"','"+boi.getAttribute("CONTRACT_PLAN_NUMBER")+"','"+boi.getAttribute("PAYMENT_NUMBER")+"','"+boi.getAttribute("EBANK_NUMBER")+"','"+boi.getAttribute("PLAN_ID")+"'," + "'"+boi.getAttribute("PLAN_LIST")+"','"+boi.getAttribute("INTEREST_ADJUST")+"','"+boi.getAttribute("SETTLE_METHOD")+"','"+boi.getAttribute("HIRE_LIST")+"','"+boi.getAttribute("HIRE_DATE")+"','"+boi.getAttribute("RENT")+"','"+boi.getAttribute("CORPUS")+"'," + "'"+boi.getAttribute("INTEREST")+"','"+boi.getAttribute("PENALTY")+"','"+boi.getAttribute("CORPUS_ADJUST")+"','"+boi.getAttribute("PENALTY_ADJUST")+"','"+boi.getAttribute("ROLL_BACK")+"','"+boi.getAttribute("COIN")+"')"; - Transaction Sqlca =null; Sqlca = Transaction.createTransaction(transaction); SqlObject asql = new SqlObject(sql); Sqlca.executeSQL(asql); } transaction.commit(); + Sqlca.commit(); } BizObject bco = bc.createQuery("id=:id").setParameter("id", bo.getAttribute("id").toString()).getSingleResult(false); String batch_number = bco.getAttribute("batch_number").toString(); @@ -439,6 +440,7 @@ public class CollectAuditInfoCache { Sqlca = Transaction.createTransaction(transaction); SqlObject asql = new SqlObject(sql); Sqlca.executeSQL(asql); + Sqlca.commit(); } transaction.commit(); BizObject bco = bc.createQuery("id=:id").setParameter("id", bo.getAttribute("id").toString()).getSingleResult(false); diff --git a/src_tenwa/com/tenwa/database/util/example/sqlOperatorExample.java b/src_tenwa/com/tenwa/database/util/example/sqlOperatorExample.java index 359b9fa9e..8f37d6b36 100644 --- a/src_tenwa/com/tenwa/database/util/example/sqlOperatorExample.java +++ b/src_tenwa/com/tenwa/database/util/example/sqlOperatorExample.java @@ -71,6 +71,9 @@ public class sqlOperatorExample { } Sqlca.disConnect(); Sqlca=null; + conn.commit(); + conn.close(); + conn=null; return "xxxx"; } diff --git a/src_tenwa/com/tenwa/flow/comm/handler/flowmanage/ContractRentCollectionHandler.java b/src_tenwa/com/tenwa/flow/comm/handler/flowmanage/ContractRentCollectionHandler.java index 4dfb86932..298786a79 100644 --- a/src_tenwa/com/tenwa/flow/comm/handler/flowmanage/ContractRentCollectionHandler.java +++ b/src_tenwa/com/tenwa/flow/comm/handler/flowmanage/ContractRentCollectionHandler.java @@ -39,10 +39,14 @@ public class ContractRentCollectionHandler extends CommonHandler{ } }catch(Exception e) { - + if(Sqlca !=null){ + Sqlca.rollback(); + Sqlca=null; + } } finally{ if(Sqlca!=null){ + Sqlca.commit(); Sqlca.disConnect(); Sqlca=null; } diff --git a/src_tenwa/com/tenwa/flow/fund/actualpayment/FundIncomeEndRentPlanModify.java b/src_tenwa/com/tenwa/flow/fund/actualpayment/FundIncomeEndRentPlanModify.java index 1a81ab353..ff2b34904 100644 --- a/src_tenwa/com/tenwa/flow/fund/actualpayment/FundIncomeEndRentPlanModify.java +++ b/src_tenwa/com/tenwa/flow/fund/actualpayment/FundIncomeEndRentPlanModify.java @@ -248,6 +248,10 @@ public class FundIncomeEndRentPlanModify extends BaseBussiness{ Sqlca = Transaction.createTransaction(tx); SqlObject asql = new SqlObject(sql); Sqlca.executeSQL(asql); + + Sqlca.commit(); + + } private void delete(String paymentNumber,JBOTransaction tx) throws Exception{ diff --git a/src_tenwa/com/tenwa/flow/rent/rentincome/RentIncomeMethod.java b/src_tenwa/com/tenwa/flow/rent/rentincome/RentIncomeMethod.java index 852b3df53..394d8a647 100644 --- a/src_tenwa/com/tenwa/flow/rent/rentincome/RentIncomeMethod.java +++ b/src_tenwa/com/tenwa/flow/rent/rentincome/RentIncomeMethod.java @@ -829,9 +829,18 @@ public class RentIncomeMethod { call.execute(); }catch(Exception e){ e.printStackTrace(); - con.rollback(); - tx.rollback(); + if(con !=null){ + con.rollback(); + con.close(); + con = null; + } return "ERROR"; + }finally{ + if(con !=null){ + con.commit(); + con.close(); + con = null; + } } return sReturn; } diff --git a/src_tenwa/com/tenwa/lease/app/cache/VoucherCache.java b/src_tenwa/com/tenwa/lease/app/cache/VoucherCache.java index a3f1fbc4a..11aab442f 100644 --- a/src_tenwa/com/tenwa/lease/app/cache/VoucherCache.java +++ b/src_tenwa/com/tenwa/lease/app/cache/VoucherCache.java @@ -13,7 +13,7 @@ public class VoucherCache { public static String getAuxiliary(String id) throws Exception { - JBOTransaction tx=JBOFactory.getFactory().createTransaction(); + //JBOTransaction tx=JBOFactory.getFactory().createTransaction(); BizObjectManager bm=JBOFactory.getFactory().getManager(VOUCHERASSSTACTS_INFO.CLASS_NAME); String memo=""; List vous=bm.createQuery("select * from O where O.id in (select conn.ASSTACTTYPE from jbo.app.VOUCHER_CONNECTION conn where conn.config_id=:id)") diff --git a/src_tenwa/com/tenwa/lease/app/message/UpdateMessageHandler.java b/src_tenwa/com/tenwa/lease/app/message/UpdateMessageHandler.java index 1a3a8c721..136f57105 100644 --- a/src_tenwa/com/tenwa/lease/app/message/UpdateMessageHandler.java +++ b/src_tenwa/com/tenwa/lease/app/message/UpdateMessageHandler.java @@ -47,15 +47,25 @@ public class UpdateMessageHandler { setSQL=setSQLStr.substring(0, setSQLStr.length()-1).replaceAll("@", ","); sql.append(setSQL); sql.append(idstr); - try{ Transaction Sqlca =null; + try{ Sqlca = Transaction.createTransaction(tx); SqlObject asql = new SqlObject(sql.toString()); Sqlca.executeSQL(asql); return "true"; }catch(Exception e){ e.printStackTrace(); + if(Sqlca != null){ + Sqlca.rollback(); + Sqlca=null; + } return "false"; + }finally{ + if(Sqlca != null){ + Sqlca.commit(); + Sqlca.disConnect(); + Sqlca=null; + } } } } diff --git a/src_tenwa/com/tenwa/lease/app/quartzmession/Commission.java b/src_tenwa/com/tenwa/lease/app/quartzmession/Commission.java index 198754416..02bb1a4c9 100644 --- a/src_tenwa/com/tenwa/lease/app/quartzmession/Commission.java +++ b/src_tenwa/com/tenwa/lease/app/quartzmession/Commission.java @@ -35,16 +35,25 @@ public class Commission implements Job{ //String sql="{CALL proc_insert_jlyj_his('2018/10/30','2018/10/30')};"; SqlObject asql = new SqlObject(sql); Sqlca.executeSQL(asql); - tx.commit(); QuartzUtil.insertLog(startime,"com.tenwa.lease.app.quartzmession.Commission", "success", "ɹ", curUserId); } catch (Exception e) { QuartzUtil.insertLog(startime,"com.tenwa.lease.app.quartzmession.Commission", "success", "ʧ", curUserId); logger.error(e.getMessage()); e.printStackTrace(); + if(Sqlca!=null){ + try { + Sqlca.rollback(); + Sqlca = null; + } catch (JBOException e1) { + e1.printStackTrace(); + } + } }finally{ - if(tx!=null){ - try { - tx.rollback(); + if(Sqlca!=null){ + try { + Sqlca.commit(); + Sqlca.disConnect(); + Sqlca = null; } catch (JBOException e) { e.printStackTrace(); } diff --git a/src_tenwa/com/tenwa/lease/app/quartzmession/LBTESTinfo.java b/src_tenwa/com/tenwa/lease/app/quartzmession/LBTESTinfo.java index f6a538914..d048bcb33 100644 --- a/src_tenwa/com/tenwa/lease/app/quartzmession/LBTESTinfo.java +++ b/src_tenwa/com/tenwa/lease/app/quartzmession/LBTESTinfo.java @@ -1,29 +1,15 @@ package com.tenwa.lease.app.quartzmession; -import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.UUID; - import org.quartz.Job; import org.quartz.JobExecutionContext; import org.quartz.JobExecutionException; -import com.amarsoft.are.jbo.BizObject; -import com.amarsoft.are.jbo.BizObjectManager; import com.amarsoft.are.jbo.JBOException; import com.amarsoft.are.jbo.JBOFactory; import com.amarsoft.are.jbo.JBOTransaction; import com.amarsoft.are.util.StringFunction; import com.amarsoft.awe.util.Transaction; import com.base.util.QuartzUtil; -import com.tenwa.comm.util.jboutil.DataOperatorUtil; -import com.tenwa.reckon.util.Conn; - -import jbo.app.tenwa.customer.LB_TEST; -import jbo.com.tenwa.entity.comm.own.LC_SOURCE_OF_FUNDS; public class LBTESTinfo implements Job{ @Override @@ -33,10 +19,10 @@ public class LBTESTinfo implements Job{ Object userId = arg0.getTrigger().getJobDataMap().get("CurUserId"); String curUserId = userId == null? "system" : userId.toString(); + Transaction Sqlca = null; try { JBOTransaction tx = JBOFactory.createJBOTransaction(); //BizObjectManager LCBizObjectManager =JBOFactory.getBizObjectManager(LC_SOURCE_OF_FUNDS.CLASS_NAME,tx); - Transaction Sqlca = null; Sqlca = Transaction.createTransaction(tx); String insertSql="INSERT INTO LC_SOURCE_OF_FUNDS (id, contract_no, businesstype, lease_acc_name)"+ " (SELECT REPLACE(UUID(), '-', '') AS id,"+ @@ -53,11 +39,28 @@ public class LBTESTinfo implements Job{ "AND lci.contract_no NOT IN "+ "(SELECT IFNULL(contract_no, '') AS contract_no FROM LC_SOURCE_OF_FUNDS))"; Sqlca.executeSQL(insertSql); - tx.commit(); QuartzUtil.insertLog(startime, "com.tenwa.lease.app.quartzmession.LBTESTinfo", "success", "ɹ", curUserId); } catch (Exception e) { QuartzUtil.insertLog(startime, "com.tenwa.lease.app.quartzmession.LBTESTinfo", "error", "ʧ", curUserId); e.printStackTrace(); + if(Sqlca!=null){ + try { + Sqlca.rollback(); + Sqlca = null; + } catch (JBOException e1) { + e1.printStackTrace(); + } + } + }finally{ + if(Sqlca!=null){ + try { + Sqlca.commit(); + Sqlca.disConnect(); + Sqlca = null; + } catch (JBOException e) { + e.printStackTrace(); + } + } } } diff --git a/src_tenwa/com/tenwa/lease/app/quartzmession/SplitInts3.java b/src_tenwa/com/tenwa/lease/app/quartzmession/SplitInts3.java index a62cd2aa2..014d7dc44 100644 --- a/src_tenwa/com/tenwa/lease/app/quartzmession/SplitInts3.java +++ b/src_tenwa/com/tenwa/lease/app/quartzmession/SplitInts3.java @@ -56,7 +56,7 @@ public class SplitInts3 implements Job{ Transaction Sqlca =null; List idList=new ArrayList(); - tx =JBOFactory.createJBOTransaction(); + //tx =JBOFactory.createJBOTransaction(); Sqlca = Transaction.createTransaction(tx); //ͳ¸ String sql="SELECT lci.id AS ID ,lcc.PAYMENT_NUMBER,getTax(lci.leas_form,'Ϣ',lcc.start_date) as TAX, lcc.START_DATE,lr.interest INTEREST, ROUND(lcc.HANDLING_CHARGE_MONEY/getTax(lci.LEAS_FORM,'',lcc.start_date),2) AS HANDLING_CHARGE_MONEY FROM lb_contract_info lci LEFT JOIN lc_calc_condition lcc ON lcc.contract_id=lci.id LEFT JOIN (SELECT lrp.contract_id,ROUND(SUM(lrp.interest/getTax(lci.LEAS_FORM,'Ϣ',lcc.start_date)),2) interest FROM lc_rent_plan lrp LEFT JOIN lb_contract_info lci ON lci.id=lrp.CONTRACT_ID LEFT JOIN lc_calc_condition lcc ON lcc.contract_id=lci.id GROUP BY lrp.contract_id) lr ON lr.contract_id=lci.id WHERE NOT EXISTS (SELECT 1 FROM contract_rent_month WHERE contract_id = lcc.contract_id) AND nvl(lr.interest,0) > 0 AND lci.contract_status BETWEEN 31 AND 100 AND lci.id NOT IN (SELECT contract_id FROM lc_fund_rent_adjust) AND lci.BUSINESSTYPE<>'1' AND lcc.INCOME_NUMBER_YEAR='income_1'"; @@ -64,6 +64,7 @@ public class SplitInts3 implements Job{ //ͳ¸ List> dataList=DataOperatorUtil.getDataBySql(Sqlca, sql, map); tx.commit(); + Sqlca.commit(); for(Map ma:dataList){ MonthInterestEntity mit =new MonthInterestEntity(); String contract_id=ma.get("ID"); @@ -81,7 +82,7 @@ public class SplitInts3 implements Job{ Transaction Sqlca =null; List idList=new ArrayList(); - tx =JBOFactory.createJBOTransaction(); + //tx =JBOFactory.createJBOTransaction(); Sqlca = Transaction.createTransaction(tx); //ͳ String sql="SELECT lci.id AS ID ,lcc.PAYMENT_NUMBER,getTax(lci.leas_form,'Ϣ',lcc.start_date) as TAX, lcc.START_DATE,lr.interest INTEREST, ROUND(lcc.HANDLING_CHARGE_MONEY/getTax(lci.LEAS_FORM,'',lcc.start_date),2) AS HANDLING_CHARGE_MONEY FROM lb_contract_info lci LEFT JOIN lc_calc_condition lcc ON lcc.contract_id=lci.id LEFT JOIN (SELECT lrp.contract_id,ROUND(SUM(lrp.interest/getTax(lci.LEAS_FORM,'Ϣ',lcc.start_date)),2) interest FROM lc_rent_plan lrp LEFT JOIN lb_contract_info lci ON lci.id=lrp.CONTRACT_ID LEFT JOIN lc_calc_condition lcc ON lcc.contract_id=lci.id GROUP BY lrp.contract_id) lr ON lr.contract_id=lci.id WHERE NOT EXISTS (SELECT 1 FROM contract_rent_month WHERE contract_id = lcc.contract_id) AND nvl(lr.interest,0) > 0 AND lci.contract_status BETWEEN 31 AND 100 AND lci.id NOT IN (SELECT contract_id FROM lc_fund_rent_adjust) AND lci.BUSINESSTYPE<>'1' AND lcc.INCOME_NUMBER_YEAR='income_3'"; @@ -89,7 +90,8 @@ public class SplitInts3 implements Job{ Map map=new HashMap(); //ͳ List> dataList=DataOperatorUtil.getDataBySql(Sqlca, sql, map); - tx.commit(); + //tx.commit(); + Sqlca.commit(); for(Map ma:dataList){ MonthInterestEntity mit =new MonthInterestEntity(); String contract_id=ma.get("ID"); @@ -117,6 +119,7 @@ public class SplitInts3 implements Job{ List bolist=mit.getBizObjList(); saveBM(tx,bolist); tx.commit(); + Sqlca.commit(); } public void saveBM(JBOTransaction tx,List boList) throws Exception{ diff --git a/src_tenwa/com/tenwa/lease/flow/project/businessapply/CheckGuaranteeUnit.java b/src_tenwa/com/tenwa/lease/flow/project/businessapply/CheckGuaranteeUnit.java index 9f131a138..7be1ccbd2 100644 --- a/src_tenwa/com/tenwa/lease/flow/project/businessapply/CheckGuaranteeUnit.java +++ b/src_tenwa/com/tenwa/lease/flow/project/businessapply/CheckGuaranteeUnit.java @@ -2,6 +2,7 @@ package com.tenwa.lease.flow.project.businessapply; import java.sql.SQLException; +import com.amarsoft.are.jbo.JBOException; import com.amarsoft.are.jbo.JBOTransaction; import com.amarsoft.awe.util.ASResultSet; import com.amarsoft.awe.util.SqlObject; @@ -21,6 +22,12 @@ public class CheckGuaranteeUnit { asql.setParameter("flowunid", this.flowunid); ASResultSet rs = null; rs = Sqlca.getASResultSet(asql); + //ύ + try { + Sqlca.commit(); + } catch (JBOException e) { + e.printStackTrace(); + } while(rs.next()){ this.number = rs.getInt("count"); } diff --git a/src_tenwa/com/tenwa/lease/flow/project/businessapply/CustomerAction.java b/src_tenwa/com/tenwa/lease/flow/project/businessapply/CustomerAction.java index bc09dc1ee..96caa3ae2 100644 --- a/src_tenwa/com/tenwa/lease/flow/project/businessapply/CustomerAction.java +++ b/src_tenwa/com/tenwa/lease/flow/project/businessapply/CustomerAction.java @@ -221,7 +221,14 @@ public class CustomerAction { asql.setParameter("certid", this.certid); ASResultSet rs = null; rs = Sqlca.getASResultSet(asql); + //ر + try { + Sqlca.commit(); + } catch (JBOException e) { + + } if(rs.next()){ + return "false"; }else{ return "true"; From 0406d9e82e3557c25a78e9a2f0260ef8ed05f62b Mon Sep 17 00:00:00 2001 From: amarsoft Date: Mon, 5 Nov 2018 15:24:49 +0800 Subject: [PATCH 05/15] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=A1=E6=8F=90?= =?UTF-8?q?=E5=88=A9=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src_tenwa/com/tenwa/lease/app/quartzmession/SplitInts2.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src_tenwa/com/tenwa/lease/app/quartzmession/SplitInts2.java b/src_tenwa/com/tenwa/lease/app/quartzmession/SplitInts2.java index c6b51e763..68d2dce84 100644 --- a/src_tenwa/com/tenwa/lease/app/quartzmession/SplitInts2.java +++ b/src_tenwa/com/tenwa/lease/app/quartzmession/SplitInts2.java @@ -53,13 +53,13 @@ public class SplitInts2 implements Job{ try{ //ҵ Sqlca = Transaction.createTransaction("als"); - Sqlca.executeSQL(new SqlObject("{call proc_financial_interest()}")); + Sqlca.executeSQL(new SqlObject("{call proc_contract_rent_month_new()}")); Sqlca.commit(); //ͳҵ - SplitInts3 s3=new SplitInts3(); + /*SplitInts3 s3=new SplitInts3(); s3.contractRentMonth(tx); - s3.contractRentQuarter(tx); + s3.contractRentQuarter(tx);*/ tx.commit(); discountApportion(); QuartzUtil.insertLog(startime,"com.tenwa.lease.app.quartzmession.SplitInts", "success", "ɹ", curUserId); From 9062355e8810edf7b1adc87a90b080f54dc0b192 Mon Sep 17 00:00:00 2001 From: G Date: Mon, 5 Nov 2018 19:54:20 +0800 Subject: [PATCH 06/15] =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E7=94=B3=E8=AF=B7?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BusinessApplicationEnquiry.jsp | 82 +++++++++++++++++++ 1 file changed, 82 insertions(+) create mode 100644 WebContent/Tenwa/Core/FlowInstanceTrack/BusinessApplicationEnquiry.jsp diff --git a/WebContent/Tenwa/Core/FlowInstanceTrack/BusinessApplicationEnquiry.jsp b/WebContent/Tenwa/Core/FlowInstanceTrack/BusinessApplicationEnquiry.jsp new file mode 100644 index 000000000..27341107b --- /dev/null +++ b/WebContent/Tenwa/Core/FlowInstanceTrack/BusinessApplicationEnquiry.jsp @@ -0,0 +1,82 @@ +<%@ page contentType="text/html; charset=GBK"%> +<%@ include file="/Frame/resources/include/include_begin_list.jspf"%> +<%@include file="/Tenwa/Core/FlowManager/BaseFunction/BaseFlowListFunction.jspf" %> + + + +<%/*~BEGIN~ɱ༭~[Editable=true;CodeAreaID=List00;Describe=ע;]~*/%> +<% +/* + Author:lzb 2017-05-12 + Tester: + Content: Ϣ + Input Param: + Output param: + History Log: + */ +%> +<%/*~END~*/%> + + + +<%/*~BEGIN~ɱ༭~[Editable=true;CodeAreaID=List01;Describe=ҳ;]~*/%> +<% + String PG_TITLE = "ҵѯ"; // ڱ PG_TITLE +%> +<%/*~END~*/%> + +<%/*~BEGIN~ɱ༭~[Editable=true;CodeAreaID=List02;Describe=ȡ;]~*/%> + + +<%/*~BEGIN~ɱ༭~[Editable=true;CodeAreaID=List03;Describe=ݶ;]~*/%> +<% + ASObjectModel doTemp = new ASObjectModel("FlowInstanceTrack2"); + doTemp.appendJboWhere(" and O.flowno='BusinessApplyFlow'"); + ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request); + dwTemp.Style="1"; //--ΪGrid-- + dwTemp.ReadOnly = "1"; //ֻģʽ + dwTemp.setPageSize(15); + dwTemp.genHTMLObjectWindow(""); +%> +<%/*~END~*/%> + + +<%/*~BEGIN~ɱ༭~[Editable=true;CodeAreaID=List04;Describe=尴ť;]~*/%> +<% + String sButtons[][] = {}; +%> +<%/*~END~*/%> + + + + +<%/*~BEGIN~ɱ༭~[Editable=false;CodeAreaID=List05;Describe=ҳ;]~*/%> +<%@include file="/Frame/resources/include/ui/include_list.jspf"%> +<%/*~END~*/%> + + +<%/*~BEGIN~ɱ༭~[Editable=false;CodeAreaID=List06;Describe=尴ť¼;]~*/%> + +<%/*~END~*/%> +<%/*~BEGIN~ɱ༭~[Editable=false;CodeAreaID=List08;Describe=ҳװʱгʼ;]~*/%> + +<%/*~END~*/%> +<%@ include file="/Frame/resources/include/include_end.jspf"%> \ No newline at end of file From 2461f4ffa4150d5fd5c156d8987c17a40a34c614 Mon Sep 17 00:00:00 2001 From: liuzhao Date: Tue, 6 Nov 2018 10:02:13 +0800 Subject: [PATCH 07/15] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BA=8B=E7=89=A9?= =?UTF-8?q?=E5=85=B3=E9=97=AD=E9=93=BE=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lease/app/quartzmession/AutoBuckle.java | 17 ++++++++++++++--- .../QueryVehicleModeListAction.java | 5 +++-- .../businessapply/CustomerInfoCheck.java | 4 ++++ .../BusinessApprovalStartAction.java | 6 +++++- .../loan/loanfundhire/LoanFundHireManager.java | 11 ++++++++++- 5 files changed, 36 insertions(+), 7 deletions(-) diff --git a/src_tenwa/com/tenwa/lease/app/quartzmession/AutoBuckle.java b/src_tenwa/com/tenwa/lease/app/quartzmession/AutoBuckle.java index 7f1ac3580..a170becf5 100644 --- a/src_tenwa/com/tenwa/lease/app/quartzmession/AutoBuckle.java +++ b/src_tenwa/com/tenwa/lease/app/quartzmession/AutoBuckle.java @@ -46,16 +46,27 @@ public class AutoBuckle implements Job { ca.setInputuserid(jboName.getUserId(arg0, tx)); ca.setInputorgid("system"); ca.batchCollectManage(tx); - tx = JBOFactory.createJBOTransaction(); + //tx = JBOFactory.createJBOTransaction(); ca.queryBatchCollectStatus(tx); } QuartzUtil.insertLog(plan_date,"com.tenwa.lease.app.quartzmession.AutoBuckle", "success", "ɹ", curUserId); } catch (Exception e) { e.printStackTrace(); - QuartzUtil.insertLog(plan_date,"com.tenwa.lease.app.quartzmession.AutoBuckle", "error", "ʧ", curUserId); + QuartzUtil.insertLog(plan_date,"com.tenwa.lease.app.quartzmession.AutoBuckle", "error", "ʧ", curUserId); + if (tx != null) { + try { + tx.rollback(); + tx=null; + } catch (JBOException e1) { + e1.printStackTrace(); + } + } }finally{ try { - tx.commit(); + if(tx !=null){ + + tx.commit(); + } } catch (JBOException e) { e.printStackTrace(); } diff --git a/src_tenwa/com/tenwa/lease/app/quartzmession/QueryVehicleModeListAction.java b/src_tenwa/com/tenwa/lease/app/quartzmession/QueryVehicleModeListAction.java index 730a32393..1f0ee7a71 100644 --- a/src_tenwa/com/tenwa/lease/app/quartzmession/QueryVehicleModeListAction.java +++ b/src_tenwa/com/tenwa/lease/app/quartzmession/QueryVehicleModeListAction.java @@ -210,11 +210,12 @@ public class QueryVehicleModeListAction implements Job{ bm4.createQuery("update O set currentversion=:CURRENTVERSION,initialversion=:INITIALVERSION") .setParameter("CURRENTVERSION",map.get("CurrentVersion").toString()) .setParameter("INITIALVERSION",map.get("InitialVersion").toString()).executeUpdate(); - } + } } catch (Exception e) { try { if(null != tx){ - tx.rollback(); + tx.rollback(); + tx = null; } } catch (JBOException e1) { e1.printStackTrace(); diff --git a/src_tenwa/com/tenwa/lease/flow/project/businessapply/CustomerInfoCheck.java b/src_tenwa/com/tenwa/lease/flow/project/businessapply/CustomerInfoCheck.java index 842ae5ce2..8f018ff6d 100644 --- a/src_tenwa/com/tenwa/lease/flow/project/businessapply/CustomerInfoCheck.java +++ b/src_tenwa/com/tenwa/lease/flow/project/businessapply/CustomerInfoCheck.java @@ -200,6 +200,10 @@ public class CustomerInfoCheck { } catch (JBOException e) { e.printStackTrace(); return "ERROR"; + }finally{ + if(Sqlca !=null){ + Sqlca.commit(); + } } return CustomerId; } diff --git a/src_tenwa/com/tenwa/lease/flow/project/projectapproval/BusinessApprovalStartAction.java b/src_tenwa/com/tenwa/lease/flow/project/projectapproval/BusinessApprovalStartAction.java index 740d06024..ff931447b 100644 --- a/src_tenwa/com/tenwa/lease/flow/project/projectapproval/BusinessApprovalStartAction.java +++ b/src_tenwa/com/tenwa/lease/flow/project/projectapproval/BusinessApprovalStartAction.java @@ -47,8 +47,8 @@ public class BusinessApprovalStartAction extends BaseFlowStartAction{ @SuppressWarnings("deprecation") public String askApplyStart(JBOTransaction tx) throws Exception { + Transaction Sqlca = null; try { - Transaction Sqlca = null; Configure CurConfig = Configure.getInstance(); String sDataSource = CurConfig.getDataSource(); Sqlca = Transaction.createTransaction(sDataSource); @@ -61,6 +61,10 @@ public class BusinessApprovalStartAction extends BaseFlowStartAction{ } catch (Exception e) { ARE.getLog().error(e); return "false"; + }finally{ + if(Sqlca !=null){ + Sqlca.commit(); + } } } diff --git a/src_tenwa/com/tenwa/loan/loanfundhire/LoanFundHireManager.java b/src_tenwa/com/tenwa/loan/loanfundhire/LoanFundHireManager.java index 56bdfc24a..7c99efc39 100644 --- a/src_tenwa/com/tenwa/loan/loanfundhire/LoanFundHireManager.java +++ b/src_tenwa/com/tenwa/loan/loanfundhire/LoanFundHireManager.java @@ -259,9 +259,18 @@ public class LoanFundHireManager { ps.execute(); }catch(Exception e){ e.printStackTrace(); + if(con !=null){ + con.rollback(); + con.close(); + con=null; + } return "ERROR@ʧܣ"; }finally{ - con.close(); + if(con !=null){ + con.commit(); + con.close(); + + } } return "SUCCESS@ɹ"; } From 72699d046f8be51bdc90e1d3a7707ecbea13c2d5 Mon Sep 17 00:00:00 2001 From: tangfutang Date: Tue, 6 Nov 2018 11:09:43 +0800 Subject: [PATCH 08/15] =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E7=94=B3=E8=AF=B7?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=E6=B7=BB=E5=8A=A0=E2=80=9C=E4=B8=9A=E5=8A=A1?= =?UTF-8?q?=E4=BA=8C=E9=83=A8=E5=88=86=E7=AE=A1=E9=A2=86=E5=AF=BC=E2=80=9D?= =?UTF-8?q?=E8=8A=82=E7=82=B9=E4=BF=AE=E6=94=B9=E4=B8=9A=E5=8A=A1=E7=94=B3?= =?UTF-8?q?=E8=AF=B7=E5=AE=A1=E6=89=B9=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BusinessApplication/ApprovalForm.jsp | 55 +++++++++++++++++-- 1 file changed, 51 insertions(+), 4 deletions(-) diff --git a/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/ApprovalForm.jsp b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/ApprovalForm.jsp index 6468ed0c7..c43dbf62e 100644 --- a/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/ApprovalForm.jsp +++ b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/ApprovalForm.jsp @@ -73,7 +73,7 @@ dwTemp.getDataObject().setRequired("secondchoice", true); dwTemp.getDataObject().setRequired("secondopinion", true); dwTemp.setGroupHidden("0040"); - if("BACK".equals(flowstate)||"ANYBACK".equals(flowstate)){ + if(("BACK".equals(flowstate)||"ANYBACK".equals(flowstate))&&"0060".equals(phaseNo)){ dwTemp.getDataObject().setVisible("thirdchoice", true); dwTemp.getDataObject().setVisible("thirdopinion", true); dwTemp.getDataObject().setReadOnly("thirdchoice", true); @@ -131,6 +131,41 @@ dwTemp.getDataObject().setReadOnly("thirdchoice", false); dwTemp.getDataObject().setReadOnly("thirdopinion", false); dwTemp.setGroupHidden("0030,0040,0050"); + }else if("0070".equals(phaseNo)){//ҵֹ쵼 + if(!"true".equals(ishistory)){//ʾ͸ + dwTemp.getDataObject().setVisible("firstchoice", true); + dwTemp.getDataObject().setVisible("firstopinion", true); + dwTemp.getDataObject().setReadOnly("firstchoice", true); + dwTemp.getDataObject().setReadOnly("firstopinion", true); + dwTemp.getDataObject().setVisible("secondchoice", true); + dwTemp.getDataObject().setVisible("secondopinion", true); + dwTemp.getDataObject().setReadOnly("secondchoice", true); + dwTemp.getDataObject().setReadOnly("secondopinion", true); + if(money>200000){//Լ20ʾ + dwTemp.getDataObject().setVisible("thirdchoice", true); + dwTemp.getDataObject().setVisible("thirdopinion", true); + dwTemp.getDataObject().setReadOnly("thirdchoice", true); + dwTemp.getDataObject().setReadOnly("thirdopinion", true); + }else{ + dwTemp.setGroupHidden("0040"); + } + + }else{ + dwTemp.getDataObject().setVisible("firstchoice", true); + dwTemp.getDataObject().setVisible("firstopinion", true); + dwTemp.getDataObject().setReadOnly("firstchoice", true); + dwTemp.getDataObject().setReadOnly("firstopinion", true); + dwTemp.getDataObject().setVisible("secondchoice", false); + dwTemp.getDataObject().setVisible("secondopinion", false); + dwTemp.getDataObject().setVisible("thirdchoice", false); + dwTemp.getDataObject().setVisible("thirdopinion", false); +// dwTemp.getDataObject().setVisible("INTEROPINION2", false); +// dwTemp.getDataObject().setVisible("DISTRIOPINION2", false); +// dwTemp.getDataObject().setVisible("INTEROPINION3", false); +// dwTemp.getDataObject().setVisible("DISTRIOPINION3", false); + + dwTemp.setGroupHidden("0030,0040,0050"); + } } dwTemp.genHTMLObjectWindow(flowunid); @@ -192,12 +227,12 @@ $("#A_div_1180").attr("style","display:none;"); $("#A_div_1250").attr("style","display:none;"); $("#A_Group_0020").attr("style","display:none;"); - if("13"==<%=projectstatus%>){ - html='ҵ ͨ'; + <%-- if("13"==<%=projectstatus%>){ --%>//ҵ쵼0070ʾ + /* html='ҵ ͨ'; }else{ html='ҵ δͨ'; } - $("#A_Group_0010").append(html); + $("#A_Group_0010").append(html); */ } _user_validator[0]['rules']['SECONDCHOICE']['required0'] = true; _user_validator[0]['messages']['SECONDCHOICE']['required0'] = '븴'; @@ -304,7 +339,19 @@ _user_validator[0]['rules']['FOUROPINION']['required0'] = true; _user_validator[0]['messages']['FOUROPINION']['required0'] = ""; break; + case '0070':// + if("true"=="<%=ishistory%>"&&<%=CurUser.hasRole("401")%>){ + $("#A_Group_0020").attr("style","display:none;"); + if("13"==<%=projectstatus%>){ + html='ҵ ͨ'; + }else{ + html='ҵ δͨ'; + } + $("#A_Group_0010").append(html); + } + break; } + var certResult = checkCertId(); if(certResult=="4" && "false"=="<%=ishistory%>"){ //$("#FULLNAME").attr("style","color:red;"); From 05070047c33ae154ea67fc38bcb677505cc1402a Mon Sep 17 00:00:00 2001 From: zhangbb Date: Tue, 6 Nov 2018 11:17:41 +0800 Subject: [PATCH 09/15] =?UTF-8?q?1.=E6=96=B0=E5=A2=9E=E8=B4=B4=E6=81=AF?= =?UTF-8?q?=E9=A3=8E=E9=99=A9=E9=A2=84=E8=AD=A6=EF=BC=8C=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E8=B4=B4=E6=81=AF=E9=97=AE=E9=A2=98=E3=80=82=202.=E7=BD=91?= =?UTF-8?q?=E9=93=B6=E6=8E=A5=E5=8F=A3=E9=80=89=E6=8B=A9=E5=AE=A2=E6=88=B7?= =?UTF-8?q?=E6=97=B6=EF=BC=8C=E5=8F=AF=E4=BB=A5=E9=80=89=E6=B3=95=E4=BA=BA?= =?UTF-8?q?=E5=92=8C=E8=87=AA=E7=84=B6=E4=BA=BA=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Lease/App/Interface/Ebank/LCEbankInfo.jsp | 2 +- .../commbusiness/DeleteDiscountOccupy.java | 9 ++-- .../commbusiness/InsertDiscountOccupy.java | 2 +- .../flow/project/commcheck/DiscountCheck.java | 42 +++++++++++++++++++ 4 files changed, 47 insertions(+), 8 deletions(-) create mode 100644 src_tenwa/com/tenwa/lease/flow/project/commcheck/DiscountCheck.java diff --git a/WebContent/Tenwa/Lease/App/Interface/Ebank/LCEbankInfo.jsp b/WebContent/Tenwa/Lease/App/Interface/Ebank/LCEbankInfo.jsp index 8955ec426..c7883cdb8 100644 --- a/WebContent/Tenwa/Lease/App/Interface/Ebank/LCEbankInfo.jsp +++ b/WebContent/Tenwa/Lease/App/Interface/Ebank/LCEbankInfo.jsp @@ -93,7 +93,7 @@ } //ѡ function selectCust(){ - AsDialog.OpenSelector("SelectCustomer","","dialogWidth=" + parseInt(window.screen.width * 0.9) + "px dialogHeight=" + parseInt(window.screen.height * 0.6) + "px",function(sReturn){ + AsDialog.OpenSelector("SelectCustomerBank","","dialogWidth=" + parseInt(window.screen.width * 0.9) + "px dialogHeight=" + parseInt(window.screen.height * 0.6) + "px",function(sReturn){ if(!sReturn||sReturn=="_CANCEL_"){ //alert(getHtmlMessage('1'));//ѡһϢ return; diff --git a/src_tenwa/com/tenwa/lease/flow/project/commbusiness/DeleteDiscountOccupy.java b/src_tenwa/com/tenwa/lease/flow/project/commbusiness/DeleteDiscountOccupy.java index edad09623..4abef576c 100644 --- a/src_tenwa/com/tenwa/lease/flow/project/commbusiness/DeleteDiscountOccupy.java +++ b/src_tenwa/com/tenwa/lease/flow/project/commbusiness/DeleteDiscountOccupy.java @@ -17,18 +17,15 @@ import com.tenwa.flow.baseBussion.BaseBussiness; public class DeleteDiscountOccupy extends BaseBussiness { @Override public Object run(Transaction Sqlca) throws Exception { - //this.initBussinessParam(Sqlca); - String projectId=this.getAttribute("ProjectId").toString(); + this.initBussinessParam(Sqlca); + String projectId = this.getAttribute("ProjectId").toString(); BizObjectManager ldoManage = JBOFactory.getBizObjectManager(LB_DISCOUNT_OCCUPY.CLASS_NAME,Sqlca); BizObject ldo = ldoManage.createQuery("project_id=:projectid").setParameter("projectid", projectId).getSingleResult(true); - String sMessage=""; if(ldo!=null){ ldoManage.deleteObject(ldo); - sMessage="true"; }else{ - sMessage="false"; } - + String sMessage="true"; return sMessage; } } diff --git a/src_tenwa/com/tenwa/lease/flow/project/commbusiness/InsertDiscountOccupy.java b/src_tenwa/com/tenwa/lease/flow/project/commbusiness/InsertDiscountOccupy.java index 72020bb44..e7e3e0d0d 100644 --- a/src_tenwa/com/tenwa/lease/flow/project/commbusiness/InsertDiscountOccupy.java +++ b/src_tenwa/com/tenwa/lease/flow/project/commbusiness/InsertDiscountOccupy.java @@ -41,7 +41,7 @@ public class InsertDiscountOccupy extends BaseBussiness { + " values (replace(uuid(),'-',''), '" + productId + "', '" + flowUnid + "', '" + projectId + "'," + " " + discountValue + ", '" + curUserID + "', '" + user.getOrgID() + "', replace(now(),'-','/'))")); } else { - throw new BusinessException("Ʒ"); + // throw new BusinessException("Ʒ"); } } } diff --git a/src_tenwa/com/tenwa/lease/flow/project/commcheck/DiscountCheck.java b/src_tenwa/com/tenwa/lease/flow/project/commcheck/DiscountCheck.java new file mode 100644 index 000000000..e57503700 --- /dev/null +++ b/src_tenwa/com/tenwa/lease/flow/project/commcheck/DiscountCheck.java @@ -0,0 +1,42 @@ +package com.tenwa.lease.flow.project.commcheck; + +import java.util.Map; + +import jbo.app.tenwa.customer.CUSTOMER_INFO_TEMP; + +import com.amarsoft.app.util.ProductParamUtil; +import com.amarsoft.are.jbo.BizObject; +import com.amarsoft.are.jbo.BizObjectManager; +import com.amarsoft.are.jbo.JBOFactory; +import com.amarsoft.awe.util.SqlObject; +import com.amarsoft.awe.util.Transaction; +import com.tenwa.template.check.DefaultBussinessCheck; + +public class DiscountCheck extends DefaultBussinessCheck{ + + @Override + public Object run(Transaction Sqlca) throws Exception { + String flowunid=this.getAttribute("ObjectNo").toString(); + BizObjectManager proBO = JBOFactory.getBizObjectManager(jbo.com.tenwa.lease.comm.LB_PROJECT_INFO_TEMP.CLASS_NAME, Sqlca); + BizObject pro = proBO.createQuery("flowunid=:flowunid").setParameter("flowunid", flowunid).getSingleResult(false); + String productId = pro.getAttribute("PRODUCT_ID").toString(); + Map discount = ProductParamUtil.getProductComponentAllParameters(productId, "PRD0315", "DISCOUNT"); + if(!discount.isEmpty() && !"".equals(discount.get("DISCOUNT_ALL")) && !"".equals(discount.get("CostType08"))) { + synchronized (this) { + String discountAll = discount.get("DISCOUNT_ALL"); + String discountValue = discount.get("CostType08"); + Transaction tran = Transaction.createTransaction(Sqlca); + String result = tran.getString(new SqlObject("select case when " + discountAll + "-ifnull(sum(discount), 0) >= " + discountValue + " then '0' else '1' end from lb_discount_occupy where product_id = '" +productId+ "'")); + if("0".equals(result)) { + putMsg("ͨ"); + setPass(true); + } else { + putMsg("Ϣ"); + setPass(false); + } + } + } + return null; + } + +} From adce7b45f9ac15b63c2b8fb661e496df3e0efbcf Mon Sep 17 00:00:00 2001 From: zhangbb Date: Tue, 6 Nov 2018 15:13:53 +0800 Subject: [PATCH 10/15] =?UTF-8?q?1.=E5=90=88=E5=90=8C=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E9=87=8C=E9=9D=A2=E7=9A=84=E7=A7=9F=E9=87=91?= =?UTF-8?q?=E8=AE=A1=E5=88=92=E5=A2=9E=E5=8A=A0=E5=B0=8F=E8=AE=A1=E5=92=8C?= =?UTF-8?q?=E6=80=BB=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- WebContent/Accounting/LoanSimulation/RentPlanQueryList.jsp | 1 + 1 file changed, 1 insertion(+) diff --git a/WebContent/Accounting/LoanSimulation/RentPlanQueryList.jsp b/WebContent/Accounting/LoanSimulation/RentPlanQueryList.jsp index 635491d34..5695ac981 100644 --- a/WebContent/Accounting/LoanSimulation/RentPlanQueryList.jsp +++ b/WebContent/Accounting/LoanSimulation/RentPlanQueryList.jsp @@ -33,6 +33,7 @@ ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request); dwTemp.Style="1"; //--ΪGrid-- dwTemp.ReadOnly = "1"; //ֻģʽ + dwTemp.ShowSummary="1"; dwTemp.setPageSize(10); if("21".equals(contract_status)){ From 18c287ed4cee88de11781a365b440e6cd3819e6a Mon Sep 17 00:00:00 2001 From: zhangbb Date: Tue, 6 Nov 2018 15:38:15 +0800 Subject: [PATCH 11/15] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E8=B4=B4=E6=81=AF?= =?UTF-8?q?=E9=A3=8E=E9=99=A9=E9=A2=84=E8=AD=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/tenwa/lease/flow/project/commcheck/DiscountCheck.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src_tenwa/com/tenwa/lease/flow/project/commcheck/DiscountCheck.java b/src_tenwa/com/tenwa/lease/flow/project/commcheck/DiscountCheck.java index e57503700..fe04d5a77 100644 --- a/src_tenwa/com/tenwa/lease/flow/project/commcheck/DiscountCheck.java +++ b/src_tenwa/com/tenwa/lease/flow/project/commcheck/DiscountCheck.java @@ -35,6 +35,9 @@ public class DiscountCheck extends DefaultBussinessCheck{ setPass(false); } } + }else{ + putMsg("ͨ"); + setPass(true); } return null; } From 6d34dbf42336b247cb390f13d3ea76ea8f9b85b3 Mon Sep 17 00:00:00 2001 From: liuzhao Date: Tue, 6 Nov 2018 16:23:04 +0800 Subject: [PATCH 12/15] =?UTF-8?q?=E9=80=80=E5=9B=9E=E7=BB=8F=E9=94=80?= =?UTF-8?q?=E5=95=86=E4=BF=9D=E5=AD=98=E5=88=B0=E9=A1=B9=E7=9B=AE=E8=BF=9B?= =?UTF-8?q?=E5=BA=A6=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LBProjectInfoBackApprove.java | 43 +++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 src_tenwa/com/tenwa/lease/flow/contract/commbusiness/LBProjectInfoBackApprove.java diff --git a/src_tenwa/com/tenwa/lease/flow/contract/commbusiness/LBProjectInfoBackApprove.java b/src_tenwa/com/tenwa/lease/flow/contract/commbusiness/LBProjectInfoBackApprove.java new file mode 100644 index 000000000..9e87086d7 --- /dev/null +++ b/src_tenwa/com/tenwa/lease/flow/contract/commbusiness/LBProjectInfoBackApprove.java @@ -0,0 +1,43 @@ +package com.tenwa.lease.flow.contract.commbusiness; + +import jbo.com.tenwa.lease.carbrand.BUSINESS_STATUS; + +import com.amarsoft.are.jbo.BizObject; +import com.amarsoft.are.jbo.BizObjectManager; +import com.amarsoft.are.jbo.JBOFactory; +import com.amarsoft.are.jbo.JBOTransaction; +import com.amarsoft.are.util.StringFunction; +import com.amarsoft.awe.util.Transaction; +import com.amarsoft.context.ASUser; +import com.tenwa.flow.baseBussion.BaseBussiness; + +public class LBProjectInfoBackApprove extends BaseBussiness{ + @Override + public Object run(Transaction Sqlca) throws Exception { + this.initBussinessParam(Sqlca); + ASUser asUser=new ASUser(this.getAttribute("CurUserID").toString()); + this.saveBusinessStatus(Sqlca,asUser); + String sMessage="true"; + return sMessage; + } + + private void saveBusinessStatus(Transaction Sqlca,ASUser asUser) throws Exception{ + JBOTransaction tx = null; + tx= JBOFactory.createJBOTransaction(); + BizObjectManager bsbom = JBOFactory.getBizObjectManager(BUSINESS_STATUS.CLASS_NAME,tx); + BizObject bsbo = bsbom.newObject(); + try { + bsbo.setAttributeValue(BUSINESS_STATUS.contract_number,this.getAttribute("ProjectNo")); + bsbo.setAttributeValue(BUSINESS_STATUS.business_status,"1"); + bsbo.setAttributeValue(BUSINESS_STATUS.inputuserid,asUser.getUserID()); + bsbo.setAttributeValue(BUSINESS_STATUS.inputtime,StringFunction.getTodayNow()); + bsbo.setAttributeValue(BUSINESS_STATUS.inputorgid,asUser.getOrgID()); + bsbom.saveObject(bsbo); + tx.commit(); + }catch (Exception e){ + tx.rollback(); + e.printStackTrace(); + } + } + +} From be7abd450b432c85aec50219e3464f2ca6286c70 Mon Sep 17 00:00:00 2001 From: zhangbb Date: Tue, 6 Nov 2018 16:55:10 +0800 Subject: [PATCH 13/15] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E5=B7=B2=E5=8A=9E?= =?UTF-8?q?=E4=BA=8B=E5=AE=9C=E7=9A=84=E7=94=B3=E8=AF=B7=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E6=89=93=E5=BC=80=E5=90=8E=E5=8F=AF=E7=BC=96=E8=BE=91=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- WebContent/Tenwa/Core/MyWork/AppMyWorkHasDo.jsp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WebContent/Tenwa/Core/MyWork/AppMyWorkHasDo.jsp b/WebContent/Tenwa/Core/MyWork/AppMyWorkHasDo.jsp index fe5ce677c..c5e20ea3a 100644 --- a/WebContent/Tenwa/Core/MyWork/AppMyWorkHasDo.jsp +++ b/WebContent/Tenwa/Core/MyWork/AppMyWorkHasDo.jsp @@ -51,7 +51,7 @@ function afterSearch(){ } } if(flowState!=""){getObj(0,i,"flow_key").innerHTML=getObj(0,i,"flow_key").innerHTML+"["+flowState+"]";} - getObj(0,i,"ACTION").innerHTML= <%=bFlag%> ? ' ' : 'ʾͼ    '; + getObj(0,i,"ACTION").innerHTML= <%=bFlag%> ? ' ' : 'ʾͼ    '; } setColumnWidth(0,"ACTION",150); } From b22e9254ea69076093c22e59e5be6272753e94dd Mon Sep 17 00:00:00 2001 From: tangfutang Date: Tue, 6 Nov 2018 20:06:27 +0800 Subject: [PATCH 14/15] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=9A=E5=8A=A1?= =?UTF-8?q?=E7=94=B3=E8=AF=B7=E4=B8=AD=E7=9A=84=E5=AE=A1=E6=89=B9=E8=A1=A8?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BusinessApplication/ApprovalForm.jsp | 81 +++++++++++++------ .../GetApplyNameSelect.jsp | 25 ++++++ 2 files changed, 83 insertions(+), 23 deletions(-) create mode 100644 WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/GetApplyNameSelect.jsp diff --git a/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/ApprovalForm.jsp b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/ApprovalForm.jsp index c43dbf62e..5afd83deb 100644 --- a/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/ApprovalForm.jsp +++ b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/ApprovalForm.jsp @@ -63,7 +63,7 @@ // dwTemp.getDataObject().setReadOnly("InterOpinion2", true); dwTemp.setGroupHidden("0040,0050"); } - }else if("0040".equals(phaseNo)||"0060".equals(phaseNo)){// + }else if("0040".equals(phaseNo)||"0050".equals(phaseNo)){// dwTemp.getDataObject().setVisible("firstchoice", true); dwTemp.getDataObject().setVisible("firstopinion", true); dwTemp.getDataObject().setReadOnly("firstchoice", true); @@ -73,7 +73,7 @@ dwTemp.getDataObject().setRequired("secondchoice", true); dwTemp.getDataObject().setRequired("secondopinion", true); dwTemp.setGroupHidden("0040"); - if(("BACK".equals(flowstate)||"ANYBACK".equals(flowstate))&&"0060".equals(phaseNo)){ + if(("BACK".equals(flowstate)||"ANYBACK".equals(flowstate))&&"0050".equals(phaseNo)){ dwTemp.getDataObject().setVisible("thirdchoice", true); dwTemp.getDataObject().setVisible("thirdopinion", true); dwTemp.getDataObject().setReadOnly("thirdchoice", true); @@ -85,7 +85,7 @@ if(CurUser.hasRole("401")){ dwTemp.setGroupHidden("0030,0040"); } - }else if("0050".equals(phaseNo)){// + }else if("0060".equals(phaseNo)){// if(!"true".equals(ishistory)){ dwTemp.getDataObject().setVisible("firstchoice", true); dwTemp.getDataObject().setVisible("firstopinion", true); @@ -177,8 +177,12 @@ $(function(){ $(".info_td_left").css("width","150px"); $(".info_mid_line").css("width","50%"); + var selectOpinion = ''; + var proposal = ''; switch('<%=phaseNo%>'){ case '0030':// + selectOpinion ='FIRSTOPINION'; + proposal ='FIRSTCHOICE'; $("#A_div_1230").attr("style","display:none;"); $("#A_div_1240").attr("style","display:none;"); $("#A_div_1250").attr("style","display:none;"); @@ -205,6 +209,8 @@ _user_validator[0]['messages']['FIRSTOPINION']['required0'] = ""; break; case '0040':// + selectOpinion ='SECONDOPINION'; + proposal ='SECONDCHOICE'; $("#A_div_1250").attr("style","display:none;"); $("#A_div_1260").attr("style","display:none;"); @@ -239,7 +245,9 @@ _user_validator[0]['rules']['SECONDOPINION']['required0'] = true; _user_validator[0]['messages']['SECONDOPINION']['required0'] = ""; break; - case '0060'://20 + case '0050'://20 + selectOpinion ='SECONDOPINION'; + proposal ='SECONDCHOICE'; $("#A_div_1250").attr("style","display:none;"); $("#A_div_1260").attr("style","display:none;"); @@ -269,8 +277,9 @@ _user_validator[0]['rules']['SECONDOPINION']['required0'] = true; _user_validator[0]['messages']['SECONDOPINION']['required0'] = ""; break; - case '0050':// - + case '0060':// + selectOpinion ='THIRDOPINION'; + proposal ='THIRDCHOICE'; $("#FIRSTCHOICE").attr("disabled","disabled");// $("#FIRSTOPINION").attr("disabled","disabled");// // $("#INTEROPINION1").attr("disabled","disabled");//ڲ @@ -357,45 +366,71 @@ //$("#FULLNAME").attr("style","color:red;"); $("#CERTID").css("color","red"); } - var firstchoice = getItemValue(0,0,"firstchoice"); + var firstchoice = getItemValue(0,0,proposal); + var attribute1=""; if(firstchoice==""){ // setItemRequired(0,"InterOpinion1",false); // setItemRequired(0,"DistriOpinion1",false); - $("#FIRSTOPINION").attr("disabled",""); +// $("#FIRSTOPINION").attr("disabled",""); } if(firstchoice=="0010"){ setItemRequired(0,"A_div_1220",true); -// setItemRequired(0,"InterOpinion1",false); -// setItemRequired(0,"DistriOpinion1",true); + /* setItemRequired(0,"InterOpinion1",false); + setItemRequired(0,"DistriOpinion1",true); $("#FIRSTOPINION").attr("disabled",""); $("#SECONDOPINION").attr("disabled",""); - $("#THIRDOPINION").attr("disabled",""); - var obj=document.getElementById('FIRSTOPINION'); + $("#THIRDOPINION").attr("disabled",""); */ + var obj=document.getElementById(selectOpinion); for(var i=0;i<7;i++){ obj.options[i].style.display = "block"; } obj.options[7].style.display = "none"; + obj.options[8].style.display = "none"; + attribute1="1"; } - if(firstchoice=="0030"){ -// setItemRequired(0,"InterOpinion1",true); -// setItemRequired(0,"DistriOpinion1",false); - $("#FIRSTOPINION").attr("disabled",""); - $("#SECONDOPINION").attr("disabled",""); - $("#THIRDOPINION").attr("disabled",""); - var obj=document.getElementById('FIRSTOPINION'); + if(firstchoice=="0020"){ + /* $("#SECONDOPINION").attr("disabled",""); + $("#THIRDOPINION").attr("disabled",""); */ + var obj=document.getElementById(selectOpinion); for(var i=0;i<7;i++){ obj.options[i].style.display = "none"; } + obj.options[0].style.display = "block"; obj.options[7].style.display = "block"; + obj.options[8].style.display = "none"; + attribute1="2"; } - if(firstchoice=="0040"||"0060"==firstchoice){ + if(firstchoice=="0030"){ + /* setItemRequired(0,"InterOpinion1",true); + setItemRequired(0,"DistriOpinion1",false); + $("#FIRSTOPINION").attr("disabled",""); + $("#SECONDOPINION").attr("disabled",""); + $("#THIRDOPINION").attr("disabled",""); */ + var obj=document.getElementById(selectOpinion); + for(var i=0;i<8;i++){ + obj.options[i].style.display = "none"; + } + obj.options[0].style.display = "block"; + attribute1="3"; + } + if(firstchoice=="0040"||"0050"==firstchoice){ // setItemRequired(0,"InterOpinion1",false); // setItemRequired(0,"DistriOpinion1",true); - setItemValue(0,0,"firstopinion",""); +// setItemValue(0,0,"firstopinion",""); $("#FIRSTOPINION").attr("disabled","disabled"); $("#SECONDOPINION").attr("disabled","disabled"); $("#THIRDOPINION").attr("disabled","disabled"); + attribute1=""; } + var selectOpin = getItemValue(0,getRow(),selectOpinion); + AsControl.RunJsp('/Tenwa/Lease/Flow/Project/BusinessApplication/GetApplyNameSelect.jsp','codeno=disagreeOP&attribute1='+attribute1+'&selectOpinion='+selectOpin,function(sReturn){ + if("FALSE"!=allTrim(sReturn)){ + var sReturn = lTrim(sReturn); + sReturn = rTrim(sReturn); + $('#'+selectOpinion).children().remove(); + $('#'+selectOpinion).append(sReturn); + } + }); if("<%=CurUser.getUserID()%>".indexOf("8006")>=0){ $("#A_div_1130").attr("style","display:none;"); $("#A_div_1140").attr("style","display:none;"); @@ -638,10 +673,10 @@ if("0030" == "<%=phaseNo%>"){ phaseChoice = getItemValue(0,0,"firstchoice"); phaseOpinion = getItemValue(0,0,"firstopinion"); - }else if("0040" == "<%=phaseNo%>"||"0060" == "<%=phaseNo%>"){ + }else if("0040" == "<%=phaseNo%>"||"0050" == "<%=phaseNo%>"){ phaseChoice = getItemValue(0,0,"secondchoice"); phaseOpinion = getItemValue(0,0,"secondopinion"); - }else if("0050" == "<%=phaseNo%>"){ + }else if("0060" == "<%=phaseNo%>"){ phaseChoice = getItemValue(0,0,"thirdchoice"); phaseOpinion = getItemValue(0,0,"thirdopinion"); }else if("0020" == "<%=phaseNo%>"){ diff --git a/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/GetApplyNameSelect.jsp b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/GetApplyNameSelect.jsp new file mode 100644 index 000000000..4ab8c3016 --- /dev/null +++ b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/GetApplyNameSelect.jsp @@ -0,0 +1,25 @@ +<%@ page contentType="text/html; charset=GBK"%> +<%@ include file="/IncludeBeginMDAJAX.jsp"%><% + String codeno = CurPage.getParameter("codeno"); + String attribute1 = CurPage.getParameter("attribute1"); + String selectOpinion = CurPage.getParameter("selectOpinion"); + try{ + String sql = "select c.itemno,c.itemname from code_library c where c.codeno='"+codeno+"' and c.attribute1="+attribute1; + ASResultSet res = Sqlca.getASResultSet(new SqlObject(sql)); + StringBuilder sb = new StringBuilder(); + sb.append(""); + while(res.next()){ + if(res.getString("itemno").toString().equals(selectOpinion)){ + sb.append(""); + }else{ + sb.append(""); + } + } + if(sb.length()>0){ + out.print(sb.toString()); + } + }catch(Exception e){ + e.printStackTrace(); + out.print("FALSE"); + } +%><%@ include file="/IncludeEndAJAX.jsp"%> \ No newline at end of file From 73f1fa72cde73e4f00d794242278290672c7736b Mon Sep 17 00:00:00 2001 From: zhangbb Date: Wed, 7 Nov 2018 09:56:44 +0800 Subject: [PATCH 15/15] =?UTF-8?q?1.=E5=90=88=E5=90=8C=E5=9F=BA=E6=9C=AC?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E5=95=86=E5=8A=A1=E6=9D=A1=E4=BB=B6=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E6=8C=89=E8=B5=B7=E7=A7=9F=E6=97=A5=E8=BF=98=E6=AC=BE?= =?UTF-8?q?=E6=97=A5=E6=9C=9F=E4=B8=8D=E5=BA=94=E8=AF=A5=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LoanSimulation/LoanSimulationBasicQueryInfo.jsp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/WebContent/Accounting/LoanSimulation/LoanSimulationBasicQueryInfo.jsp b/WebContent/Accounting/LoanSimulation/LoanSimulationBasicQueryInfo.jsp index bd13fa58d..cc7c1d539 100644 --- a/WebContent/Accounting/LoanSimulation/LoanSimulationBasicQueryInfo.jsp +++ b/WebContent/Accounting/LoanSimulation/LoanSimulationBasicQueryInfo.jsp @@ -36,5 +36,9 @@ <%@ include file="/Frame/resources/include/include_end.jspf"%> \ No newline at end of file