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

1.去掉租赁物类型，安鹏设置成默认一般。

Browse Source 
2.租金测算页面根据产品变动。
3.修复传统业务项目立项报错以及页签显示不全。
This commit is contained in:
zhangbb 2018-09-04 09:32:10 +08:00
parent ab56b7dfb3
commit d834acb449
7 changed files with 62 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -115,9 +115,9 @@
//非车辆产品，融资额可编辑
String productType = Sqlca.getString(new SqlObject("select attribute2 from business_type where typeno='"+productId+"'"));
if("2".equals(productType)){
if("car_product".equals(productType)){
doTemp.setReadOnly("CLEAN_LEASE_MONEY", true);
}else{
}else if("business_product".equals(productType)){
doTemp.setVisible("CORPUS_RATIO", true);
doTemp.setVisible("CORPUS", true);
doTemp.setRequired("CORPUS_RATIO", true);

10
WebContent/Tenwa/Lease/Flow/Comm/LBEquipment/LBEquipmentList.jsp
View File

@ -101,12 +101,12 @@ if((null!=RightType&&RightType.equals("ReadOnly"))||(null!=ishistory&&ishistory.
}else{
sButtons=new String[][]{
//0、是否展示 1、 权限控制 2、 展示类型 3、按钮显示名称 4、按钮解释文字 5、按钮触发事件代码 6、 7、 8、 9、图标，CSS层叠样式 10、风格
//{"true","","Button","新增","新增租赁物信息","newRecord()","","","","btn_icon_add",""},
{"true","","Button","新增","新增租赁物信息","newRecord()","","","","btn_icon_add",""},
{"true","","Button","修改","修改租赁物信息","viewAndEdit()","","","","btn_icon_edit"},
//{"true","","Button","删除","删除租赁物信息","deleteRecord()","","","","btn_icon_delete",""},
//{"true","","Button","导入Excel","导入租赁物信息Excel","inExcel()","","","","btn_icon_import",""},
//{"true","","Button","导出Excel","导出租赁物信息Excel","exportPage('"+sWebRootPath+"',0,'excel','"+dwTemp.getArgsValue()+"')","","","","btn_icon_export",""},
//{"true","","Button","下载模板","下载租赁物信息模板","downLoad()","","","","btn_icon_down",""}
{"true","","Button","删除","删除租赁物信息","deleteRecord()","","","","btn_icon_delete",""},
// {"true","","Button","导入Excel","导入租赁物信息Excel","inExcel()","","","","btn_icon_import",""},
// {"true","","Button","导出Excel","导出租赁物信息Excel","exportPage('"+sWebRootPath+"',0,'excel','"+dwTemp.getArgsValue()+"')","","","","btn_icon_export",""},
// {"true","","Button","下载模板","下载租赁物信息模板","downLoad()","","","","btn_icon_down",""}
};
}
%>

6
WebContent/Tenwa/Lease/Flow/Comm/LBGuaranty/LBGuarantyList.jsp
View File

@ -79,9 +79,9 @@
{"true","All","Button","新增","新增","newRecord()","","","","btn_icon_add",""},
{"true","","Button","修改","修改","viewAndEdit()","","","","btn_icon_edit",""},
{"true","","Button","删除","删除","deleteRecord()","","","","btn_icon_delete",""},
{"true","","Button","导入Excel","导入Excel","inExcel()","","","","btn_icon_import",""},
{"true","","Button","导出Excel","导出Excel","exportPage('"+sWebRootPath+"',0,'excel','"+dwTemp.getArgsValue()+"')","","","","btn_icon_export",""},
{"true","","Button","下载模板","下载模板","downLoad()","","","","btn_icon_down",""}
// {"true","","Button","导入Excel","导入Excel","inExcel()","","","","btn_icon_import",""},
// {"true","","Button","导出Excel","导出Excel","exportPage('"+sWebRootPath+"',0,'excel','"+dwTemp.getArgsValue()+"')","","","","btn_icon_export",""},
// {"true","","Button","下载模板","下载模板","downLoad()","","","","btn_icon_down",""}
};
}
%>

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

File diff suppressed because one or more lines are too long

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

@ -3,8 +3,8 @@
<ComponentType ID="PRD0315" NAME="费用设定" STATUS="1"/>
<ComponentType ID="PRD01" NAME="准入要求" STATUS="2"/>
<ComponentType ID="PRD0350" NAME="产品设定" STATUS="1"/>
<ComponentType ID="PRD0314" NAME="方案信息" STATUS="2"/>
<ComponentType ID="PRD0313" NAME="多次起租" STATUS="2"/>
<ComponentType ID="PRD0314" NAME="方案信息" STATUS="1"/>
<ComponentType ID="PRD0313" NAME="多次起租" STATUS="1"/>
<ComponentType ID="PRD0312" NAME="租赁物类型" STATUS="2"/>
<ComponentType ID="PRD0401" NAME="受理调查" STATUS="2"/>
<ComponentType ID="PRD0402" NAME="审查审批" STATUS="2"/>
@ -18,7 +18,7 @@
<ComponentType ID="PRD0310" NAME="租金推算方法" STATUS="1"/>
<ComponentType ID="PRD0323" NAME="租金圆整" STATUS="1"/>
<ComponentType ID="PRD0320" NAME="利率类型" STATUS="1"/>
<ComponentType ID="PRD0321" NAME="分段" STATUS="2"/>
<ComponentType ID="PRD0321" NAME="分段" STATUS="1"/>
<ComponentType ID="PRD0307" NAME="还款次序" STATUS="1"/>
<ComponentType ID="PRD0302" NAME="利率方案" RELATIVETEMPLETCOLNAME="RAT" STATUS="2"/>
<ComponentType ID="PRD0322" NAME="利息处理" STATUS="2"/>

24
src/com/amarsoft/app/util/ProductParamUtil.java
View File

@ -48,6 +48,9 @@ public class ProductParamUtil {
//List<BusinessObject> componentList = XMLHelper.getBusinessObjectList(realXmlPath,"Component||Status='1'","ID");
//List<BusinessObject> exists = BusinessObjectHelper.getBusinessObjectsBySql(componentList, "Type like :Type", "Type",componentType);
List<BusinessObject> exists = getBusinessObject(realXmlPath, componentType);
if(exists.size()==0){
return parameterValue;
}
List<BusinessObject> parameters = exists.get(0).getBusinessObjects("Parameter");
for(BusinessObject boP:parameters){
if(parameterId.equals(boP.getString("PARAMETERID"))){
@ -78,6 +81,9 @@ public class ProductParamUtil {
//List<BusinessObject> componentList = XMLHelper.getBusinessObjectList(realXmlPath,"Component||Status='1'","ID");
//List<BusinessObject> exists = BusinessObjectHelper.getBusinessObjectsBySql(componentList, "Type like :Type", "Type",componentType);
List<BusinessObject> exists = getBusinessObject(realXmlPath, componentType);
if(exists.size()==0){
return parameterValue;
}
List<BusinessObject> parameters = exists.get(0).getBusinessObjects("Parameter");
for(BusinessObject boP:parameters){
if(parameterId.equals(boP.getString("PARAMETERID"))){
@ -104,6 +110,9 @@ public class ProductParamUtil {
//List<BusinessObject> componentList = XMLHelper.getBusinessObjectList(realXmlPath,"Component||Status='1'","ID");
//List<BusinessObject> exists = BusinessObjectHelper.getBusinessObjectsBySql(componentList, "Type like :Type", "Type",componentType);
List<BusinessObject> exists = getBusinessObject(realXmlPath, componentType);
if(exists.size()==0){
return parameterValue;
}
List<BusinessObject> parameters = exists.get(0).getBusinessObjects("Parameter");
for(BusinessObject boP:parameters){
if(parameterId.equals(boP.getString("PARAMETERID"))){
@ -156,6 +165,9 @@ public class ProductParamUtil {
}*/
//List<BusinessObject> exists = BusinessObjectHelper.getBusinessObjectsBySql(componentList, "Type like :Type", "Type",componentType);
List<BusinessObject> exists = getBusinessObject(realXmlPath, componentType);
if(exists.size()==0){
return productComponent;
}
for(BusinessObject bo:exists){
List<BusinessObject> parameters = bo.getBusinessObjects("Parameter");
if("ExpenseType".equals(bo.getString("ID"))){
@ -206,6 +218,9 @@ public class ProductParamUtil {
//List<BusinessObject> componentList = XMLHelper.getBusinessObjectList(realXmlPath,"Component||Status='1'","ID");
//List<BusinessObject> exists = BusinessObjectHelper.getBusinessObjectsBySql(componentList, "Type like :Type", "Type",componentType);
List<BusinessObject> exists = getBusinessObject(realXmlPath, componentType);
if(exists.size()==0){
return productComponent;
}
for(BusinessObject bo:exists){
List<BusinessObject> parameters = bo.getBusinessObjects("Parameter");
if("ExpenseType".equals(bo.getString("ID"))){
@ -399,6 +414,9 @@ public class ProductParamUtil {
//List<BusinessObject> componentList = XMLHelper.getBusinessObjectList(realXmlPath,"Component||Status='1'","ID");
//List<BusinessObject> exists = BusinessObjectHelper.getBusinessObjectsBySql(componentList, "Type like :Type", "Type",componentType);
List<BusinessObject> exists = getBusinessObjectWithDecisionTable(realXmlPath,componentType);
if(exists.size()==0){
return productComponent;
}
for(BusinessObject bo:exists){
List<BusinessObject> parameters = bo.getBusinessObjects("DecisionTable");
if("ExpenseType".equals(bo.getString("ID"))){
@ -532,6 +550,9 @@ public class ProductParamUtil {
}*/
//List<BusinessObject> exists = BusinessObjectHelper.getBusinessObjectsBySql(componentList, "Type like :Type", "Type",componentType);
List<BusinessObject> exists = getBusinessObject(realXmlPath, componentType);
if(exists.size()==0){
return parameValue;
}
for(BusinessObject bo:exists){
List<BusinessObject> parameters = bo.getBusinessObjects("Parameter");
if(!id.equals(bo.getString("ID"))){
@ -584,6 +605,9 @@ public class ProductParamUtil {
//List<BusinessObject> exists = BusinessObjectHelper.getBusinessObjectsBySql(componentList, "Type like :Type", "Type","PRD0201");
List<BusinessObject> exists = getBusinessObject(realXmlPath, "PRD0201");
String result="";
if(exists.size()==0){
return result;
}
for(BusinessObject bo:exists){
List<BusinessObject> parameters = bo.getBusinessObjects("DecisionTable");
if("ExpenseType".equals(bo.getString("ID"))){

9
src_tenwa/com/tenwa/lease/util/FlowViewUtil.java
View File

@ -134,8 +134,10 @@ public class FlowViewUtil {
BizObject flow=JBOFactory.createBizObjectQuery(FLOW_BUSSINESS_OBJECT.CLASS_NAME, "flow_unid=:flowunid").setParameter("flowunid", flowunid).getSingleResult(false);
productId=flow.getAttribute("productId").getString();
}
String value=ProductParamUtil.getProductParameterValue(productId, "PRD0312", "equip_type");
// 安鹏要求 ：去掉租赁物类型，默认一般
// String value=ProductParamUtil.getProductParameterValue(productId, "PRD0312", "equip_type");
String value="normal";
List<BizObject> list=JBOFactory.createBizObjectQuery(CODE_LIBRARY.CLASS_NAME,"codeno=:codeno").setParameter("codeno","equip_type").getResultList(false);
String[] values=value.split(",");
Boolean flag=false;
@ -163,8 +165,9 @@ public class FlowViewUtil {
BizObject flow=JBOFactory.createBizObjectQuery(FLOW_BUSSINESS_OBJECT.CLASS_NAME, "flow_unid=:flowunid").setParameter("flowunid", flowunid).getSingleResult(false);
String productId=flow.getAttribute("productId").getString();
String value=ProductParamUtil.getProductParameterValue(productId, "PRD0312", "equip_type");
// 安鹏要求 ：去掉租赁物类型，默认一般
// String value=ProductParamUtil.getProductParameterValue(productId, "PRD0312", "equip_type");
String value="normal";
String[] equipTypes=value.split(",");
List<BizObject> list=JBOFactory.createBizObjectQuery(CODE_LIBRARY.CLASS_NAME,"codeno=:codeno").setParameter("codeno","equip_type").getResultList(false);
int flag=0;