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

Merge branch 'develop' of http://git2.tenwa.com.cn/ApzlDev/apzl_leasing.git into zhouyh2

Browse Source
This commit is contained in:
zhouyahui 2018-07-28 17:27:55 +08:00
commit 6a2164b9d3
8 changed files with 46 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
WebContent/Accounting/LoanSimulation/LoanBasicInfo.jsp
View File

@ -139,6 +139,16 @@
}else{
doTemp.setVisible("RENT_RATIO",false);
}
if(CurUser.hasRole("401")){
doTemp.setVisible("DISCOUNT", false);
// doTemp.setColumnAttribute("DISCOUNT","colvisible","0");
}
if(CurUser.hasRole("800R00000013")||CurUser.hasRole("800R00000014")||CurUser.hasRole("800R00000015")){
doTemp.setVisible("YEAR_RATE", true);
}
ASObjectWindowCalc dwTemp = new ASObjectWindowCalc(CurPage, doTemp,request);

5
WebContent/Accounting/LoanSimulation/RentPlanList.jsp
View File

@ -21,14 +21,13 @@
doTemp.setDataQueryClass("com.tenwa.lease.flow.flowarchive.calcarchive.CalcRentListArachiveShow");
}
String Distributor=CurPage.getParameter("isDistributor");
String orgid = CurUser.getOrgID();
if("true".equals(Distributor)||CurUser.hasRole("401")){
doTemp.setVisible("CORPUS", false);
doTemp.setVisible("INTEREST", false);
doTemp.setVisible("CORPUS_BUSINESS", false);
doTemp.setVisible("INTEREST_BUSINESS", false);
}
String orgid = CurUser.getOrgID();
if("8009012002".equals(orgid)){
}else if(!"8009012002".equals(orgid)){
doTemp.setVisible("CORPUS", false);
doTemp.setVisible("INTEREST", false);
}

18
WebContent/Tenwa/Core/InvoiceManager/TablesXML/RentInvoice/rent_invoice_plan.xml
View File

