anpeng/apzl_leasing
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/release20211231' into release20211231

Browse Source
This commit is contained in:
zhanglei 2023-09-19 18:13:15 +08:00
commit cb894d598c
11 changed files with 103 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
WebContent/Tenwa/Customer/Lessee/Comm/CustomerHistory/CustomerHistory_Info_temp.jsp
View File

@ -20,7 +20,7 @@
String compClientID = request.getParameter("CompClientID");
dwTemp.replaceColumn("loaned", "<iframe type='iframe' id='frame_list' name=\"frame_list\" width=\"100%\" height=\"200px\" frameborder=\"0\" src=\""+sWebRootPath+ "/Tenwa/Customer/Lessee/Comm/CustomerHistory/LoanedInfo.jsp?CompClientID=" +compClientID+"&certId="+certId+"\"></iframe>", CurPage.getObjectWindowOutput());
dwTemp.replaceColumn("outstand", "<iframe type='iframe' id='frame_list' name=\"frame_list\" width=\"100%\" height=\"200px\" frameborder=\"0\" src=\""+sWebRootPath+ "/Tenwa/Customer/Lessee/Comm/CustomerHistory/OutstandInfo.jsp?CompClientID=" +compClientID+"&certId="+certId+"\"></iframe>", CurPage.getObjectWindowOutput());
dwTemp.replaceColumn("outstand", "<iframe type='iframe' id='frame_list' name=\"frame_list\" width=\"100%\" height=\"200px\" frameborder=\"0\" src=\""+sWebRootPath+ "/Tenwa/Customer/Lessee/Comm/CustomerHistory/OutstandInfo.jsp?CompClientID=" +compClientID+"&certId="+certId+"&flowunId="+flowunId+"\"></iframe>", CurPage.getObjectWindowOutput());
String sButtons[][] = {

2
WebContent/Tenwa/Customer/Lessee/Comm/CustomerHistory/LoanedInfo.jsp
View File

@ -6,7 +6,7 @@
String certId = CurPage.getParameter("certId");
ASObjectModel doTemp = new ASObjectModel("LoanedList");
doTemp.appendJboWhere(" and O.CONTRACT_STATUS >= 31 and O.CONTRACT_STATUS <> '104' ");
doTemp.appendJboWhere(" and O.CONTRACT_STATUS >= 31 and O.CONTRACT_STATUS <> '104' and O.CONTRACT_STATUS <> '101' ");
ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request);
dwTemp.Style="1";//--设置为Grid风格--
dwTemp.ReadOnly = "1";//只读模式

3
WebContent/Tenwa/Customer/Lessee/Comm/CustomerHistory/OutstandInfo.jsp
View File

@ -5,9 +5,10 @@
<%
String certId = CurPage.getParameter("certId");
String flowunId = CurPage.getParameter("flowunId");
ASObjectModel doTemp = new ASObjectModel("LoanedList");
doTemp.appendJboWhere(" and O.CONTRACT_STATUS < 31 ");
doTemp.appendJboWhere(" and (O.CONTRACT_STATUS < 31 or O.CONTRACT_STATUS = '104' or O.CONTRACT_STATUS = '101') and O.FLOWUNID <> '"+flowunId+"'");
ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request);
dwTemp.Style="1";//--设置为Grid风格--
dwTemp.ReadOnly = "1";//只读模式

13
WebContent/Tenwa/Lease/Flow/Comm/LBDebitCard/DebitCardInfo.jsp
View File

