diff --git a/WebContent/Tenwa/Core/FlowManager/BaseFunction/BaseFlowFunction.jspf b/WebContent/Tenwa/Core/FlowManager/BaseFunction/BaseFlowFunction.jspf index 171fb5674..33538c42b 100644 --- a/WebContent/Tenwa/Core/FlowManager/BaseFunction/BaseFlowFunction.jspf +++ b/WebContent/Tenwa/Core/FlowManager/BaseFunction/BaseFlowFunction.jspf @@ -143,7 +143,7 @@ FlowFunction.backStep=function(sObjectType,sObjectNo,sFlowNo,sPhaseNo,sTaskNo,sF }} //判断经销商留言是否填写 - if (sPhaseNo = "0030") { + if (sPhaseNo == "0030") { var isopenmassge = AsControl.RunJavaMethodTrans("com.amarsoft.app.flow.FlowAction", "getjxsmessage", "TaskNo=" + sTaskNo); if (isopenmassge == "Y") { return this.getDealerMessage(sObjectNo, sPhaseNo, sTaskNo); diff --git a/WebContent/Tenwa/Customer/Lessee/Comm/CustomerHistory/CustomerHistoryInformation.jsp b/WebContent/Tenwa/Customer/Lessee/Comm/CustomerHistory/CustomerHistoryInformation.jsp index b4136216a..998027ece 100644 --- a/WebContent/Tenwa/Customer/Lessee/Comm/CustomerHistory/CustomerHistoryInformation.jsp +++ b/WebContent/Tenwa/Customer/Lessee/Comm/CustomerHistory/CustomerHistoryInformation.jsp @@ -9,18 +9,26 @@ String RightType=CurPage.getParameter("RightType"); String productId=CurPage.getParameter("ProductId"); String projectId=CurPage.getParameter("ProjectId"); + String phaseNo = CurPage.getAttribute("PhaseNo"); //流程节点 String khcertid = Sqlca.getString("select cpt.certid from lb_union_lessee_temp lul left join customer_person_temp cpt on cpt.FLOWUNID = lul.FLOWUNID where lul.IS_MAIN = 'Y' and lul.flowunid='"+flowunid+"'"); String gtcertid = Sqlca.getString("select cf.certid from customer_family_temp cf where cf.Partner_ = 'Y' and cf.flowunid='"+flowunid+"'"); String dbcertid = Sqlca.getString("select CERTID from lb_guarantee_unit_temp where flowunid='"+flowunid+"' order by CERTID asc limit 1"); String dbcertid2 = Sqlca.getString("select CERTID from lb_guarantee_unit_temp where flowunid='"+flowunid+"' order by CERTID desc limit 1"); + + //客户名称 + String khcertname = Sqlca.getString("select cpt.FULLNAME from lb_union_lessee_temp lul left join customer_person_temp cpt on cpt.FLOWUNID = lul.FLOWUNID where lul.IS_MAIN = 'Y' and lul.flowunid='"+flowunid+"'"); + String gtcertname = Sqlca.getString("select cf.name from customer_family_temp cf where cf.Partner_ = 'Y' and cf.flowunid='"+flowunid+"'"); + String dbcertname = Sqlca.getString("select FULLNAME from lb_guarantee_unit_temp where flowunid='"+flowunid+"' order by CERTID asc limit 1"); + String dbcertname2 = Sqlca.getString("select FULLNAME from lb_guarantee_unit_temp where flowunid='"+flowunid+"' order by CERTID desc limit 1"); + //客户传参 - String params="flowunid="+flowunid+"&plannumber="+plannumber+"&planCName="+planCName+"&calType="+calType+"&IsHistory="+IsHistory+"&RightType="+RightType+"&ProductId="+productId+"&projectId="+projectId+"&certId="+khcertid+"&type=client"; + String params="flowunid="+flowunid+"&plannumber="+plannumber+"&planCName="+planCName+"&calType="+calType+"&IsHistory="+IsHistory+"&RightType="+RightType+"&ProductId="+productId+"&projectId="+projectId+"&certId="+khcertid+"&customername="+khcertname+"&phaseNo="+phaseNo+"&IsHistory="+IsHistory+"&type=client"; //共同承租人传参 - String params2="flowunid="+flowunid+"&plannumber="+plannumber+"&planCName="+planCName+"&calType="+calType+"&IsHistory="+IsHistory+"&RightType="+RightType+"&ProductId="+productId+"&projectId="+projectId+"&certId="+gtcertid+"&type=jointly"; + String params2="flowunid="+flowunid+"&plannumber="+plannumber+"&planCName="+planCName+"&calType="+calType+"&IsHistory="+IsHistory+"&RightType="+RightType+"&ProductId="+productId+"&projectId="+projectId+"&certId="+gtcertid+"&customername="+gtcertname+"&phaseNo="+phaseNo+"&IsHistory="+IsHistory+"&type=jointly"; //担保人1传参 - String params3="flowunid="+flowunid+"&plannumber="+plannumber+"&planCName="+planCName+"&calType="+calType+"&IsHistory="+IsHistory+"&RightType="+RightType+"&ProductId="+productId+"&projectId="+projectId+"&certId="+dbcertid+"&type=guarantee"; + String params3="flowunid="+flowunid+"&plannumber="+plannumber+"&planCName="+planCName+"&calType="+calType+"&IsHistory="+IsHistory+"&RightType="+RightType+"&ProductId="+productId+"&projectId="+projectId+"&certId="+dbcertid+"&customername="+dbcertname+"&phaseNo="+phaseNo+"&IsHistory="+IsHistory+"&type=guarantee"; //担保人2参数 - String params4="flowunid="+flowunid+"&plannumber="+plannumber+"&planCName="+planCName+"&calType="+calType+"&IsHistory="+IsHistory+"&RightType="+RightType+"&ProductId="+productId+"&projectId="+projectId+"&certId="+dbcertid2+"&type=guarantee"; + String params4="flowunid="+flowunid+"&plannumber="+plannumber+"&planCName="+planCName+"&calType="+calType+"&IsHistory="+IsHistory+"&RightType="+RightType+"&ProductId="+productId+"&projectId="+projectId+"&certId="+dbcertid2+"&customername="+dbcertname2+"&phaseNo="+phaseNo+"&IsHistory="+IsHistory+"&type=guarantee"; //判断是否有共同承租人和担保人 String custnum1 = Sqlca.getString("select count(cf.id) as num from customer_family_temp cf where cf.Partner_ = 'Y' and cf.flowunid='"+flowunid+"'"); @@ -47,12 +55,5 @@ %> <%@ include file="/Resources/CodeParts/Tab01.jsp"%> <%@ include file="/IncludeEnd.jsp"%> \ No newline at end of file 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 60f6a3b69..9b5e7ebf9 100644 --- a/WebContent/Tenwa/Customer/Lessee/Comm/CustomerHistory/CustomerHistory_Info_temp.jsp +++ b/WebContent/Tenwa/Customer/Lessee/Comm/CustomerHistory/CustomerHistory_Info_temp.jsp @@ -8,10 +8,16 @@ History Log: */ - String sTempletNo = "CustomerHistoryInfoTemp";//--模板号-- String flowunId=CurPage.getParameter("flowunid");//流程编号 String certId=CurPage.getParameter("certId");//客户证件号 String type =CurPage.getParameter("type");//客户类型 + String IsHistory = CurPage.getParameter("IsHistory"); + String sTempletNo = "";//--模板号-- + if(IsHistory.equals("true")){ + sTempletNo = "CustomerHistoryInfoTemp"; + }else { + sTempletNo = "CustomerHistoryInfo"; + } ASObjectModel doTemp = new ASObjectModel(sTempletNo); ASObjectWindow dwTemp = new ASObjectWindow(CurPage, doTemp,request); dwTemp.Style = "2";//freeform @@ -27,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/Tenwa/Lease/Flow/Project/BusinessApplication/BusinessProjectTempInfo.jsp b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/BusinessProjectTempInfo.jsp index e6699ff83..512b3e3e6 100644 --- a/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/BusinessProjectTempInfo.jsp +++ b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/BusinessProjectTempInfo.jsp @@ -226,7 +226,7 @@ function getRequestParamOfCredit(){ let code = 'ECM0002'; - if(("<%=FlowNo%>"=="BusinessApplyFlow"||"<%=FlowNo%>"=="BusinessChangeFlow")&&("0030"=="<%=sPhaseNo%>" ||"0040"=="<%=sPhaseNo%>"||"0050"=="<%=sPhaseNo%>"||"0060"=="<%=sPhaseNo%>"||"0070"=="<%=sPhaseNo%>")&&"ReadOnly"!="<%=rightType%>"){ + if(("<%=FlowNo%>"=="BusinessApplyFlow"||"<%=FlowNo%>"=="BusinessChangeFlow")&&("<%=sPhaseNo%>"!="0010")&&"ReadOnly"!="<%=rightType%>"){ code = 'ECM0001'; } let busiNo="<%=projectNo%>"; diff --git a/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/RCScoreResult.jsp b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/RCScoreResult.jsp index e934fe584..dd2fe370b 100644 --- a/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/RCScoreResult.jsp +++ b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/RCScoreResult.jsp @@ -10,6 +10,8 @@ String userId= CurUser.getUserID(); String sFlowUnid = CurPage.getParameter("FlowUnid");//流程编号 String projectNo=CurPage.getParameter("ProjectNo");//项目编号 + String phaseNo=CurPage.getParameter("PhaseNo");//流程节点 + String flowNo=CurPage.getParameter("FlowNo");//流程编号 String compClientID = CurPage.getParameter("CompClientID"); String detailUrl = "/Tenwa/Lease/Flow/Project/BusinessApplication/RCScoreResultDetail.jsp?CompClientID="; String sTempletNo = "queryScoreResult";//--模板号-- @@ -54,31 +56,34 @@ return; } - <%--function amp(){--%> - <%-- var flowUnid = "<%=sFlowUnid%>";--%> - <%-- var curUserId = "<%=userId%>";--%> - <%-- var result = RunJavaMethodTrans("com.ample.esb.controller.AmpController","ampDo","flowUnid="+flowUnid+",operatorId="+curUserId);--%> - <%-- alert(result);--%> - <%-- self.location.reload();--%> - <%--}--%> - <%--function afs(){--%> - <%-- var projectNo = "<%=projectNo%>";--%> - <%-- var curUserId = "<%=userId%>";--%> - <%-- var result = RunJavaMethod("com.ample.esb.controller.AfsUrlController","getAfsUrl","projectNo="+projectNo+",userId="+curUserId);--%> - <%-- window.open(result);--%> - <%-- return;--%> - <%-- /*let temp_form = document.createElement("form");--%> - <%-- temp_form.action = 'http://test-antifraud.baicfc.com/Instinct.UI.WebClient_5.3.1/api/redirect?';--%> - <%-- temp_form.target = "_blank";--%> - <%-- temp_form.method = "get";--%> - <%-- temp_form.style.display = "none";--%> - <%-- const input = document.createElement('input');--%> - <%-- input.type = 'hidden';--%> - <%-- input.name = result;--%> - <%-- temp_form.appendChild(input);--%> - <%-- document.body.appendChild(temp_form);--%> - <%-- temp_form.submit();*/--%> - <%--}--%> + function amp(){ + var flowUnid = "<%=sFlowUnid%>"; + var curUserId = "<%=userId%>"; + var flowNo = "<%=flowNo%>"; + var phaseNo = "<%=phaseNo%>"; + var projectNo = "<%=projectNo%>"; + var result = RunJavaMethodTrans("com.ample.esb.controller.AmpController","ampDo","flowUnid="+flowUnid+",operatorId="+curUserId+",flowNo="+flowNo+",phaseNo="+phaseNo+",projectNo="+projectNo); + alert(result); + self.location.reload(); + } + function afs(){ + var projectNo = "<%=projectNo%>"; + var curUserId = "<%=userId%>"; + var result = RunJavaMethod("com.ample.esb.controller.AfsUrlController","getAfsUrl","projectNo="+projectNo+",userId="+curUserId); + window.open(result); + return; + /*let temp_form = document.createElement("form"); + temp_form.action = 'http://test-antifraud.baicfc.com/Instinct.UI.WebClient_5.3.1/api/redirect?'; + temp_form.target = "_blank"; + temp_form.method = "get"; + temp_form.style.display = "none"; + const input = document.createElement('input'); + input.type = 'hidden'; + input.name = result; + temp_form.appendChild(input); + document.body.appendChild(temp_form); + temp_form.submit();*/ + } diff --git a/WebContent/WEB-INF/etc/jbo/jbo_comm.xml b/WebContent/WEB-INF/etc/jbo/jbo_comm.xml index ecf50004e..3a2dbd15f 100644 --- a/WebContent/WEB-INF/etc/jbo/jbo_comm.xml +++ b/WebContent/WEB-INF/etc/jbo/jbo_comm.xml @@ -927,7 +927,6 @@ - @@ -982,6 +981,60 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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/WebContent/WEB-INF/etc/jbo/jbo_oti.xml b/WebContent/WEB-INF/etc/jbo/jbo_oti.xml index 92230e217..1e779c77e 100644 --- a/WebContent/WEB-INF/etc/jbo/jbo_oti.xml +++ b/WebContent/WEB-INF/etc/jbo/jbo_oti.xml @@ -870,11 +870,17 @@ - + + + + + + + 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/com/ample/esb/controller/AmpController.java b/src/com/ample/esb/controller/AmpController.java index 0c042d2dd..82a89b12f 100644 --- a/src/com/ample/esb/controller/AmpController.java +++ b/src/com/ample/esb/controller/AmpController.java @@ -1,9 +1,13 @@ package com.ample.esb.controller; -import com.amarsoft.are.jbo.JBOTransaction; +import com.amarsoft.are.jbo.*; +import com.amarsoft.dict.als.manage.NameManager; +import com.ample.esb.bean.esb.MessageEsbHead; import com.ample.esb.bean.esb.Transaction; import com.ample.esb.service.AmpService; import com.ample.esb.service.impl.AmpServiceImpl; +import com.ample.esb.util.DateUtils; +import jbo.sys.FLOW_MODEL; import java.util.HashMap; import java.util.Map; @@ -11,6 +15,9 @@ import java.util.Map; public class AmpController { private String operatorId; private String flowUnid; + private String flowNo; + private String phaseNo; + private String projectNo; public String ampDo(JBOTransaction tx) throws Exception { Map map = new HashMap(); map.put("flowUnid",flowUnid); @@ -25,6 +32,7 @@ public class AmpController { public String resultAnalysis(Transaction tran){ String response = ""; String retCode = tran.getMessageEsbHead().getRetCode(); + saveScoreLog(tran); if("000000".equals(retCode)){ response = "操作成功！"; }else{ @@ -32,7 +40,40 @@ public class AmpController { } return response; } - + public void saveScoreLog(com.ample.esb.bean.esb.Transaction tran){ + BizObjectManager bom = null; + try { + bom = JBOFactory.getBizObjectManager("jbo.oti.RC_SCORE_LOG"); + MessageEsbHead esbHead = tran.getMessageEsbHead(); + BizObject bo = bom.newObject(); + bo.setAttributeValue("GLOBAL_SEQ_NO",esbHead.getGlobalSeqNo()); + bo.setAttributeValue("FLOW_NODE",phaseNo); + bo.setAttributeValue("FLOW_NODE_NAME",flowNodeName(flowNo,phaseNo)); + bo.setAttributeValue("INPUTUSERID",operatorId); + String userName = NameManager.getUserName(operatorId); + bo.setAttributeValue("INPUTUSERNAME",userName); + bo.setAttributeValue("FLOW_UNID",flowUnid); + bo.setAttributeValue("INPUTTIME", DateUtils.dateTimeNow()); + String retCode = tran.getMessageEsbHead().getRetCode(); + bo.setAttributeValue("RET_CODE", retCode); + bo.setAttributeValue("PROJECT_NO", projectNo); + bom.saveObject(bo); + } catch (JBOException e) { + e.printStackTrace(); + } catch (Exception e) { + e.printStackTrace(); + } + } + public String flowNodeName(String flowNo,String phaseNo){ + String flowNodeName = ""; + try { + BizObject bo = JBOFactory.createBizObjectQuery(FLOW_MODEL.CLASS_NAME,"select PHASENAME from O where flowno=:flowno and phaseno=:phaseno").setParameter("flowno",flowNo).setParameter("phaseno",phaseNo).getSingleResult(false); + flowNodeName = bo.getAttribute("PHASENAME").toString(); + } catch (JBOException e) { + e.printStackTrace(); + } + return flowNodeName; + } public String getOperatorId() { return operatorId; @@ -50,6 +91,27 @@ public class AmpController { this.flowUnid = flowUnid; } + public String getFlowNo() { + return flowNo; + } + public void setFlowNo(String flowNo) { + this.flowNo = flowNo; + } + public String getPhaseNo() { + return phaseNo; + } + + public void setPhaseNo(String phaseNo) { + this.phaseNo = phaseNo; + } + + public String getProjectNo() { + return projectNo; + } + + public void setProjectNo(String projectNo) { + this.projectNo = projectNo; + } } diff --git a/src/com/ample/esb/service/impl/AmpServiceImpl.java b/src/com/ample/esb/service/impl/AmpServiceImpl.java index 171902b0e..1c041bde1 100644 --- a/src/com/ample/esb/service/impl/AmpServiceImpl.java +++ b/src/com/ample/esb/service/impl/AmpServiceImpl.java @@ -114,6 +114,8 @@ public class AmpServiceImpl extends EsbCommon implements AmpService { } return app; } + + //公共参数 //订单临时表 private BizObject boLpit; diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/InsertCustomerHistoryInfo.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/InsertCustomerHistoryInfo.java index 99b6811f0..a00aa19f7 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/InsertCustomerHistoryInfo.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/InsertCustomerHistoryInfo.java @@ -32,11 +32,10 @@ public class InsertCustomerHistoryInfo { } //获取客户历史信息 - public String InsertCustomerHistoryInfoTemp(JBOTransaction tx) throws Exception{ + public static String InsertCustomerHistoryInfoTemp(String flowunid) throws Exception{ try { - tx= JBOFactory.createJBOTransaction(); + JBOTransaction tx= JBOFactory.createJBOTransaction(); Conn conn = new Conn(tx); - String flowunid = this.flowunid; //获取客户基本信息 String sql = "select cpt.customerid,cpt.FULLNAME as customername,cpt.certtype,cpt.certid,'主承租人' as customertype,'' as customer_num,lul.FLOWUNID,lul.project_id from customer_person_temp cpt left join lb_union_lessee_temp lul on cpt.FLOWUNID = lul.FLOWUNID where lul.IS_MAIN = 'Y' and lul.FLOWUNID = '"+flowunid+"' \n" + "union \n" + @@ -356,8 +355,9 @@ public class InsertCustomerHistoryInfo { }catch (Exception e){ e.printStackTrace(); + return "falser"; } - return "SUCCEEDED"; + return "true"; } @@ -714,6 +714,8 @@ public class InsertCustomerHistoryInfo { } Map map = new HashMap<>(); + + map.put("clientbuynumber", gmnum); map.put("clientfinancingamount", CLEAN_LEASE_MONEY); map.put("clientclosedaccount", jq_number); diff --git a/src_jbo/jbo/com/tenwa/entity/comm/flow/CUSTOMER_HISTORY_INFO.java b/src_jbo/jbo/com/tenwa/entity/comm/flow/CUSTOMER_HISTORY_INFO.java new file mode 100644 index 000000000..750222736 --- /dev/null +++ b/src_jbo/jbo/com/tenwa/entity/comm/flow/CUSTOMER_HISTORY_INFO.java @@ -0,0 +1,190 @@ +package jbo.com.tenwa.entity.comm.flow; + +/** + * 客户历史信息 - JBO命名常量类

