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 zhouzebei

Browse Source
This commit is contained in:
58261 2018-10-09 09:39:53 +08:00
commit b421a228bf
4 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
WebContent/ProductManage/ProductConfig/ProductSpecificInfo.jsp
View File

@ -15,10 +15,12 @@
dwTemp.getDataObject().setVisible("equip_type", false);
dwTemp.getDataObject().setVisible("IS_ALL_DEALER", false);
dwTemp.getDataObject().setVisible("IS_ALL_CAR", false);
dwTemp.getDataObject().setVisible("HaveCommission", false);
dwTemp.getDataObject().setRequired("LeasForm", false);
dwTemp.getDataObject().setRequired("equip_type", false);
dwTemp.getDataObject().setRequired("IS_ALL_DEALER", false);
dwTemp.getDataObject().setRequired("IS_ALL_CAR", false);
dwTemp.getDataObject().setRequired("HaveCommission", false);
}
ASDataObject doTemp=dwTemp.getDataObject();

2
WebContent/Tenwa/Lease/Flow/Project/ProjectApproval/ProjectApprovalCreationInfo.jsp
View File

@ -146,7 +146,7 @@
<%/*~[Describe=选择业务品种;]~*/%>
function selectBusinessType()
{
AsDialog.OpenSelector("SelectBusinessType","ProductType,1@3,TypeNo,004","dialogWidth=" + parseInt(window.screen.width * 0.4) + "px dialogHeight=" + parseInt(window.screen.height * 0.5) + "px",
AsDialog.OpenSelector("SelectBusinessType2","ProductType,1@3,TypeNo,004","dialogWidth=" + parseInt(window.screen.width * 0.4) + "px dialogHeight=" + parseInt(window.screen.height * 0.5) + "px",
function(sReturn){
if(!sReturn||sReturn=="_CANCEL_"||sReturn==""||sReturn=="_NONE_")
{

8
src_sys/com/tenwa/flow/action/comm/FlowBussionAction.java
View File

@ -35,10 +35,10 @@ public class FlowBussionAction extends CommonAction {
private String FlowKey;
private String ProductId;
private String FixedFlowParam;
public String customertype;
public String custname;
public String leasform;
public String carAttributes;
private String customertype;
private String custname;
private String leasform;
private String carAttributes;
public List<BizObject> FlowMutexConfig;
public Map<String, String> FlowParam = new HashMap<String, String>();

6
src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBProjectIntoTempInitCarBusiness.java
View File

@ -21,6 +21,7 @@ import jbo.com.tenwa.lease.carbrand.BUSINESS_STATUS;
import jbo.com.tenwa.lease.comm.LB_EQUIPMENT_CAR_TEMP;
import jbo.com.tenwa.lease.comm.LB_PROJECT_INFO_TEMP;
import jbo.com.tenwa.lease.comm.LB_UNION_LESSEE_TEMP;
import jbo.prd.PRD_SPECIFIC_LIBRARY;
import java.util.HashMap;
import java.util.List;
@ -261,6 +262,10 @@ public class LBProjectIntoTempInitCarBusiness extends BaseBussiness {
}
}
private void saveProjInfo(BizObjectManager bomLPI,JBOTransaction tx ,ASUser asUser,String distributoIid) throws Exception{
String productId=this.getAttribute("ProductId").toString();
BizObject bo1 = JBOFactory.createBizObjectQuery(PRD_SPECIFIC_LIBRARY.CLASS_NAME,"PRODUCTID=:PRODUCTID")
.setParameter("PRODUCTID",productId).getSingleResult(false);
String haveCommission = (bo1==null)?"":bo1.getAttribute("HaveCommission").getString();
BizObject bo = bomLPI.newObject();//保存项目信息
try {
bo.setAttributeValue(LB_PROJECT_INFO_TEMP.distributor_id, distributoIid);
@ -282,6 +287,7 @@ public class LBProjectIntoTempInitCarBusiness extends BaseBussiness {
bo.setAttributeValue("PROJECT_STATUS","0");//项目状态
bo.setAttributeValue("PROJECT_DATE",StringFunction.getTodayNow());//项目状态
bo.setAttributeValue("source_type",this.getAttribute("sourcetype"));//申请类型
bo.setAttributeValue("HaveCommission",haveCommission);
bomLPI.saveObject(bo);
}catch (Exception e){
tx.rollback();