@ -24,6 +24,17 @@
String PhaseNo=CurPage.getParameter("PhaseNo");
String subjectId=CurPage.getParameter("SubjectId");//获取主体信息，用于是否签约查询
String channel=CurPage.getParameter("channel");
String falg = "false";
if("0010".equals(PhaseNo) || "0020".equals(PhaseNo) ){
falg = "true";
}
if("合同制作流程".equals(flowName)){
falg = "false";
}
BizObjectManager ldclManager = JBOFactory.getBizObjectManager(LB_DOC_CONTRACT_LIST.CLASS_NAME);
BizObject ldcls = ldclManager.createQuery("select * from O where file_flag='yes' and ( flow_unid=:flowunid or contract_id=:contractid ) ").setParameter("flowunid", FlowUnid).setParameter("contractid", contractId).getSingleResult(false);
System.out.print("=========="+ldcls+"==========");
@ -60,7 +71,7 @@
dwTemp.replaceColumn("S_PaymentCard", "<iframe type='iframe' name=\"frame_lists\" width=\"100%\" height=\"250\" frameborder=\"0\" src=\""+sWebRootPath+"/Tenwa/Lease/Flow/Comm/LBDebitCard/S_PaymentCardInfo.jsp?FlowUnid="+FlowUnid+"&RightType="+RightType+"&ishistory="+ishistory+"&CompClientID="+sCompClientID+"\"></iframe>", CurPage.getObjectWindowOutput());
String sButtons[][] = {
{"true","","Button","保存","保存所有修改","save()","","","",""},
{falg,"","Button","保存","保存所有修改","save()","","","",""},
{"false","All","Button","校验银行卡信息","校验银行卡四要素","verifyFourelementBank()","","","","btn_icon_return"}
}
/* {String.valueOf(!com.amarsoft.are.lang.StringX.isSpace(sPrevUrl)),"All","Button","返回","返回列表","returnList()","","","",""}

20
WebContent/Tenwa/Lease/Flow/Comm/LBGuaranteeUnit/LBGuaranteePerUnitList.jsp
View File

@ -11,6 +11,8 @@
String contractid = CurPage.getParameter("ContractId");
String showtype = CurPage.getParameter("ShowType");
String PhaseNo = CurPage.getParameter("PhaseNo");
String flowName = CurPage.getParameter("FlowName");
if("queryContract".equals(action)){
RightType = "ReadOnly";
}
@ -22,7 +24,17 @@
//获取页面属性liux系统暂时不支持
/* Toolkit toolkit = Toolkit.getDefaultToolkit();
Dimension screen = toolkit.getScreenSize(); */
String falg = "false";
if("0010".equals(PhaseNo) || "0020".equals(PhaseNo) ){
falg = "true";
}
if("合同制作流程".equals(flowName)){
falg = "false";
}
ASObjectModel doTemp = new ASObjectModel(sTempletNoQuery);
// doTemp.appendHTMLStyle("FULLNAME","width:"+(int)((screen.getWidth()-(screen.getWidth()*0.108))*0.15)+"px;");
ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request);
@ -41,9 +53,9 @@
};
} else{
sButtons=new String[][]{
{"true","","Button","新增","新增","newRecord()","","","","btn_icon_add"},
{"true","","Button","修改","修改","viewAndEdit()","","","","btn_icon_edit"},
{"true","","Button","删除","删除","do_delete()","","","","btn_icon_delete"},
{falg,"","Button","新增","新增","newRecord()","","","","btn_icon_add"},
{falg,"","Button","修改","修改","viewAndEdit()","","","","btn_icon_edit"},
{falg,"","Button","删除","删除","do_delete()","","","","btn_icon_delete"},
{"true","","Button","详情","详情","viewAndEdit2()","","","","btn_icon_edit"}
};
}

15
WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/BusinessProjectTempInfo.jsp
View File

@ -22,7 +22,18 @@
String custype = CurPage.getParameter("CustomerType");
String customertype = CurPage.getParameter("customertype");
String channel = CurPage.getParameter("channel");
String flowName = CurPage.getParameter("FlowName");
String falg = "false";
if("0010".equals(sPhaseNo) || "0020".equals(sPhaseNo) ){
falg = "true";
}
if("ºÏͬÖÆ×÷Á÷³Ì".equals(flowName)){
falg = "false";
}
ASObjectModel doTemp = new ASObjectModel(sTempletNo);
doTemp.setHtmlEvent("inputTel","onChange","checkTel");
//理줏近駕set怜뗍
@ -60,7 +71,7 @@
dwTemp.genHTMLObjectWindow(CurPage.getParameter("FlowUnid"));
dwTemp.replaceColumn("customer_info", "<iframe type='iframe' id='frame_list' name=\"frame_list\" width=\"100%\" height=\"1200px\" frameborder=\"0\" src=\""+sWebRootPath+userll+compClientID+"&sPhaseNo="+sPhaseNo+"\"></iframe>", CurPage.getObjectWindowOutput());
String sButtons[][] = {
{"ReadOnly".equals(rightType)?"false":"true","","Button","±£´æ","±£´æ","save()","","","","btn_icon_saveNew",""},
{falg,"","Button","±£´æ","±£´æ","save()","","","","btn_icon_saveNew",""},
{"true","","Button","栗죕헌데","栗죕헌데","openFileList('1')","","","","btn_icon_saveNew",""},
{("BusinessApplyFlow".equals(FlowNo)||"BusinessChangeFlow".equals(FlowNo))&&("0030".equals(sPhaseNo)||"0040".equals(sPhaseNo)||"0050".equals(sPhaseNo)||"0060".equals(sPhaseNo)||"0070".equals(sPhaseNo))?"true":"false","","Button","斤<>栗죕","斤<>栗죕","openFileList('2')","","","","btn_icon_saveNew",""}
};