@ -43,7 +43,7 @@ select id,contractnumber,paymentnumber,customername,rentlist,plandate,planmoney,
rlrp.plan_list AS rentlist,
rlrp.plan_date AS plandate,
rlrp.rent AS planmoney,
'rent' AS renttype,
CONVERT('rent' USING utf8) AS renttype,
invoiceinfo.interest_invoice_type AS rentinvoicetype,
invoiceinfo.interest_rate AS rentrate,
lccs.contract_id AS contractid
@ -81,7 +81,7 @@ select id,contractnumber,paymentnumber,customername,rentlist,plandate,planmoney,
LEFT JOIN
(SELECT asset_type,lease_form,tax_reg_type,interest_rate,interest_invoice_type,corpus_rate,corpus_invoice_type,hand_rate,hand_invoice_type,service_rate,service_invoice_type,nominal_rate,nominal_invoice_type,caution_invoice_type FROM TAX_INFO WHERE CONTRACT_DATE='2016/05/01' AND before_after='after' AND asset_type='asset_type01') taxrate2 ON taxrate2.asset_type=lci.asset_type AND taxrate2.tax_reg_type=lcit.tax_reg_type AND taxrate2.lease_form=lci.lease_form
) invoiceinfo on lci.id= invoiceinfo.id
WHERE lci.rent_invoice_type in ('invoice_type03','invoice_type05') AND lccs.PLAN_STATUS>=31
WHERE lccs.PLAN_STATUS>=31
UNION ALL
SELECT
clrp.id AS id,
@ -89,7 +89,7 @@ select id,contractnumber,paymentnumber,customername,rentlist,plandate,planmoney,
clrp.plan_list AS rentlist,
clrp.plan_date AS plandate,
clrp.corpus AS planmoney,
'corpus' AS renttype,
CONVERT('corpus' USING utf8) AS renttype,
invoiceinfo.corpus_invoice_type AS rentinvoicetype,
invoiceinfo.corpus_rate AS rentrate,
lccs.contract_id AS contractid
@ -128,7 +128,7 @@ select id,contractnumber,paymentnumber,customername,rentlist,plandate,planmoney,
(SELECT asset_type,lease_form,tax_reg_type,interest_rate,interest_invoice_type,corpus_rate,corpus_invoice_type,hand_rate,hand_invoice_type,service_rate,service_invoice_type,nominal_rate,nominal_invoice_type,caution_invoice_type FROM TAX_INFO WHERE CONTRACT_DATE='2016/05/01' AND before_after='after' AND asset_type='asset_type01') taxrate2 ON taxrate2.asset_type=lci.asset_type AND taxrate2.tax_reg_type=lcit.tax_reg_type AND taxrate2.lease_form=lci.lease_form
where lci.sign_date>='2016/05/01'
) invoiceinfo on lci.id= invoiceinfo.id
WHERE lci.rent_invoice_type='invoice_type04' AND lccs.PLAN_STATUS>=31
WHERE lccs.PLAN_STATUS>=31
UNION ALL
SELECT
ilrp.id AS id,
@ -136,7 +136,7 @@ select id,contractnumber,paymentnumber,customername,rentlist,plandate,planmoney,
ilrp.plan_list AS rentlist,
ilrp.plan_date AS plandate,
ilrp.interest AS planmoney,
'interest' AS renttype,
CONVERT('interest' USING utf8) AS renttype,
invoiceinfo.interest_invoice_type AS rentinvoicetype,
invoiceinfo.interest_rate AS rentrate,
lccs.contract_id AS contractid
@ -175,7 +175,7 @@ select id,contractnumber,paymentnumber,customername,rentlist,plandate,planmoney,
(SELECT asset_type,lease_form,tax_reg_type,interest_rate,interest_invoice_type,corpus_rate,corpus_invoice_type,hand_rate,hand_invoice_type,service_rate,service_invoice_type,nominal_rate,nominal_invoice_type,caution_invoice_type FROM TAX_INFO WHERE CONTRACT_DATE='2016/05/01' AND before_after='after' AND asset_type='asset_type01') taxrate2 ON taxrate2.asset_type=lci.asset_type AND taxrate2.tax_reg_type=lcit.tax_reg_type AND taxrate2.lease_form=lci.lease_form
where lci.sign_date>='2016/05/01'
) invoiceinfo on lci.id= invoiceinfo.id
WHERE lci.rent_invoice_type IN ('invoice_type01','invoice_type02','invoice_type04','invoice_type06') AND lccs.PLAN_STATUS>=31
WHERE lccs.PLAN_STATUS>=31
) rentplan
LEFT JOIN LB_CONTRACT_INFO lci ON rentplan.contractid=lci.id
LEFT JOIN lb_contract_invoice_type lcit ON lcit.contract_id=lci.id AND lcit.is_main='Y'
@ -265,7 +265,7 @@ select id,contractnumber,paymentnumber,customername,rentlist,plandate,planmoney,
LEFT JOIN
(SELECT asset_type,lease_form,tax_reg_type,interest_rate,interest_invoice_type,corpus_rate,corpus_invoice_type,hand_rate,hand_invoice_type,service_rate,service_invoice_type,nominal_rate,nominal_invoice_type,caution_invoice_type FROM TAX_INFO WHERE CONTRACT_DATE='2016/05/01' AND before_after='after' AND asset_type='asset_type01') taxrate2 ON taxrate2.asset_type=lci.asset_type AND taxrate2.tax_reg_type=lcit.tax_reg_type AND taxrate2.lease_form=lci.lease_form
) invoiceinfo on lci.id= invoiceinfo.id
WHERE lci.rent_invoice_type in ('invoice_type03','invoice_type05') AND lccs.PLAN_STATUS>=31
WHERE lccs.PLAN_STATUS>=31
UNION ALL
SELECT
clrp.id AS id,
@ -312,7 +312,7 @@ select id,contractnumber,paymentnumber,customername,rentlist,plandate,planmoney,
(SELECT asset_type,lease_form,tax_reg_type,interest_rate,interest_invoice_type,corpus_rate,corpus_invoice_type,hand_rate,hand_invoice_type,service_rate,service_invoice_type,nominal_rate,nominal_invoice_type,caution_invoice_type FROM TAX_INFO WHERE CONTRACT_DATE='2016/05/01' AND before_after='after' AND asset_type='asset_type01') taxrate2 ON taxrate2.asset_type=lci.asset_type AND taxrate2.tax_reg_type=lcit.tax_reg_type AND taxrate2.lease_form=lci.lease_form
where lci.sign_date>='2016/05/01'
) invoiceinfo on lci.id= invoiceinfo.id
WHERE lci.rent_invoice_type='invoice_type04' AND lccs.PLAN_STATUS>=31
WHERE lccs.PLAN_STATUS>=31
UNION ALL
SELECT
ilrp.id AS id,
@ -359,7 +359,7 @@ select id,contractnumber,paymentnumber,customername,rentlist,plandate,planmoney,
(SELECT asset_type,lease_form,tax_reg_type,interest_rate,interest_invoice_type,corpus_rate,corpus_invoice_type,hand_rate,hand_invoice_type,service_rate,service_invoice_type,nominal_rate,nominal_invoice_type,caution_invoice_type FROM TAX_INFO WHERE CONTRACT_DATE='2016/05/01' AND before_after='after' AND asset_type='asset_type01') taxrate2 ON taxrate2.asset_type=lci.asset_type AND taxrate2.tax_reg_type=lcit.tax_reg_type AND taxrate2.lease_form=lci.lease_form
where lci.sign_date>='2016/05/01'
) invoiceinfo on lci.id= invoiceinfo.id
WHERE lci.rent_invoice_type IN ('invoice_type01','invoice_type02','invoice_type04','invoice_type06') AND lccs.PLAN_STATUS>=31
WHERE lccs.PLAN_STATUS>=31
) rentplan
LEFT JOIN LB_CONTRACT_INFO lci ON rentplan.contractid=lci.id
LEFT JOIN lb_contract_invoice_type lcit ON lcit.contract_id=lci.id AND lcit.is_main='Y'

