From 1bcf4934f31ce96ff677d9824dcd2efded26ac37 Mon Sep 17 00:00:00 2001 From: zhangbb Date: Tue, 9 Oct 2018 09:30:44 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=B8=9A=E5=8A=A1=E7=94=B3=E8=AF=B7=E9=80=89?= =?UTF-8?q?=E6=8B=A9=E4=BA=A7=E5=93=81=E6=97=B6=EF=BC=8C=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?=E7=94=9F=E6=95=88=E6=97=A5=E6=9C=9F=E3=80=82=202.=E4=BA=A7?= =?UTF-8?q?=E5=93=81=E4=B8=AD=E5=A2=9E=E5=8A=A0=E6=98=AF=E5=90=A6=E6=9C=89?= =?UTF-8?q?=E4=BD=A3=E9=87=91=EF=BC=8C=E5=B9=B6=E5=9C=A8=E4=B8=9A=E5=8A=A1?= =?UTF-8?q?=E7=94=B3=E8=AF=B7=E6=97=B6=E5=A2=9E=E5=8A=A0=E5=88=B0=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E8=A1=A8=E4=B8=AD=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProductManage/ProductConfig/ProductSpecificInfo.jsp | 2 ++ .../ProjectApproval/ProjectApprovalCreationInfo.jsp | 2 +- src_sys/com/tenwa/flow/action/comm/FlowBussionAction.java | 8 ++++---- .../commbusiness/LBProjectIntoTempInitCarBusiness.java | 6 ++++++ 4 files changed, 13 insertions(+), 5 deletions(-) diff --git a/WebContent/ProductManage/ProductConfig/ProductSpecificInfo.jsp b/WebContent/ProductManage/ProductConfig/ProductSpecificInfo.jsp index 6623ce349..e1a904584 100644 --- a/WebContent/ProductManage/ProductConfig/ProductSpecificInfo.jsp +++ b/WebContent/ProductManage/ProductConfig/ProductSpecificInfo.jsp @@ -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(); diff --git a/WebContent/Tenwa/Lease/Flow/Project/ProjectApproval/ProjectApprovalCreationInfo.jsp b/WebContent/Tenwa/Lease/Flow/Project/ProjectApproval/ProjectApprovalCreationInfo.jsp index 94fa28f25..2bf5d6927 100644 --- a/WebContent/Tenwa/Lease/Flow/Project/ProjectApproval/ProjectApprovalCreationInfo.jsp +++ b/WebContent/Tenwa/Lease/Flow/Project/ProjectApproval/ProjectApprovalCreationInfo.jsp @@ -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_") { diff --git a/src_sys/com/tenwa/flow/action/comm/FlowBussionAction.java b/src_sys/com/tenwa/flow/action/comm/FlowBussionAction.java index 08518a1d9..87ef25126 100644 --- a/src_sys/com/tenwa/flow/action/comm/FlowBussionAction.java +++ b/src_sys/com/tenwa/flow/action/comm/FlowBussionAction.java @@ -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 FlowMutexConfig; public Map FlowParam = new HashMap(); diff --git a/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBProjectIntoTempInitCarBusiness.java b/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBProjectIntoTempInitCarBusiness.java index 3f95e9f5f..807ded138 100644 --- a/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBProjectIntoTempInitCarBusiness.java +++ b/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBProjectIntoTempInitCarBusiness.java @@ -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();