diff --git a/WebContent/Tenwa/Customer/Lessee/Comm/CustomerHistory/CustomerHistoryInformation.jsp b/WebContent/Tenwa/Customer/Lessee/Comm/CustomerHistory/CustomerHistoryInformation.jsp
index b4136216a..6da269714 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+"&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+"&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+"&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+"&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..4cb283ecd 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 phaseNo = CurPage.getAttribute("PhaseNo");
+ String sTempletNo = "";//--模板号--
+ if(phaseNo.equals("1000")){
+ sTempletNo = "CustomerHistoryInfoTemp";
+ }else {
+ sTempletNo = "CustomerHistoryInfo";
+ }
ASObjectModel doTemp = new ASObjectModel(sTempletNo);
ASObjectWindow dwTemp = new ASObjectWindow(CurPage, doTemp,request);
dwTemp.Style = "2";//freeform
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/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_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