2
WebContent/Tenwa/Lease/Flow/Fund/ActualPayment/ActualPaymentBatchModify.jsp
View File

@ -11,7 +11,7 @@
String sTempletNo = "ActualPaymentBatchModify";//--Ä£°åºÅ--
ASObjectModel doTemp = new ASObjectModel(sTempletNo);
if("0020".equals(phaseNo)){
doTemp.setVisible("EBANK_STATUS", false);
//doTemp.setVisible("EBANK_STATUS", false);
doTemp.setReadOnly("BANK", true);
doTemp.setRequired("BANK", false);
}

1
WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/CustomerInfo.jsp
View File

@ -72,6 +72,7 @@
function changeChildrensNumber(){//已婚时显示配偶信息页面
var marriage = getItemValue(0,0,"MARRIAGE");
if("01" == marriage){
setItemRequired(0, "childrens_number", true);
$("#CHILDRENS_NUMBER").removeAttr("ReadOnly");//删除子女人数字段只读属性
$("#A_Group_0030").attr("style","display:block;");
changeFamilyRequired();

2
WebContent/WEB-INF/etc/app/component/component-config.xml
View File

@ -1085,7 +1085,7 @@
<Component FORMAT="1" ID="OTHER_INCOME" NAME="其他收入" STATUS="2" TYPE="PRD0315"><Parameters><Parameter ARIGHTTYPE="Required" DISPLAYNAME="收取方向" PARAMETERID="CostType01" PARAMETERNAME="收取方向" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="收付节点" PARAMETERID="CostType02" PARAMETERNAME="收付节点" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="收付对象" PARAMETERID="CostType03" PARAMETERNAME="收付对象" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="科目编码" PARAMETERID="CostType04" PARAMETERNAME="科目编码" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="是否显示比例" PARAMETERID="CostType05" PARAMETERNAME="是否显示比例" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="输入方式" PARAMETERID="CostType06" PARAMETERNAME="输入方式" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="比例参照费用" PARAMETERID="CostType07" PARAMETERNAME="比例参照费用" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="金额限定" PARAMETERID="CostType08" PARAMETERNAME="金额限定" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="比例限定" PARAMETERID="CostType09" PARAMETERNAME="比例限定" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="是否参与IRR/XIRR核算" PARAMETERID="CostType10" PARAMETERNAME="是否参与IRR/XIRR核算" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="显示次序" PARAMETERID="DISPLAY_ORDER" PARAMETERNAME="显示次序" PRIGHTTYPE="Required"/></Parameters></Component>
<Component FORMAT="1" ID="OTHER_EXPENDITURE" NAME="其他支出" STATUS="2" TYPE="PRD0315"><Parameters><Parameter ARIGHTTYPE="Required" DISPLAYNAME="收取方向" PARAMETERID="CostType01" PARAMETERNAME="收取方向" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="收付节点" PARAMETERID="CostType02" PARAMETERNAME="收付节点" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="收付对象" PARAMETERID="CostType03" PARAMETERNAME="收付对象" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="科目编码" PARAMETERID="CostType04" PARAMETERNAME="科目编码" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="是否显示比例" PARAMETERID="CostType05" PARAMETERNAME="是否显示比例" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="输入方式" PARAMETERID="CostType06" PARAMETERNAME="输入方式" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="比例参照费用" PARAMETERID="CostType07" PARAMETERNAME="比例参照费用" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="金额限定" PARAMETERID="CostType08" PARAMETERNAME="金额限定" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="比例限定" PARAMETERID="CostType09" PARAMETERNAME="比例限定" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="是否参与IRR/XIRR核算" PARAMETERID="CostType10" PARAMETERNAME="是否参与IRR/XIRR核算" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="显示次序" PARAMETERID="DISPLAY_ORDER" PARAMETERNAME="显示次序" PRIGHTTYPE="Required"/></Parameters></Component>
<Component FORMAT="1" ID="even_rent_day" NAME="等额租金按日计息" STATUS="2" TYPE="PRD0301"><Parameters><Parameter ARIGHTTYPE="All" DISPLAYNAME="默认还款日" PARAMETERID="DefaultDueDay" PARAMETERNAME="默认还款日" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="默认还款周期" PARAMETERID="PayFrequencyType" PARAMETERNAME="默认还款周期" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="指定周期(月)" PARAMETERID="PayFrequency" PARAMETERNAME="指定周期" PRIGHTTYPE="All"/></Parameters></Component><Component FORMAT="1" ID="OVER_INCOME" NAME="是否允许超期核销" STATUS="2" TYPE="PRD0307"><Parameters><Parameter ARIGHTTYPE="Required" DISPLAYNAME="是否允许超期核销" PARAMETERID="over_income" PARAMETERNAME="是否允许超期核销" PRIGHTTYPE="Required"/></Parameters></Component><Component FORMAT="1" ID="PenaltyRule" NAME="罚息特殊处理规则" STATUS="2" TYPE="PRD0307"><Parameters><Parameter ARIGHTTYPE="None" DISPLAYNAME="罚息特殊处理规则" PARAMETERID="PenaltyRule" PARAMETERNAME="罚息特殊处理规则" PRIGHTTYPE="Required"/></Parameters></Component><Component FORMAT="1" ID="ADJUST_INTEREST" NAME="利率类型" STATUS="1" TYPE="PRD0320"><Parameters><Parameter ARIGHTTYPE="None" DISPLAYNAME="利率类型" PARAMETERID="ISADJUST_INTEREST" PARAMETERNAME="是否调息" PRIGHTTYPE="None"/><Parameter ARIGHTTYPE="None" DISPLAYNAME="调息计算方式" PARAMETERID="rate_float_type" PARAMETERNAME="调息计算方式" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="None" DISPLAYNAME="调息生效节点" PARAMETERID="adjust_style" PARAMETERNAME="调息生效节点" PRIGHTTYPE="Required"/></Parameters></Component><Component FORMAT="1" ID="ISSUBSECTION" NAME="是否支持分段" STATUS="1" TYPE="PRD0321"><Parameters/></Component><Component FORMAT="1" ID="FIRSTRENT_DAY" NAME="是否首期按日计息" STATUS="1" TYPE="PRD0322"/><Component FORMAT="1" ID="LASTRENT_DAY" NAME="是否末期按日计息" STATUS="1" TYPE="PRD0322"/><Component FORMAT="1" ID="RentRound" NAME="租金圆整" STATUS="1" TYPE="PRD0323"><Parameters><Parameter ARIGHTTYPE="None" DISPLAYNAME="租金圆整" PARAMETERID="RentRound" PARAMETERNAME="租金圆整" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="租金圆整方式" PARAMETERID="RentRoundType" PARAMETERNAME="租金圆整方式" PRIGHTTYPE="Required"/></Parameters></Component><Component FORMAT="2" ID="DocList" NAME="流程、资料清单类别、资料清单" STATUS="1" TYPE="PRD0412"><Parameters><Parameter ARIGHTTYPE="None" DISPLAYNAME="流程名称" PARAMETERID="FLOW_INFO" PARAMETERNAME="流程名称" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="None" DISPLAYNAME="类型" PARAMETERID="TYPE" PARAMETERNAME="类型" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="None" DISPLAYNAME="资料清单" PARAMETERID="DocList" PARAMETERNAME="资料清单" PRIGHTTYPE="All"/></Parameters><ChildrenComponents><ChildrenComponent FORMAT="2" ID="资料组件配置" NAME="DOC_GROUP_CONFIG" STATUS="1" TYPE="PRD0412"><Parameters><Parameter ARIGHTTYPE="None" DISPLAYNAME="序号" PARAMETERID="POSITION" PARAMETERNAME="序号" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="None" DISPLAYNAME="主体类型" PARAMETERID="MainType" PARAMETERNAME="主体类型" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="None" DISPLAYNAME="资料清单" PARAMETERID="DocList" PARAMETERNAME="资料清单" PRIGHTTYPE="Required"/></Parameters></ChildrenComponent></ChildrenComponents></Component><Component FORMAT="2" ID="DOC_GROUP_CONFIG" NAME="资料组合配置" STATUS="1" TYPE="PRD0413"><Parameters><Parameter ARIGHTTYPE="None" DISPLAYNAME="序号" PARAMETERID="POSITION" PARAMETERNAME="序号" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="None" DISPLAYNAME="主体类型" PARAMETERID="MainType" PARAMETERNAME="主体类型" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="None" DISPLAYNAME="资料清单" PARAMETERID="DocList" PARAMETERNAME="资料清单" PRIGHTTYPE="Required"/></Parameters></Component><Component FORMAT="2" ID="FlowAccessory" NAME="流程附件" STATUS="1" TYPE="PRD0414"><Parameters><Parameter ARIGHTTYPE="None" DISPLAYNAME="流程名称" PARAMETERID="FLOW_INFO" PARAMETERNAME="流程名称" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="None" DISPLAYNAME="资料清单" PARAMETERID="DocList" PARAMETERNAME="资料清单" PRIGHTTYPE="Required"/></Parameters></Component><Component FORMAT="2" ID="AssessmentReport" NAME="流程、评分模型" STATUS="1" TYPE="PRD0415"><Parameters><Parameter ARIGHTTYPE="None" DISPLAYNAME="流程名称" PARAMETERID="FLOW_INFO" PARAMETERNAME="流程名称" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="None" DISPLAYNAME="评估报告" PARAMETERID="AssessReport" PARAMETERNAME="评估报告" PRIGHTTYPE="Required"/></Parameters></Component>
<Component FORMAT="1" ID="even_rent_day" NAME="等额租金按日计息" STATUS="2" TYPE="PRD0301"><Parameters><Parameter ARIGHTTYPE="All" DISPLAYNAME="默认还款日" PARAMETERID="DefaultDueDay" PARAMETERNAME="默认还款日" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="默认还款周期" PARAMETERID="PayFrequencyType" PARAMETERNAME="默认还款周期" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="指定周期(月)" PARAMETERID="PayFrequency" PARAMETERNAME="指定周期" PRIGHTTYPE="All"/></Parameters></Component><Component FORMAT="1" ID="OVER_INCOME" NAME="是否允许超期核销" STATUS="2" TYPE="PRD0307"><Parameters><Parameter ARIGHTTYPE="Required" DISPLAYNAME="是否允许超期核销" PARAMETERID="over_income" PARAMETERNAME="是否允许超期核销" PRIGHTTYPE="Required"/></Parameters></Component><Component FORMAT="1" ID="PenaltyRule" NAME="罚息特殊处理规则" STATUS="2" TYPE="PRD0307"><Parameters><Parameter ARIGHTTYPE="None" DISPLAYNAME="罚息特殊处理规则" PARAMETERID="PenaltyRule" PARAMETERNAME="罚息特殊处理规则" PRIGHTTYPE="Required"/></Parameters></Component><Component FORMAT="1" ID="ADJUST_INTEREST" NAME="利率类型" STATUS="1" TYPE="PRD0320"><Parameters><Parameter ARIGHTTYPE="None" DISPLAYNAME="利率类型" PARAMETERID="ISADJUST_INTEREST" PARAMETERNAME="是否调息" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="None" DISPLAYNAME="调息计算方式" PARAMETERID="rate_float_type" PARAMETERNAME="调息计算方式" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="None" DISPLAYNAME="调息生效节点" PARAMETERID="adjust_style" PARAMETERNAME="调息生效节点" PRIGHTTYPE="Required"/></Parameters></Component><Component FORMAT="1" ID="ISSUBSECTION" NAME="是否支持分段" STATUS="1" TYPE="PRD0321"><Parameters/></Component><Component FORMAT="1" ID="FIRSTRENT_DAY" NAME="是否首期按日计息" STATUS="1" TYPE="PRD0322"/><Component FORMAT="1" ID="LASTRENT_DAY" NAME="是否末期按日计息" STATUS="1" TYPE="PRD0322"/><Component FORMAT="1" ID="RentRound" NAME="租金圆整" STATUS="1" TYPE="PRD0323"><Parameters><Parameter ARIGHTTYPE="None" DISPLAYNAME="租金圆整" PARAMETERID="RentRound" PARAMETERNAME="租金圆整" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="租金圆整方式" PARAMETERID="RentRoundType" PARAMETERNAME="租金圆整方式" PRIGHTTYPE="Required"/></Parameters></Component><Component FORMAT="2" ID="DocList" NAME="流程、资料清单类别、资料清单" STATUS="1" TYPE="PRD0412"><Parameters><Parameter ARIGHTTYPE="None" DISPLAYNAME="流程名称" PARAMETERID="FLOW_INFO" PARAMETERNAME="流程名称" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="None" DISPLAYNAME="类型" PARAMETERID="TYPE" PARAMETERNAME="类型" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="None" DISPLAYNAME="资料清单" PARAMETERID="DocList" PARAMETERNAME="资料清单" PRIGHTTYPE="All"/></Parameters><ChildrenComponents><ChildrenComponent FORMAT="2" ID="资料组件配置" NAME="DOC_GROUP_CONFIG" STATUS="1" TYPE="PRD0412"><Parameters><Parameter ARIGHTTYPE="None" DISPLAYNAME="序号" PARAMETERID="POSITION" PARAMETERNAME="序号" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="None" DISPLAYNAME="主体类型" PARAMETERID="MainType" PARAMETERNAME="主体类型" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="None" DISPLAYNAME="资料清单" PARAMETERID="DocList" PARAMETERNAME="资料清单" PRIGHTTYPE="Required"/></Parameters></ChildrenComponent></ChildrenComponents></Component><Component FORMAT="2" ID="DOC_GROUP_CONFIG" NAME="资料组合配置" STATUS="1" TYPE="PRD0413"><Parameters><Parameter ARIGHTTYPE="None" DISPLAYNAME="序号" PARAMETERID="POSITION" PARAMETERNAME="序号" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="None" DISPLAYNAME="主体类型" PARAMETERID="MainType" PARAMETERNAME="主体类型" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="None" DISPLAYNAME="资料清单" PARAMETERID="DocList" PARAMETERNAME="资料清单" PRIGHTTYPE="Required"/></Parameters></Component><Component FORMAT="2" ID="FlowAccessory" NAME="流程附件" STATUS="1" TYPE="PRD0414"><Parameters><Parameter ARIGHTTYPE="None" DISPLAYNAME="流程名称" PARAMETERID="FLOW_INFO" PARAMETERNAME="流程名称" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="None" DISPLAYNAME="资料清单" PARAMETERID="DocList" PARAMETERNAME="资料清单" PRIGHTTYPE="Required"/></Parameters></Component><Component FORMAT="2" ID="AssessmentReport" NAME="流程、评分模型" STATUS="1" TYPE="PRD0415"><Parameters><Parameter ARIGHTTYPE="None" DISPLAYNAME="流程名称" PARAMETERID="FLOW_INFO" PARAMETERNAME="流程名称" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="None" DISPLAYNAME="评估报告" PARAMETERID="AssessReport" PARAMETERNAME="评估报告" PRIGHTTYPE="Required"/></Parameters></Component>
<Component FORMAT="1" ID="PENALTY_RATE_DAY" NAME="罚息日利率" STATUS="1" TYPE="PRD0308">
<Parameters>
<Parameter ARIGHTTYPE="Required" DISPLAYNAME="罚息日利率%%" PARAMETERID="PENALTY_RATE_DAY" PARAMETERNAME="罚息日利率" PRIGHTTYPE="Required"/>

11
src_cmb/com/tenwa/sdk/controller/CmbToCallbackController.java
View File

@ -147,11 +147,18 @@ public class CmbToCallbackController extends BaseFlowStartAction {
callback_detail_bo.setAttributeValue("RTNNAR",callback_detail.getRTNNAR());
this.initTabeUserInfo(callback_detail_bo);
callback_detail_bom.saveObject(callback_detail_bo);
String RTNFLG = callback_detail.getRTNFLG();
String sql1="";
if("S".equals(RTNFLG)){
sql1 = "update O set O.EBANK_STATUS='05' where O.FLOWUNID='"+FLOWUNID+"'";
}else{
sql1 = "update O set O.EBANK_STATUS='04' where O.FLOWUNID='"+FLOWUNID+"'";
}
JBOFactory.createBizObjectQuery(LC_FUND_INCOME_TEMP.CLASS_NAME,sql1).executeUpdate();
}
map.put("code", "0") ;
map.put("msg", "²éѯ½á¹ûˢгɹ¦") ;
JSONObject jsonObj = JSONObject.fromObject(map);
sql();
return jsonObj.toString();
}else {
sql();
@ -179,7 +186,7 @@ public class CmbToCallbackController extends BaseFlowStartAction {
public void sql() throws JBOException{
String sql2 = "update O left join jbo.com.tenwa.lease.comm.LB_CONTRACT_INFO lci on lci.id=O.contract_id"
+" left join jbo.com.tenwa.lease.comm.LC_FUND_INCOME_CALLBACK_DETAIL_TEMP tt on tt.DISTRIBUTOR_ID=lci.distributor_id"
+" and O.FLOWUNID=tt.FLOWUNID set O.EBANK_STATUS=case when tt.RTNFLG='S' then '05' else '04' end where O.FLOWUNID="+"'"+FLOWUNID+"'" ;
+" and O.FLOWUNID=tt.FLOWUNID set O.EBANK_STATUS=case when tt.RTNFLG='S' then '05' else '04' end where O.FLOWUNID='"+FLOWUNID+"'" ;
JBOFactory.createBizObjectQuery(LC_FUND_INCOME_TEMP.CLASS_NAME,sql2).executeUpdate();
}
}

21
src_tenwa/com/tenwa/customer/handler/group/DistributorGroupRelationHandler.java
View File

@ -34,16 +34,21 @@ import com.amarsoft.awe.dw.handler.impl.CommonHandler;
this.errors="该集团已存在此客户！";
return false;
}
List<BizObject> cgrList = bom.createQuery("distributor_id=:distributor_id ").setParameter("distributor_id",distributor_id).getResultList(false);
if(cgrList!=null){
for(BizObject cgrs:cgrList){
BizObject dgc = dgcManage.createQuery("id=:groupId and tyle='01'").setParameter("groupId", cgrs.getAttribute("group_id").getString()).getSingleResult(false);
if(dgc!=null){
this.errors="该经销商已存在"+dgc.getAttribute("group_name").getString()+"集团中！";
return false;
BizObject dgcs = dgcManage.createQuery("id=:id").setParameter("id", groupId).getSingleResult(false);
if(dgcs!=null){
if("01".equals(dgcs.getAttribute("tyle").getValue())){
List<BizObject> cgrList = bom.createQuery("distributor_id=:distributor_id ").setParameter("distributor_id",distributor_id).getResultList(false);
if(cgrList!=null){
for(BizObject cgrs:cgrList){
BizObject dgc = dgcManage.createQuery("id=:groupId and tyle='01'").setParameter("groupId", cgrs.getAttribute("group_id").getString()).getSingleResult(false);
if(dgc!=null){
this.errors="该经销商已存在"+dgc.getAttribute("group_name").getString()+"集团中！";
return false;
}
}
}
}
}
}else{
BizObject b=bom.createQuery("id=:id").setParameter("id", Id).getSingleResult(false);