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

修改主体添加bug

Browse Source
This commit is contained in:
tangfutang 2019-12-06 16:58:44 +08:00
parent 100d590058
commit dfe51f8265
6 changed files with 26 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
WebContent/Tenwa/Lease/Flow/Contract/ContractApproval/ContractApprovalApplyList.jsp
View File

@ -78,7 +78,7 @@
sParams =sParams+",signType="+signType+",sealType="+sealType+",isNetCar="+isNetCar+",carAttributes="+carAttributes+",leasform="+leasform+",ProductId="+product_id+",ProjectId="+id+",ProjectNo="+project_id+",customertype="+customertype+",ProjectName="+project_name+",ApplyType=<%=sApplyType%>";
if(flowno=="BContractApproveApply"){
sParams =sParams+",operationType="+sReturn[8];
sParams =sParams+",operationType="+sReturn[8]+",SubjectId="+sReturn[11]+",SubjectName="+sReturn[12];
}else{
var SubjectName = "";
var messages = RunJavaMethodTrans("com.tenwa.lease.flow.project.businessapply.CustomerInfoCheck","selectTitleName","SubjectId="+sReturn[5]);

10
WebContent/Tenwa/Lease/Flow/Contract/ContractChange/ContractChangeApplyList_Car.jsp
View File

@ -34,6 +34,9 @@
var signType = sReturn[12];
var sealType = sReturn[11];
var SubjectId = sReturn[13];
var SubjectName = sReturn[14];
if("03" == customertype){
if(""== signType||null == signType||"undefined" == signType){
alert("请在产品中配置签约方式！！！");
@ -44,10 +47,13 @@
return ;
}
}
if(""== SubjectId||null == SubjectId||"undefined" == SubjectId){
alert("该数据没有对应的主体，请联系管理员！");
return ;
}
var gpsVendor = RunJavaMethodTrans("com.tenwa.lease.flow.project.businessapply.GpsVendorCheck","getGpsVendor","productId="+product_id);
var sParams = "ApplyType=<%=sApplyType%>,CurUserID=<%=CurUser.getUserID()%>,gpsVendor="+gpsVendor;
sParams =sParams+",signType="+signType+",sealType="+sealType+",operationType="+operationType+",isNetCar="+isNetCar+",carAttributes="+carAttributes+",leasform="+leasform+",customertype="+customertype+",ProjectId="+project_id+",FlowKey="+contract_number+",ProductId="+product_id+",ProjectNo="+project_no+",ContractId="+contract_id+",ProjectName="+project_name+",ApplyType=<%=sApplyType%>";
sParams =sParams+",SubjectId="+SubjectId+",SubjectName="+SubjectName+",signType="+signType+",sealType="+sealType+",operationType="+operationType+",isNetCar="+isNetCar+",carAttributes="+carAttributes+",leasform="+leasform+",customertype="+customertype+",ProjectId="+project_id+",FlowKey="+contract_number+",ProductId="+product_id+",ProjectNo="+project_no+",ContractId="+contract_id+",ProjectName="+project_name+",ApplyType=<%=sApplyType%>";
var sReturnInfo = RunJavaMethodTrans("com.tenwa.flow.action.comm.BaseFlowStartAction","initFLow",sParams);
if(typeof(sReturnInfo)=="undefined" || sReturnInfo=="" || sReturnInfo=="_CANCEL_") return;
var sReturnInfos=sReturnInfo.split("@");

6
WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/ApprovalForm.jsp
View File

@ -46,6 +46,12 @@
}else{
isShowButton=true;
}
if("业务申请流程".equals(flowName)&&("0030".equals(phaseNo)||"0040".equals(phaseNo)||"0050".equals(phaseNo)||"0060".equals(phaseNo)||"0070".equals(phaseNo))){
dwTemp.getDataObject().setVisible("subjectname", true);
}else {
dwTemp.getDataObject().setVisible("subjectname", false);
}
if("0010".equals(phaseNo)){//¾­ÏúÉÌ
dwTemp.setGroupHidden("0020,0030,0040,0050");
}else if("0030".equals(phaseNo)){//³õÉó

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

@ -22,8 +22,14 @@
var leasehold = sReturn[6];
var operationType = sReturn[7];
var certtype = sReturn[8];
var SubjectId = sReturn[9];
var SubjectName = sReturn[10];
if(""== SubjectId||null == SubjectId||"undefined" == SubjectId){
alert("该数据没有对应的主体，请联系管理员！");
return ;
}
var sParams = "ApplyType=<%=sApplyType%>,CurUserID=<%=CurUser.getUserID()%>";
sParams =sParams+",certtype="+certtype+",customertype="+CustomerType+",carAttributes="+carAttributes+",leasform="+leasehold+",operationType="+operationType+",ProjectId="+id+",ProductId="+product_id+",FlowKey="+project_id+",ProjectName="+project_name+",ApplyType=<%=sApplyType%>";
sParams =sParams+",SubjectId="+SubjectId+",SubjectName="+SubjectName+",certtype="+certtype+",customertype="+CustomerType+",carAttributes="+carAttributes+",leasform="+leasehold+",operationType="+operationType+",ProjectId="+id+",ProductId="+product_id+",FlowKey="+project_id+",ProjectName="+project_name+",ApplyType=<%=sApplyType%>";
var sReturnInfo = RunJavaMethodTrans("com.tenwa.flow.action.comm.BaseFlowStartAction","initFLow",sParams);
if(typeof(sReturnInfo)=="undefined" || sReturnInfo=="" || sReturnInfo=="_CANCEL_") return;
var sReturnInfos=sReturnInfo.split("@");

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

@ -4696,6 +4696,9 @@
<attribute name="DistriOpinion3" label="经销商意见3" type="STRING"/>
<attribute name="InterOpinion4" label="内部意见4" type="STRING"/>
<attribute name="DistriOpinion4" label="经销商意见4" type="STRING"/>
<attribute name="subjectId" label="主体id" type="STRING"/>
<attribute name="subjectname" label="主体名称" type="STRING"/>
</attributes>
<manager>
<managerProperties>

2
src_tenwa/com/tenwa/customer/controller/group/CustomerGroupCompanyController.java
View File

@ -238,7 +238,7 @@ public class CustomerGroupCompanyController {
String sql = "SELECT IFNULL(di.total,0)-IFNULL(lcc.CLEAN_LEASE_MONEY,0) total,di.CHANNELTYPE FROM lb_contract_info lci LEFT JOIN DISTRIBUTOR_INFO di ON di.distributor_no=lci.distributor_id LEFT JOIN LC_CALC_CONDITION lcc ON lcc.contract_id=lci.id WHERE lci.id=? ";
List<Map<String, String>> results = conn.executeQuery(sql, this.contractId);
String istotal = results.get(0).get("total");
String channeltype = results.get(0).get("CHANNELTYPE");
String channeltype = results.get(0).get("channeltype");
if("01".equals(channeltype) && new Double(istotal) <= 0){
return "经销商额度不足！";
}