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

Merge remote-tracking branch 'origin/dailyfix' into dailyfix

Browse Source
This commit is contained in:
gityjf 2021-04-16 09:02:27 +08:00
commit 49b767934d
2 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
WebContent/Tenwa/Gps/LmGpsOrderInfo.jsp
View File

@ -29,21 +29,16 @@
String contact_phone = Sqlca.getString("select CONTACT_PHONE from GPS_config_info where isenable='1' ");//派工联系人电话
//如果当前有记录优先取数据库中的记录
String distributor_name = "";
if("null".equals(id)){
System.out.println("¾­ÏúÉÌorgId=" + CurUser.getOrgID());
String distributor_id = Sqlca.getString("select distributor_id from lb_project_info where id='"+ProjectId+"'");//»ñÈ¡¾­ÏúÉÌID
distributor_name = Sqlca.getString("select distributor_name from distributor_info where distributor_no='"+distributor_id+"'");//»ñÈ¡¾­ÏúÃû³Æ
}else {
distributor_name = Sqlca.getString("select CAR_ACCOUNT from LM_GPS_ORDER_TEMP where APPLY_NO='"+ProjectNo+"'");
System.out.println("¾­ÏúÉÌdistributor_name=" + distributor_name);
}
System.out.println("经销商orgId=" + CurUser.getOrgID());
String distributor_id = Sqlca.getString("select distributor_id from lb_project_info where id='"+ProjectId+"'");//获取经销商ID
String distributor_name = Sqlca.getString("select distributor_name from distributor_info where distributor_no='"+distributor_id+"'");//获取经销名称
System.out.println("【20210329】，经销商=" + distributor_name);
//如果当前部门为直销&&有记录&&0010显示 直销 或者 无记录&&直销&&0010
if("8006014".equals(CurUser.getOrgID()) && "0010".equals(PhaseNo)){
System.out.println("经销商id不等于【8006014】，经销商id=" + CurUser.getOrgID());
distributor_name = "安鹏汽车业务直销部（江苏）";
}
System.out.println("【20210329】2，经销商=" + distributor_name);
BigDecimal incomNuber = new BigDecimal(Sqlca.getString("select INCOME_NUMBER from LC_CALC_CONDITION_TEMP where FLOWUNID='"+flowunid+"'"));
List<String> images = new ArrayList<String>();
String sql = "select lgp.URL from lm_gps_photo lgp where APPLY_NO='"+ProjectNo+"'";

5
WebContent/Tenwa/Lease/Flow/Rent/CautionMoneyDeduction/ContractInfoPay.jsp
View File

@ -17,6 +17,8 @@
String projectId = CurPage.getParameter("ProjectId");
String gpsVendor = Sqlca.getString("select cl.itemname from lb_project_info lpi left join LM_GPS_ORDER lgr on lgr.apply_no=lpi.project_no left join code_library cl on cl.itemno=lgr.source and cl.codeno='gpsVendor' where lpi.id='"+projectId+"'");
String userId = CurUser.getUserID();
//gps来源 中瑞1 天易0
String source = Sqlca.getString("SELECT SOURCE from LM_GPS_ORDER where PROJECT_ID='"+projectId+"'");
String orderNo = Sqlca.getString("SELECT ORDER_NO from LM_GPS_ORDER where PROJECT_ID='"+projectId+"'");
String vin = Sqlca.getString("SELECT CAR_VIN from LM_GPS_ORDER where PROJECT_ID='"+projectId+"'");
String applyNo = Sqlca.getString("SELECT APPLY_NO from LM_GPS_ORDER where PROJECT_ID='"+projectId+"'");
@ -25,6 +27,7 @@
System.out.println("orderNo=" + orderNo);
System.out.println("vin=" + vin);
System.out.println("applyNo=" + applyNo);
System.out.println("source=" + source);
String sTempletNo = "LB_CONTRACT_INFO_PAY";//--Ä£°åºÅ--
ASObjectModel doTemp = new ASObjectModel(sTempletNo);
@ -62,7 +65,7 @@
return;
}
var result =AsControl.RunJavaMethodTrans("com.tenwa.gps.GpsController","queryOrder",
"userId=<%=userId%>,flowUnid=Á÷³ÌÍâ²éѯ,applyNo=<%=applyNo%>,orderNo=<%=orderNo%>,tableName=LM_GPS_ORDER,projectId=<%=projectId%>,vin=<%=vin%>");
"userId=<%=userId%>,flowUnid=流程外查询,applyNo=<%=applyNo%>,orderNo=<%=orderNo%>,tableName=LM_GPS_ORDER,projectId=<%=projectId%>,vin=<%=vin%>,source=<%=source%>");
AsDialog.PopView("/Tenwa/Gps/LmGpsLocationList.jsp","ProjectNo=<%=applyNo%>","dialogWidth=1300px;dialogHeight=200px;center:yes;status:no;statusbar:no",function(sAreaCodeInfo){
},'GPS¶¨Î»ÐÅÏ¢');
}