diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LBEquipment_Car/LBEquipmentInfo.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBEquipment_Car/LBEquipmentInfo.jsp index 5fe09b482..c117dfe68 100644 --- a/WebContent/Tenwa/Lease/Flow/Comm/LBEquipment_Car/LBEquipmentInfo.jsp +++ b/WebContent/Tenwa/Lease/Flow/Comm/LBEquipment_Car/LBEquipmentInfo.jsp @@ -235,9 +235,9 @@ if(checkCarNumber()){ return; } - //if(!checkFrameNumber2()){ - // return; - //} + if(!checkFrameNumber2()){ + return; + } //if(!checkFrameNumber3()){ // return; //} diff --git a/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/BusinessCancelApplyList.jsp b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/BusinessCancelApplyList.jsp index a4ac6fd7b..d9370933b 100644 --- a/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/BusinessCancelApplyList.jsp +++ b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/BusinessCancelApplyList.jsp @@ -33,7 +33,7 @@ } else { - var mes=sReturnInfos[1]; + var mes=sReturnInfos[0]; alert(mes); } reloadSelf(); diff --git a/src_app_fresh/apx/com/amarsoft/als/apzl/apply/business/doc/detail/service/impl/BusinessDocDetailServiceImpl.java b/src_app_fresh/apx/com/amarsoft/als/apzl/apply/business/doc/detail/service/impl/BusinessDocDetailServiceImpl.java index 43c37fa11..8f120defb 100644 --- a/src_app_fresh/apx/com/amarsoft/als/apzl/apply/business/doc/detail/service/impl/BusinessDocDetailServiceImpl.java +++ b/src_app_fresh/apx/com/amarsoft/als/apzl/apply/business/doc/detail/service/impl/BusinessDocDetailServiceImpl.java @@ -355,7 +355,10 @@ public class BusinessDocDetailServiceImpl implements BusinessDocDetailService { : library.getAttribute("ONE_CLASSIFY").toString(); String tweClassly = library.getAttribute("TWO_CLASSIFY") == null ? "" : library.getAttribute("TWO_CLASSIFY").toString(); - + //校验是否必填或其他 + if(!(docNature.equals("01")||docName1.equals("其他"))){ + continue; + } libraryMap.put("libraryId", libraryId); libraryMap.put("remark", remark); libraryMap.put("docType", docType); diff --git a/src_app_fresh/apx/com/amarsoft/als/apzl/apply/business/start/bo/BusinessBO.java b/src_app_fresh/apx/com/amarsoft/als/apzl/apply/business/start/bo/BusinessBO.java index a8ec1c613..b3c0aa43c 100644 --- a/src_app_fresh/apx/com/amarsoft/als/apzl/apply/business/start/bo/BusinessBO.java +++ b/src_app_fresh/apx/com/amarsoft/als/apzl/apply/business/start/bo/BusinessBO.java @@ -24,8 +24,10 @@ import com.amarsoft.are.lang.StringX; import com.base.constant.RestfullConstant; import com.base.util.JsonUtil; import com.base.util.StringUtil; +import com.tenwa.comm.util.jboutil.DataOperatorUtil; import com.tenwa.lease.flow.project.businessapply.CustomerInfoCheck; import com.tenwa.lease.flow.project.projectapproval.BusinessApprovalStartAction; +import com.tenwa.util.MultiSubjectUtil; public class BusinessBO implements Serializable { @@ -44,6 +46,8 @@ public class BusinessBO implements Serializable { private String certtype; // 证件类型 private String certid; // 证件号码 private String haveCommission;//是否有佣金 + private String SubjectId; + private String SubjectName; private String businessType; // 业务类型,1是汽车业务,2是传统业务,3是汽车传统业务 private String versionId; // 版本ID @@ -170,6 +174,17 @@ public class BusinessBO implements Serializable { : fieldMap.get("liter".toLowerCase()).toString(); // 排量 this.geartype = fieldMap.get("geartype".toLowerCase()) == null ? "" : fieldMap.get("geartype".toLowerCase()).toString(); // 档位 + //更具产品id获取对应的主体信息 + List> sujectIdList = DataOperatorUtil.getDataBySql("SELECT manysubject FROM PRD_SPECIFIC_LIBRARY WHERE productid='"+this.productId+"'"); + if(sujectIdList.size()>0){ + this.SubjectId = sujectIdList.get(0).get("manysubject"); + if(MultiSubjectUtil.SZSUBJECTID.equals(this.SubjectId)){//深圳主体 + this.SubjectName = MultiSubjectUtil.SZSUBJECTNAME; + }else if (MultiSubjectUtil.TJSUBJECTID.equals(this.SubjectId)){//天津主体 + this.SubjectName = MultiSubjectUtil.TJSUBJECTNAME; + } + } + CustomerInfoCheck CustomerInfoCheck = new CustomerInfoCheck(); CustomerInfoCheck.setCertid(certid); @@ -232,6 +247,8 @@ public class BusinessBO implements Serializable { map.put("CustomerId", CUSTOMERID); map.put("sourcetype", "app"); + map.put("SubjectId", SubjectId); + map.put("SubjectName", SubjectName); JSONObject jsonObject = JSONObject.fromObject(map); this.fixedFlowParam = jsonObject.toString(); @@ -531,6 +548,22 @@ public class BusinessBO implements Serializable { return haveCommission; } + public String getSubjectId() { + return SubjectId; + } + + public void setSubjectId(String subjectId) { + SubjectId = subjectId; + } + + public String getSubjectName() { + return SubjectName; + } + + public void setSubjectName(String subjectName) { + SubjectName = subjectName; + } + public void sethaveCommission(String haveCommission) { haveCommission = haveCommission; } diff --git a/src_tenwa/com/tenwa/util/MultiSubjectUtil.java b/src_tenwa/com/tenwa/util/MultiSubjectUtil.java index 905e1c4dc..a7d005a49 100644 --- a/src_tenwa/com/tenwa/util/MultiSubjectUtil.java +++ b/src_tenwa/com/tenwa/util/MultiSubjectUtil.java @@ -3,5 +3,7 @@ package com.tenwa.util; public class MultiSubjectUtil { public static final String SZSUBJECTID="aa740e4111c111eaaa0000163e0e11e6";//深圳主体标识 + public static final String SZSUBJECTNAME="安鹏国际融资租赁(深圳)有限公司";//深圳主体名称 public static final String TJSUBJECTID="d989246c11c111eaaa0000163e0e11e6";//天津主体标识 + public static final String TJSUBJECTNAME="安鹏融资租赁(天津)有限公司";//天津主体名称 }