+ * Note: This file is generated by ADE tools, dont modify it.
+ + */ +public interface CUSTOMER_HISTORY_INFO { + /** + * 客户历史信息

+ * 代表本类映射的BizObjectClass + */ + public static final String CLASS_NAME = "jbo.com.tenwa.entity.comm.flow.CUSTOMER_HISTORY_INFO"; + /** + * ID STRING(32)
+ */ + public static final String id = "id"; + /** + * 客户编号 STRING(40)
+ */ + public static final String customerid = "customerid"; + /** + * 客户名称 STRING(200)
+ */ + public static final String customername = "customername"; + /** + * 证件类型 STRING(20)
+ */ + public static final String certtype = "certtype"; + /** + * 证件号 STRING(20)
+ */ + public static final String certid = "certid"; + /** + * 客户类别 STRING(20)
+ */ + public static final String customertype = "customertype"; + /** + * 流程编号 STRING(32)
+ */ + public static final String flowunid = "flowunid"; + /** + * 项目编号 STRING(32)
+ */ + public static final String project_id = "project_id"; + /** + * 客户购买次数 STRING(10)
+ */ + public static final String clientbuynumber = "clientbuynumber"; + /** + * 客户融资金额 STRING(32)
+ */ + public static final String clientfinancingamount = "clientfinancingamount"; + /** + * 客户已结清单数 STRING(10)
+ */ + public static final String clientclosedaccount = "clientclosedaccount"; + /** + * 客户未结清单数 STRING(10)
+ */ + public static final String clientunsettled = "clientunsettled"; + /** + * 客户车辆总数 STRING(10)
+ */ + public static final String clientvehiclepopulation = "clientvehiclepopulation"; + /** + * 客户结清车辆数 STRING(10)
+ */ + public static final String clientclosedvehicle = "clientclosedvehicle"; + /** + * 客户未结清车辆数 STRING(10)
+ */ + public static final String clientoutstandingvehicle = "clientoutstandingvehicle"; + /** + * 客户贷款余额 STRING(10)
+ */ + public static final String clientloanbalance = "clientloanbalance"; + /** + * 客户逾期金额 STRING(10)
+ */ + public static final String clientoverdueamount = "clientoverdueamount"; + /** + * 共同购买次数 STRING(10)
+ */ + public static final String jointlybuynumber = "jointlybuynumber"; + /** + * 共同融资金额 STRING(32)
+ */ + public static final String jointlyfinancingamount = "jointlyfinancingamount"; + /** + * 共同已结清单数 STRING(10)
+ */ + public static final String jointlyclosedaccount = "jointlyclosedaccount"; + /** + * 共同未结清单数 STRING(10)
+ */ + public static final String jointlyunsettled = "jointlyunsettled"; + /** + * 共同车辆总数 STRING(10)
+ */ + public static final String jointlyveh = "jointlyveh"; + /** + * 共同结清车辆数 STRING(10)
+ */ + public static final String jointlyclosedvehicle = "jointlyclosedvehicle"; + /** + * 共同未结清车辆数 STRING(10)
+ */ + public static final String jointlyout = "jointlyout"; + /** + * 共同贷款余额 STRING(10)
+ */ + public static final String jointlyloanbalance = "jointlyloanbalance"; + /** + * 共同逾期金额 STRING(10)
+ */ + public static final String jointlyoverdueamount = "jointlyoverdueamount"; + /** + * 担保单数 STRING(10)
+ */ + public static final String guaranteebuynumber = "guaranteebuynumber"; + /** + * 担保金额 STRING(32)
+ */ + public static final String guaranteefin = "guaranteefin"; + /** + * 担保已结清单数 STRING(10)
+ */ + public static final String guaranteeclosedaccount = "guaranteeclosedaccount"; + /** + * 担保未结清单数 STRING(10)
+ */ + public static final String guaranteeunsettled = "guaranteeunsettled"; + /** + * 担保车辆总数 STRING(10)
+ */ + public static final String guaranteeveh = "guaranteeveh"; + /** + * 担保结清车辆数 STRING(10)
+ */ + public static final String guaranteeclosedvehicle = "guaranteeclosedvehicle"; + /** + * 担保未结清车辆数 STRING(10)
+ */ + public static final String guaranteeout = "guaranteeout"; + /** + * 担保贷款余额 STRING(10)
+ */ + public static final String guaranteeloanbalance = "guaranteeloanbalance"; + /** + * 担保逾期金额 STRING(10)
+ */ + public static final String guaranteeoverdueamount = "guaranteeoverdueamount"; + /** + * 备注 STRING(250)
+ */ + public static final String remark = "remark"; + /** + * 客户编码 STRING(32)
+ */ + public static final String customer_num = "customer_num"; + /** + * 登记人 STRING(32)
+ */ + public static final String inputuserid = "inputuserid"; + /** + * 登记机构 STRING(32)
+ */ + public static final String inputorgid = "inputorgid"; + /** + * 登记时间 STRING(32)
+ */ + public static final String inputtime = "inputtime"; + /** + * 更新人 STRING(32)
+ */ + public static final String updateuserid = "updateuserid"; + /** + * 更新部门 STRING(32)
+ */ + public static final String updateorgid = "updateorgid"; + /** + * 更新时间 STRING(32)
+ */ + public static final String updatetime = "updatetime"; + /** + * 敞口 STRING(32)
+ */ + public static final String exposure = "exposure"; +} diff --git a/src_jbo/jbo/oti/RC_SCORE_LOG.java b/src_jbo/jbo/oti/RC_SCORE_LOG.java index 4e8e1587f..d3ab1cfa9 100644 --- a/src_jbo/jbo/oti/RC_SCORE_LOG.java +++ b/src_jbo/jbo/oti/RC_SCORE_LOG.java @@ -20,15 +20,19 @@ public interface RC_SCORE_LOG { */ public static final String GLOBAL_SEQ_NO = "GLOBAL_SEQ_NO"; /** - * 全局唯一标识 LONG(64)
+ * 节点名称 LONG(64)
+ */ + public static final String FLOW_NODE = "FLOW_NODE"; + /** + * 节点名称 LONG(64)
*/ public static final String FLOW_NODE_NAME = "FLOW_NODE_NAME"; /** - * 交易码(15)
+ * 流程id(15)
*/ public static final String FLOW_UNID = "FLOW_UNID"; /** - * 服务id STRING(990)
+ * 返回结果时间 STRING(990)
*/ public static final String RESULT_TIME = "RESULT_TIME"; /** @@ -36,9 +40,17 @@ public interface RC_SCORE_LOG { */ public static final String RET_CODE = "RET_CODE"; + public static final String PROJECT_NO = "PROJECT_NO"; + public static final String INPUTUSERID = "INPUTUSERID"; + public static final String INPUTUSERNAME = "INPUTUSERNAME"; + public static final String INPUTTIME = "INPUTTIME"; - + public static final String FRAUD_ALERT_CODE = "FRAUD_ALERT_CODE"; + + public static final String FRAUD_TAKEN_CODE = "FRAUD_TAKEN_CODE"; + + public static final String SCORE_RESULT_CODE = "SCORE_RESULT_CODE"; } \ No newline at end of file diff --git a/src_tenwa/com/tenwa/flow/comm/handler/CustomerHistoryInfoHandler.java b/src_tenwa/com/tenwa/flow/comm/handler/CustomerHistoryInfoHandler.java new file mode 100644 index 000000000..1186dac02 --- /dev/null +++ b/src_tenwa/com/tenwa/flow/comm/handler/CustomerHistoryInfoHandler.java @@ -0,0 +1,62 @@ +package com.tenwa.flow.comm.handler; + +import com.amarsoft.app.lc.workflow.action.GetFlowAction; +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.awe.dw.handler.impl.CommonHandler; +import com.tenwa.voucher.CreateVoucherProcess.InsertCustomerHistoryInfo; +import jbo.com.tenwa.entity.comm.flow.CUSTOMER_HISTORY_INFO; + +import java.util.HashMap; +import java.util.Map; + +public class CustomerHistoryInfoHandler extends CommonHandler { + + @Override + protected void initDisplayForAdd(BizObject bo) throws Exception { + + Map map = new HashMap<>(); + String customername = this.asPage.getAttribute("customername"); + String flowunid = this.asPage.getAttribute("flowunid"); + String certid = this.asPage.getAttribute("certId"); + map = InsertCustomerHistoryInfo.CustomerHistoryInfo(flowunid,certid); + //主承租人 + bo.setAttributeValue("CUSTOMERNAME",customername); + bo.setAttributeValue("CLIENTBUYNUMBER", map.get("clientbuynumber")); + bo.setAttributeValue("CLIENTFINANCINGAMOUNT", map.get("clientfinancingamount")); + bo.setAttributeValue("CLIENTCLOSEDACCOUNT", map.get("clientclosedaccount")); + bo.setAttributeValue("CLIENTUNSETTLED", map.get("clientunsettled")); + bo.setAttributeValue("CLIENTVEHICLEPOPULATION", map.get("clientvehiclepopulation")); + bo.setAttributeValue("CLIENTCLOSEDVEHICLE", map.get("clientclosedvehicle")); + bo.setAttributeValue("CLIENTOUTSTANDINGVEHICLE", map.get("clientoutstandingvehicle")); + bo.setAttributeValue("CLIENTLOANBALANCE",map.get("clientloanbalance")); + bo.setAttributeValue("CLIENTOVERDUEAMOUNT",map.get("clientoverdueamount")); + //共同承租人 + bo.setAttributeValue("JOINTLYBUYNUMBER", map.get("jointlybuynumber")); + bo.setAttributeValue("JOINTLYFINANCINGAMOUNT", map.get("jointlyfinancingamount")); + bo.setAttributeValue("JOINTLYCLOSEDACCOUNT", map.get("jointlyclosedaccount")); + bo.setAttributeValue("JOINTLYUNSETTLED", map.get("jointlyunsettled")); + bo.setAttributeValue("JOINTLYVEH", map.get("jointlyveh")); + bo.setAttributeValue("JOINTLYCLOSEDVEHICLE", map.get("jointlyclosedvehicle")); + bo.setAttributeValue("JOINTLYOUT", map.get("jointlyout")); + bo.setAttributeValue("JOINTLYLOANBALANCE",map.get("jointlyloanbalance")); + bo.setAttributeValue("JOINTLYOVERDUEAMOUNT",map.get("jointlyoverdueamount")); + //担保人 + bo.setAttributeValue("GUARANTEEBUYNUMBER", map.get("guaranteebuynumber")); + bo.setAttributeValue("GUARANTEEFIN", map.get("guaranteefin")); + bo.setAttributeValue("GUARANTEECLOSEDACCOUNT", map.get("guaranteeclosedaccount")); + bo.setAttributeValue("GUARANTEEUNSETTLED", map.get("guaranteeunsettled")); + bo.setAttributeValue("GUARANTEEVEH", map.get("guaranteeveh")); + bo.setAttributeValue("GUARANTEECLOSEDVEHICLE", map.get("guaranteeclosedvehicle")); + bo.setAttributeValue("GUARANTEEOUT", map.get("guaranteeout")); + bo.setAttributeValue("GUARANTEELOANBALANCE",map.get("guaranteeloanbalance")); + bo.setAttributeValue("GUARANTEEOVERDUEAMOUNT", map.get("guaranteeoverdueamount")); + + bo.setAttributeValue("EXPOSURE", map.get("exposure")); + + super.initDisplayForAdd(bo); + } + +} diff --git a/src_tenwa/com/tenwa/lease/flow/project/commbusiness/CustomerHistoryInfoTempKeep.java b/src_tenwa/com/tenwa/lease/flow/project/commbusiness/CustomerHistoryInfoTempKeep.java new file mode 100644 index 000000000..ef8a617d9 --- /dev/null +++ b/src_tenwa/com/tenwa/lease/flow/project/commbusiness/CustomerHistoryInfoTempKeep.java @@ -0,0 +1,33 @@ +package com.tenwa.lease.flow.project.commbusiness; + +import com.amarsoft.are.jbo.BizObject; +import com.amarsoft.are.jbo.BizObjectManager; +import com.amarsoft.are.jbo.JBOFactory; +import com.amarsoft.awe.util.Transaction; +import com.tenwa.comm.util.jboutil.DataOperatorUtil; +import com.tenwa.flow.baseBussion.BaseBussiness; +import com.tenwa.lease.flow.project.businessapply.CustomerCompare; +import com.tenwa.voucher.CreateVoucherProcess.InsertCustomerHistoryInfo; +import jbo.app.tenwa.customer.*; +import jbo.com.tenwa.lease.comm.CUST_PERSON_HIS; +import jbo.com.tenwa.lease.comm.LB_UNION_LESSEE; +import jbo.com.tenwa.lease.comm.LB_UNION_LESSEE_TEMP; +import jbo.com.tenwa.lease.comm.VI_CUST_TENANT; +import org.apache.commons.lang3.StringUtils; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.UUID; + +public class CustomerHistoryInfoTempKeep extends BaseBussiness { + + @SuppressWarnings("unchecked") + @Override + public Object run(Transaction Sqlca) throws Exception { + this.initBussinessParam(Sqlca); + String flowunid = this.getAttribute("FlowUnid").toString(); + String sMessage = InsertCustomerHistoryInfo.InsertCustomerHistoryInfoTemp(flowunid); + return sMessage; + } +} \ No newline at end of file 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"; + } +}