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 zhuhuichen

Browse Source
This commit is contained in:
user 2018-06-16 18:28:45 +08:00
commit e9b97e2b96
9 changed files with 38 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
WebContent/AppMain/MyCalendar.jsp
View File

@ -260,7 +260,7 @@ function fDrawCal(iYear, iMonth, iCellWidth, iCellHeight, sDateTextSize, sDateTe
for (var w = 1; w < 7; w++) {
sReturn += ("<tr>");
for (var d = 0; d < 7; d++) {
tdClickEvent = " onClick=newTask("+myMonth[w][d][0]+","+myMonth[w][d][1]+","+myMonth[w][d][2]+") ";
// tdClickEvent = " onClick=newTask("+myMonth[w][d][0]+","+myMonth[w][d][1]+","+myMonth[w][d][2]+") ";
if(myMonth[w][d][0] == iYear&&myMonth[w][d][1] == iMonth){
gstype = 'CURSOR:Hand;FONT-FAMILY:Arial;COLOR:#000000;FONT-SIZE:" + sDateTextSize + ";FONT-WEIGHT:" + sDateTextWeight + "';
}else{

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

File diff suppressed because one or more lines are too long

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

@ -178,7 +178,7 @@
<Parameter CODESCRIPT="AssureRelation" CODESOURCE="Code" COMPONENTTYPE="PRD0386" DATATYPE="4" METHODTYPE="Nothing" OPERATOR="VALUE" PARAMETERID="Relationship" PARAMETERNAME="关系" SELECTTYPE="04" STATUS="1"/>
<Parameter COMPONENTTYPE="PRD0386" DATATYPE="1" METHODTYPE="Nothing" OPERATOR="VALUE" PARAMETERID="SigningAddress" PARAMETERNAME="签约地点" STATUS="1"/>
<Parameter CODESCRIPT="InputType" CODESOURCE="Code" COMPONENTTYPE="PRD0315,PRD0380" DATATYPE="4" METHODTYPE="Nothing" OPERATOR="VALUE" PARAMETERID="InputType" PARAMETERNAME="残值输入方式" SELECTTYPE="04" STATUS="1"/>
<Parameter COMPONENTTYPE="PRD0350" DATATYPE="6" METHODTYPE="Nothing" OPERATOR="MINIMUMVALUE" PARAMETERID="IRR" PARAMETERNAME="IRR" STATUS="1"/>
<Parameter COMPONENTTYPE="PRD0350" DATATYPE="6" METHODTYPE="Nothing" OPERATOR="MINIMUMVALUE,VALUE" PARAMETERID="IRR" PARAMETERNAME="IRR" STATUS="1"/>
<Parameter COMPONENTTYPE="PRD0350" DATATYPE="2" METHODTYPE="Nothing" OPERATOR="VALUE" PARAMETERID="MoneyUpLimits" PARAMETERNAME="贷款比例上限" STATUS="1"/>
<Parameter COMPONENTTYPE="PRD0350" DATATYPE="2" METHODTYPE="Nothing" OPERATOR="VALUE" PARAMETERID="MoneyLowLimits" PARAMETERNAME="融资额下限" STATUS="1"/>
<Parameter COMPONENTTYPE="PRD0350" DATATYPE="2" METHODTYPE="Nothing" OPERATOR="VALUE" PARAMETERID="EquipUplimpits" PARAMETERNAME="融资额上限" STATUS="1"/>

2
WebContent/WEB-INF/etc/jbo/jbo_calc.xml
View File

@ -437,6 +437,8 @@
<attribute name="FACTORY_ACCESSORIES_FINA" label="原厂配件费是否参与融资" type="STRING" length="32"/>
<attribute name="CORPUS" label="期限内本金" type="DOUBLE" length="22" scale="2"/>
<attribute name="CORPUS_RATIO" label="期限内本金比例" type="DOUBLE" length="22" scale="6"/>
<attribute name="DISCOUNT" label="贴息" type="DOUBLE" length="22" scale="6"/>
<attribute name="deposit" label="承租人风险抵押金" type="DOUBLE" length="22" scale="6"/>
</attributes>
<manager>
<managerProperties>

4
WebContent/WEB-INF/etc/jbo/jbo_customer.xml
View File

@ -1287,6 +1287,8 @@
<attribute name="DISTRIBUTOR_ACCOUNT_TEMP" label="经销商名称" type="STRING" length="32"/>
<attribute name="OPEN_BANK" label="开户银行" type="STRING" length="32"/>
<attribute name="ORGID" label="部门编号" type="STRING" length="32"/>
<attribute name="district" label="地区" type="STRING" length="64"/>
<attribute name="provinceInfo" label="省份" type="STRING" length="64"/>
</attributes>
<manager>
<managerProperties>
@ -1416,6 +1418,8 @@
<attribute name="UNIONNUMBER" label="联行号" type="STRING" length="32"/>
<attribute name="DISTRIBUTOR_ACCOUNT_TEMP" label="经销商名称" type="STRING" length="32"/>
<attribute name="OPEN_BANK" label="开户银行" type="STRING" length="32"/>
<attribute name="district" label="地区" type="STRING" length="64"/>
<attribute name="provinceInfo" label="省份" type="STRING" length="64"/>
</attributes>
<manager>
<managerProperties>

5
WebContent/WEB-INF/etc/jbo/jbo_lease.xml
View File

@ -98,6 +98,7 @@
<attribute name="AREA_CODE" label="车牌号对应所在区号" type="STRING" length="32"/>
<attribute name="CAR_TYPE" label="车辆类型" type="STRING" length="32"/>
<attribute name="AREA" label="区域" type="STRING" length="32"/>
<attribute name="VERSIONID" label="版本号" type="STRING" length="64"/>
</attributes>
<manager>
<managerProperties>
@ -214,6 +215,7 @@
<attribute name="AREA_CODE" label="车牌号对应所在区号" type="STRING" length="32"/>
<attribute name="CAR_TYPE" label="车辆类型" type="STRING" length="32"/>
<attribute name="AREA" label="区域" type="STRING" length="32"/>
<attribute name="VERSIONID" label="版本号" type="STRING" length="64"/>
</attributes>
<manager>
<managerProperties>
@ -727,6 +729,7 @@
<attribute name="CONTRACT_INVOICE_STATUS" label="合同开票状态" type="STRING" length="32"/>
<attribute name="SEAL_TYPE" label="印章类型" type="STRING" length="32"/>
<attribute name="MORTGAGE_AGENT" label="抵押代理人" type="STRING" length="32"/>
<attribute name="VERSIONID" label="版本号" type="STRING" length="64"/>
</attributes>
<manager>
<managerProperties>
@ -994,6 +997,7 @@
<attribute name="CONTRACT_INVOICE_STATUS" label="合同开票状态" type="STRING" length="32"/>
<attribute name="SEAL_TYPE" label="印章类型" type="STRING" length="32"/>
<attribute name="MORTGAGE_AGENT" label="抵押代理人" type="STRING" length="32"/>
<attribute name="VERSIONID" label="版本号" type="STRING" length="64"/>
</attributes>
<manager>
<managerProperties>
@ -2680,6 +2684,7 @@
<attribute name="RENT_INVOICE_TYPE" label="租金开票类型" type="STRING" length="32"/>
<attribute name="INVOICE_MEMO" label="开票说明" type="STRING" length="2000"/>
<attribute name="CONTRACT_INVOICE_STATUS" label="合同开票状态" type="STRING" length="32"/>
<attribute name="VERSIONID" label="版本号" type="STRING" length="64"/>
</attributes>
<manager>
<managerProperties>

2
src_app_fresh/apx/com/amarsoft/als/apzl/apply/business/start/bo/BusinessBO.java
View File

@ -58,7 +58,7 @@ public class BusinessBO {
this.certtype = fieldMap.get("certtype".toLowerCase()) == null ? null
: fieldMap.get("certtype".toLowerCase()).toString();
this.certid = fieldMap.get("certid".toLowerCase()) == null ? null
: fieldMap.get("carAttributes".toLowerCase()).toString();
: fieldMap.get("certid".toLowerCase()).toString();
}
public String getCarAttributes() {

25
src_app_fresh/apx/com/amarsoft/als/apzl/apply/business/start/service/impl/BusinessApplyStartServiceImpl.java
View File

@ -1,5 +1,6 @@
package apx.com.amarsoft.als.apzl.apply.business.start.service.impl;
import java.util.HashMap;
import java.util.Map;
import javax.servlet.http.HttpServletRequest;
@ -10,6 +11,7 @@ import com.amarsoft.awe.util.Transaction;
import com.base.constant.RestfullConstant;
import com.base.util.MultipartDataUtil;
import com.base.util.ReturnMapUtil;
import com.tenwa.flow.action.comm.CommonAction;
import com.tenwa.lease.flow.project.projectapproval.BusinessApprovalStartAction;
import apx.com.amarsoft.als.apzl.apply.business.start.bo.BusinessBO;
@ -44,21 +46,32 @@ public class BusinessApplyStartServiceImpl implements BusinessApplyStartService
+ "@'leasehold':'" + bo.getLeasehold() + "'@'carSystem':'"
+ bo.getCarSystem() + "'}";
BusinessApprovalStartAction.setProductID(bo.getProductId());
BusinessApprovalStartAction.setCustomerType(bo.getCustomerType());
BusinessApprovalStartAction.setCarAttributes(bo.getCarAttributes());
BusinessApprovalStartAction.setLeasehold(bo.getLeasehold());
BusinessApprovalStartAction.setCarSystem(bo.getCarSystem());
BusinessApprovalStartAction.setCarSeries(bo.getCarSeries());
BusinessApprovalStartAction.setFixedFlowParam(param);
BusinessApprovalStartAction.setProductId(bo.getProductId());
//用户信息
BusinessApprovalStartAction.setCertid(bo.getCertid());
BusinessApprovalStartAction.setCustname(bo.getCUSTOMERNAME());
BusinessApprovalStartAction.setCustomerType(bo.getCustomerType());
String sReturnInfo = BusinessApprovalStartAction.initFLow(tx);
if (sReturnInfo.startsWith("success"))
ReturnMapUtil.setReturnMap(null,
if (sReturnInfo.startsWith("success")){
//获取当前申请的相关参数，包含FlowUnid
Map<String,String> params = BusinessApprovalStartAction.getFlowParam();
//返回前台的数据
Map<String,Object> body = new HashMap<String,Object>();
body.put("flowUnid",params.get("FlowUnid"));
body.put("objectNo",params.get("FlowUnid"));
ReturnMapUtil.setReturnMap(body,
RestfullConstant.baseProperty.get("success").toString(),
"发起成功");
"发起成功");
}
else
ReturnMapUtil.setReturnMap(null,
RestfullConstant.baseProperty.get("fail").toString(),
RestfullConstant.baseProperty.get("FAIL").toString(),
"·¢Æðʧ°Ü");
return ReturnMapUtil.getReturnMap();

2
src_app_fresh/apx/com/amarsoft/als/base/awe/select/SelectCatalogWin.java
View File

@ -258,7 +258,7 @@ public class SelectCatalogWin {
Map<String, Object> row = new HashMap<String, Object>();
int count = rsmd.getColumnCount();
List<Map<String, Object>> colList = new ArrayList<Map<String, Object>>();
for (int i = 1; i <= count; i++) {
for (int i = 1; i <= aSelFieldName.length; i++) {
Map<String, Object> col = new HashMap<String, Object>();
String key = rsmd.getColumnLabel(i);
String value = rs.getString(i);