8
WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/CustomerFamilyJoinTempInfo.jsp
View File

@ -17,10 +17,16 @@
String IsHistory = CurPage.getParameter("IsHistory");
if(sPrevUrl == null) sPrevUrl = "";
String falg = "true";
String falg = "false";
if("0010".equals(sPhaseNo) || "0020".equals(sPhaseNo) ){
falg = "true";
}
if("合同制作流程".equals(flowName)){
falg = "false";
}
String sTempletNo = "CustomerFamilyJoinTempInfo";//--模板号--
//如果是合同查询则 查询正式表数据
if("flow_contract_sum_car".equals(showtype)){

1
WebContent/WEB-INF/etc/jbo/jbo_comm.xml
View File

@ -998,6 +998,7 @@
<attribute name="CONTRACT_STATUS" label="合同状态" type="STRING" length="32"/>
<attribute name="PROJECT_ID" label="项目ID" type="STRING" length="32"/>
<attribute name="PROJ_NAME" label="项目名称" type="STRING" length="200"/>
<attribute name="FLOWUNID" label="流程编号" type="STRING" length="32"/>
</attributes>
<manager>
<managerProperties>

3
src_core/com/tenwa/voucher/CreateVoucherProcess/InsertCustomerHistoryInfo.java
View File

@ -300,6 +300,9 @@ public class InsertCustomerHistoryInfo {
//客户敞口计算
Transaction sqlca = Transaction.createTransaction(tx);
BigDecimal exposureMoney = LBBusinessPrimary.obtainExposureMoney(sqlca,flowunid);
if(exposureMoney==null||"".equals(exposureMoney)){
exposureMoney = BigDecimal.valueOf(0);
}
//录入客户历史信息表
String ssql = "insert into customer_history_info_temp(id,customerid,customername,certtype,certid,customertype,customer_num,flowunid,project_id,clientbuynumber,clientfinancingamount,clientclosedaccount,clientunsettled,clientvehiclepopulation,clientclosedvehicle,clientoutstandingvehicle,clientloanbalance,clientoverdueamount,jointlybuynumber,jointlyfinancingamount,jointlyclosedaccount,jointlyunsettled,jointlyveh,jointlyclosedvehicle,jointlyout,jointlyloanbalance,jointlyoverdueamount,guaranteebuynumber,guaranteefin,guaranteeclosedaccount,guaranteeunsettled,guaranteeveh,guaranteeclosedvehicle,guaranteeout,guaranteeloanbalance,guaranteeoverdueamount,exposure)"+
"VALUES(replace(uuid(),'-',''),'"+customerinfo.get(i).get("customerid")+"','"+customerinfo.get(i).get("customername")+"','"+customerinfo.get(i).get("certtype")+"','"+customerinfo.get(i).get("certid")+"','"+customerinfo.get(i).get("customertype")+"','"+customerinfo.get(i).get("customer_num")+"','"+flowunid+"','"+customerinfo.get(i).get("project_id")+"','"+gmnum+"','"+CLEAN_LEASE_MONEY+"','"+jq_number+"','"+wjq_number+"','"+carnumber+"','"+carjqnumber+"','"+carwjqnumber+"','"+czr_rent_over+"','"+czr_yqrent_over+"',"+

5
src_jbo/jbo/com/tenwa/entity/comm/flow/VI_CUSTOMERHISTORY.java
View File

@ -82,4 +82,9 @@ public interface VI_CUSTOMERHISTORY {
*/
public static final String PROJ_NAME = "PROJ_NAME";
/**
* Á÷³Ì±àºÅ STRING(32)<br>
*/
public static final String FLOWUNID = "FLOWUNID";
}

81
src_tenwa/com/tenwa/lease/flow/project/businessapply/CustomerInfoCheck.java
View File

@ -159,15 +159,18 @@ public class CustomerInfoCheck {
if(mobileFT!=null){
return "承租人跟共同申请人手机号重复！";
}
}else if("Lessee1".equals(CustomerName)){
if(mobileFT!=null){
return "紧急联系人1跟共同申请人手机号重复！";
}
}else if("Lessee2".equals(CustomerName)){
if(mobileFT!=null){
return "紧急联系人2跟共同申请人手机号重复！";
}
}else if("Lessee3".equals(CustomerName)){
}
// else if("Lessee1".equals(CustomerName)){
// if(mobileFT!=null){
// return "紧急联系人1跟共同申请人手机号重复！";
// }
// }
// else if("Lessee2".equals(CustomerName)){
// if(mobileFT!=null){
// return "紧急联系人2跟共同申请人手机号重复！";
// }
// }
else if("Lessee3".equals(CustomerName)){
if(mobileFT!=null&&!(mobileFT.getAttribute("ID").getString().equals(certId))){
return "配偶跟共同申请人手机号重复！";
}
@ -178,42 +181,42 @@ public class CustomerInfoCheck {
return "手机号跟承租人手机号重复！";
}
}
else if(emergencycontacttel!=null){
String id = emergencycontacttel.getAttribute("ID").getString();
if(!id.equals(certId)){
return "手机号跟紧急联系人1手机号重复！";
}
}
else if(remark!=null){
String id = remark.getAttribute("ID").getString();
if(!id.equals(certId)){
return "手机号跟紧急联系人2手机号重复！";
}
}
// else if(emergencycontacttel!=null){
// String id = emergencycontacttel.getAttribute("ID").getString();
// if(!id.equals(certId)){
// return "手机号跟紧急联系人1手机号重复！";
// }
// }
// else if(remark!=null){
// String id = remark.getAttribute("ID").getString();
// if(!id.equals(certId)){
// return "手机号跟紧急联系人2手机号重复！";
// }
// }
/*if(mobileLUT!=null){
String id = mobileLUT.getAttribute("ID").getString();
if(!id.equals(certId)){
return "手机号跟担保人手机号重复！";
}
}*/
if(mobileFT!=null){
String id = mobileFT.getAttribute("ID").getString();
if(!id.equals(certId)){
return "手机号跟共同申请人手机号重复！";
}
}
if(mobileFTSpouse!=null){
String id = mobileFTSpouse.getAttribute("ID").getString();
String certid1 = mobileFTSpouse.getAttribute("certid").getString();// 配偶身份证号
String name = mobileFTSpouse.getAttribute("name").getString();// 配偶名称
// 判断担保人名称和身份证是否与配偶相同， 相同则过滤， 不同则提示
if(certid1.equals(certid) && name.equals(FULLNAME)){
return "SUCCESS";
}else{
return "手机号跟配偶人手机号重复！";
}
}
// if(mobileFT!=null){
// String id = mobileFT.getAttribute("ID").getString();
// if(!id.equals(certId)){
// return "手机号跟共同申请人手机号重复！";
// }
// }
// if(mobileFTSpouse!=null){
// String id = mobileFTSpouse.getAttribute("ID").getString();
// String certid1 = mobileFTSpouse.getAttribute("certid").getString();// 配偶身份证号
// String name = mobileFTSpouse.getAttribute("name").getString();// 配偶名称
//
// // 判断担保人名称和身份证是否与配偶相同， 相同则过滤， 不同则提示
// if(certid1.equals(certid) && name.equals(FULLNAME)){
// return "SUCCESS";
// }else{
// return "手机号跟配偶人手机号重复！";
// }
// }
}
}
}