From 3dc732e1e62ddef27a109d63ccf36cc999a36775 Mon Sep 17 00:00:00 2001 From: yjf <2211675158@qq.com> Date: Fri, 22 Sep 2023 14:22:50 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=A1=E5=AE=A1=E5=A4=8D=E5=AE=A1=E6=8F=90?= =?UTF-8?q?=E4=BA=A4=E6=97=B6=EF=BC=8C=E9=9C=80=E8=A6=81=E4=BF=9D=E7=95=99?= =?UTF-8?q?=E5=AE=A1=E6=89=B9=E6=97=B6=E7=82=B9=E7=9A=84=E5=8E=86=E5=8F=B2?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CustomerHistory_Info_temp.jsp | 2 +- .../Comm/CustomerHistory/LoanedInfo.jsp | 10 ++++- .../Comm/CustomerHistory/OutstandInfo.jsp | 10 ++++- WebContent/WEB-INF/etc/jbo/jbo_lease.xml | 23 +++++++++++ src/com/amarsoft/app/flow/FlowAction.java | 2 +- .../ProjectHisInsertBusiness.java | 38 +++++++++++++++++++ 6 files changed, 79 insertions(+), 6 deletions(-) create mode 100644 src_tenwa/com/tenwa/lease/flow/project/commbusiness/ProjectHisInsertBusiness.java diff --git a/WebContent/Tenwa/Customer/Lessee/Comm/CustomerHistory/CustomerHistory_Info_temp.jsp b/WebContent/Tenwa/Customer/Lessee/Comm/CustomerHistory/CustomerHistory_Info_temp.jsp index 189c834ea..cf35694db 100644 --- a/WebContent/Tenwa/Customer/Lessee/Comm/CustomerHistory/CustomerHistory_Info_temp.jsp +++ b/WebContent/Tenwa/Customer/Lessee/Comm/CustomerHistory/CustomerHistory_Info_temp.jsp @@ -33,7 +33,7 @@ String compClientID = request.getParameter("CompClientID"); - dwTemp.replaceColumn("loaned", "", CurPage.getObjectWindowOutput()); + dwTemp.replaceColumn("loaned", "", CurPage.getObjectWindowOutput()); dwTemp.replaceColumn("outstand", "", CurPage.getObjectWindowOutput()); diff --git a/WebContent/Tenwa/Customer/Lessee/Comm/CustomerHistory/LoanedInfo.jsp b/WebContent/Tenwa/Customer/Lessee/Comm/CustomerHistory/LoanedInfo.jsp index 6af9d6130..a63ec5ee2 100644 --- a/WebContent/Tenwa/Customer/Lessee/Comm/CustomerHistory/LoanedInfo.jsp +++ b/WebContent/Tenwa/Customer/Lessee/Comm/CustomerHistory/LoanedInfo.jsp @@ -5,16 +5,22 @@ String certId = CurPage.getParameter("certId"); String flowunId = CurPage.getParameter("flowunId"); + String isHistory = CurPage.getParameter("IsHistory"); CurPage.setAttribute("flowRowCount", "20"); CurPage.setAttribute("pageIdentify", "loan"); ASObjectModel doTemp = new ASObjectModel("LoanedListNew"); + if ("true".equals(isHistory)) { + doTemp = new ASObjectModel("LoanedListHis"); + doTemp.appendJboWhere(" and O.FLOWUNID_HIS='" + flowunId + "' and o.CONTRACT_STATUS in ('31','100','105')"); + } else { + doTemp.appendJboWhere(" and o.CONTRACT_STATUS in ('31','100','105')"); + } doTemp.setDataQueryClass("com.amarsoft.awe.dw.ui.list.FlowMonitorListHtmlGenerator"); - doTemp.appendJboWhere(" and o.CONTRACT_STATUS in ('31','100','105')"); ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request); dwTemp.Style="1";//--设置为Grid风格-- dwTemp.ReadOnly = "1";//只读模式 dwTemp.setPageSize(20); - doTemp.setVisible("PROJECT_ID,FLOWUNID,CERTID_WITH_ROLE,CONTRACT_STATUS,business_status",false); + doTemp.setVisible("PROJECT_ID,FLOWUNID,CERTID_WITH_ROLE,CONTRACT_STATUS,business_status,FLOWUNID_HIS",false); dwTemp.genHTMLObjectWindow(certId); String sButtons[][] = { diff --git a/WebContent/Tenwa/Customer/Lessee/Comm/CustomerHistory/OutstandInfo.jsp b/WebContent/Tenwa/Customer/Lessee/Comm/CustomerHistory/OutstandInfo.jsp index 8cd8c4a49..9eda496ae 100644 --- a/WebContent/Tenwa/Customer/Lessee/Comm/CustomerHistory/OutstandInfo.jsp +++ b/WebContent/Tenwa/Customer/Lessee/Comm/CustomerHistory/OutstandInfo.jsp @@ -6,15 +6,21 @@ String certId = CurPage.getParameter("certId"); String flowunId = CurPage.getParameter("flowunId"); + String isHistory = CurPage.getParameter("IsHistory"); CurPage.setAttribute("flowRowCount", "20"); ASObjectModel doTemp = new ASObjectModel("LoanedListNew"); + if ("true".equals(isHistory)) { + doTemp = new ASObjectModel("LoanedListHis"); + doTemp.appendJboWhere(" and O.FLOWUNID_HIS='"+flowunId+"' and o.CONTRACT_STATUS not in ('100','105','31') and (flowunid not in ('"+flowunId+"') or v.isnull(flowunid))"); + }else{ + doTemp.appendJboWhere(" and o.CONTRACT_STATUS not in ('100','105','31') and (flowunid not in ('"+flowunId+"') or v.isnull(flowunid))"); + } doTemp.setDataQueryClass("com.amarsoft.awe.dw.ui.list.FlowMonitorListHtmlGenerator"); - doTemp.appendJboWhere(" and o.CONTRACT_STATUS not in ('100','105','31') and (flowunid not in ('"+flowunId+"') or v.isnull(flowunid))"); ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request); dwTemp.Style="1";//--设置为Grid风格-- dwTemp.ReadOnly = "1";//只读模式 dwTemp.setPageSize(20); - doTemp.setVisible("PROJECT_ID,FLOWUNID,CERTID_WITH_ROLE,CONTRACT_STATUS,COUPUS_OVER,IS_OVERDUE",false); + doTemp.setVisible("PROJECT_ID,FLOWUNID,CERTID_WITH_ROLE,CONTRACT_STATUS,COUPUS_OVER,IS_OVERDUE,FLOWUNID_HIS",false); dwTemp.genHTMLObjectWindow(certId); String sButtons[][] = {}; %> diff --git a/WebContent/WEB-INF/etc/jbo/jbo_lease.xml b/WebContent/WEB-INF/etc/jbo/jbo_lease.xml index b7751e166..eceda149e 100644 --- a/WebContent/WEB-INF/etc/jbo/jbo_lease.xml +++ b/WebContent/WEB-INF/etc/jbo/jbo_lease.xml @@ -5263,6 +5263,29 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/com/amarsoft/app/flow/FlowAction.java b/src/com/amarsoft/app/flow/FlowAction.java index 9f529cca3..606b46a46 100644 --- a/src/com/amarsoft/app/flow/FlowAction.java +++ b/src/com/amarsoft/app/flow/FlowAction.java @@ -270,11 +270,11 @@ public class FlowAction { this.flowNo, "", this.getFlowStartActionParm(tx, objectNo)); } - deleteTaskService.initDeleteNodes(); deleteTaskService.exectueFlowDelete(); DataOperatorUtil.deleteJBOByCondtion(FLOW_WORK_FLAG.CLASS_NAME, condtion, tx); if (!"BusinessApplyFlow".equals(flowNo)) { //业务申请取消不删除数据，修改状态 + deleteTaskService.initDeleteNodes(); DataOperatorUtil.deleteJBOByCondtion( FLOW_BUSSINESS_OBJECT.CLASS_NAME, condtion, tx); condtion.clear(); diff --git a/src_tenwa/com/tenwa/lease/flow/project/commbusiness/ProjectHisInsertBusiness.java b/src_tenwa/com/tenwa/lease/flow/project/commbusiness/ProjectHisInsertBusiness.java new file mode 100644 index 000000000..32cacdd8b --- /dev/null +++ b/src_tenwa/com/tenwa/lease/flow/project/commbusiness/ProjectHisInsertBusiness.java @@ -0,0 +1,38 @@ +package com.tenwa.lease.flow.project.commbusiness; + +import com.amarsoft.awe.util.ASResultSet; +import com.amarsoft.awe.util.SqlObject; +import com.amarsoft.awe.util.Transaction; +import com.tenwa.flow.baseBussion.BaseBussiness; + +import java.util.ArrayList; +import java.util.stream.Collectors; + +/** + * 业务申请 客户历史查询数据结束入表 + */ +public class ProjectHisInsertBusiness extends BaseBussiness { + + @Override + public Object run(Transaction Sqlca) throws Exception { + this.initBussinessParam(Sqlca); + String flowunid = this.getAttribute("FlowUnid").toString(); + + StringBuilder querySqlSb = new StringBuilder(); + querySqlSb.append(" select certid from customer_family_temp where Partner_ = 'Y' and flowunid = '"+flowunid+"'") + .append(" union ") + .append(" select certid from lb_guarantee_unit_temp where flowunid = '"+flowunid+"'") + .append(" union ") + .append(" select certid from lb_union_lessee_temp lul join customer_info_temp cit on lul.FLOWUNID = cit.flowunid where IS_MAIN = 'Y' and lul.flowunid = '"+flowunid+"'"); + ASResultSet asResultSet = Sqlca.getASResultSet(querySqlSb.toString()); + ArrayList conditionList = new ArrayList<>(); + while (asResultSet.next()) { + conditionList.add(asResultSet.getString("certid")); + } + if (conditionList.size() > 0) { + String whereSql = conditionList.stream().map(item -> String.format("locate('%s',certid_with_role)", item)).collect(Collectors.joining(" or ")); + Sqlca.executeSQL(new SqlObject("insert into lb_project_customer_his (PROJECT_ID,PROJECT_NO, FLOWUNID, CONTRACT_NO, CUSTOMER_NAME, DISTRIBUTOR_NAME, FIRST_PAYMENT_RATIO, CLEAN_LEASE_MONEY, LEASE_TERM, contract_status, business_status, certid_with_role,FLOWUNID_HIS) select *,'"+flowunid+"' from vi_project_his_list where "+whereSql)); + } + return "true"; + } +}