diff --git a/WebContent/Tenwa/Lease/Flow/Rent/CautionMoneyDeduction/ContractInfoPay.jsp b/WebContent/Tenwa/Lease/Flow/Rent/CautionMoneyDeduction/ContractInfoPay.jsp index 90ab72f59..05e2a9815 100644 --- a/WebContent/Tenwa/Lease/Flow/Rent/CautionMoneyDeduction/ContractInfoPay.jsp +++ b/WebContent/Tenwa/Lease/Flow/Rent/CautionMoneyDeduction/ContractInfoPay.jsp @@ -13,7 +13,7 @@ String compClientID = CurPage.getParameter("CompClientID"); String phaseNo = CurPage.getParameter("PhaseNo"); String ProductId = CurPage.getParameter("ProductId"); - String productid = Sqlca.getString("select PRODUCT_ID from LB_CONTRACT_INFO_TEMP where flowunid = '"+flowunid+"'"); + //String corpusSource = Sqlca.getString("select corpus_source from LB_CONTRACT_INFO_TEMP where flowunid = '"+flowunid+"'"); 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(); @@ -36,6 +36,7 @@ doTemp.setDataQueryClass("com.tenwa.flow.flowHistory.FlowDataInfoHistory");//如果是历史则新显示历史数据 } */ ASObjectWindow dwTemp = new ASObjectWindow(CurPage, doTemp,request); + dwTemp.Style = "2"; dwTemp.ReadOnly = "1"; dwTemp.genHTMLObjectWindow(contractId); diff --git a/WebContent/WEB-INF/etc/jbo/jbo_lease.xml b/WebContent/WEB-INF/etc/jbo/jbo_lease.xml index 954f30099..b0fb7833e 100644 --- a/WebContent/WEB-INF/etc/jbo/jbo_lease.xml +++ b/WebContent/WEB-INF/etc/jbo/jbo_lease.xml @@ -143,6 +143,7 @@ + @@ -292,6 +293,7 @@ + @@ -805,6 +807,7 @@ + @@ -1076,6 +1079,7 @@ + @@ -2812,6 +2816,7 @@ + diff --git a/src_jbo/jbo/com/tenwa/lease/comm/LB_CONTRACT_INFO.java b/src_jbo/jbo/com/tenwa/lease/comm/LB_CONTRACT_INFO.java index 55fb1ff49..8ce98454d 100644 --- a/src_jbo/jbo/com/tenwa/lease/comm/LB_CONTRACT_INFO.java +++ b/src_jbo/jbo/com/tenwa/lease/comm/LB_CONTRACT_INFO.java @@ -341,4 +341,8 @@ public interface LB_CONTRACT_INFO{ * 中车合同号 STRING(32)
*/ public static final String ZC_CONTRACT_NUMBER = "ZC_CONTRACT_NUMBER"; + /** + * 资方名称 STRING(10)
+ */ + public static final String CORPUS_SOURCE = "CORPUS_SOURCE"; } \ No newline at end of file diff --git a/src_jbo/jbo/com/tenwa/lease/comm/LB_CONTRACT_INFO_HIS.java b/src_jbo/jbo/com/tenwa/lease/comm/LB_CONTRACT_INFO_HIS.java index b8998ed78..9b6b12fa0 100644 --- a/src_jbo/jbo/com/tenwa/lease/comm/LB_CONTRACT_INFO_HIS.java +++ b/src_jbo/jbo/com/tenwa/lease/comm/LB_CONTRACT_INFO_HIS.java @@ -329,4 +329,8 @@ public interface LB_CONTRACT_INFO_HIS{ * 中车合同号 STRING(32)
*/ public static final String ZC_CONTRACT_NUMBER = "ZC_CONTRACT_NUMBER"; + /** + * 资方名称 STRING(10)
+ */ + public static final String CORPUS_SOURCE = "CORPUS_SOURCE"; } \ No newline at end of file diff --git a/src_jbo/jbo/com/tenwa/lease/comm/LB_CONTRACT_INFO_TEMP.java b/src_jbo/jbo/com/tenwa/lease/comm/LB_CONTRACT_INFO_TEMP.java index 1bcb44c02..bae40922b 100644 --- a/src_jbo/jbo/com/tenwa/lease/comm/LB_CONTRACT_INFO_TEMP.java +++ b/src_jbo/jbo/com/tenwa/lease/comm/LB_CONTRACT_INFO_TEMP.java @@ -333,4 +333,8 @@ public interface LB_CONTRACT_INFO_TEMP{ * 中车合同号 STRING(32)
*/ public static final String ZC_CONTRACT_NUMBER = "ZC_CONTRACT_NUMBER"; + /** + * 资方名称 STRING(10)
+ */ + public static final String CORPUS_SOURCE = "CORPUS_SOURCE"; } \ No newline at end of file diff --git a/src_jbo/jbo/com/tenwa/lease/comm/LB_PROJECT_INFO.java b/src_jbo/jbo/com/tenwa/lease/comm/LB_PROJECT_INFO.java index 54d0297fd..023036b35 100644 --- a/src_jbo/jbo/com/tenwa/lease/comm/LB_PROJECT_INFO.java +++ b/src_jbo/jbo/com/tenwa/lease/comm/LB_PROJECT_INFO.java @@ -265,4 +265,8 @@ public interface LB_PROJECT_INFO{ * 中车合同号 STRING(32)
*/ public static final String ZC_CONTRACT_NUMBER = "ZC_CONTRACT_NUMBER"; + /** + * 资方名称 STRING(10)
+ */ + public static final String CORPUS_SOURCE = "CORPUS_SOURCE"; } \ No newline at end of file diff --git a/src_jbo/jbo/com/tenwa/lease/comm/LB_PROJECT_INFO_TEMP.java b/src_jbo/jbo/com/tenwa/lease/comm/LB_PROJECT_INFO_TEMP.java index 729e815a0..ee7bece3d 100644 --- a/src_jbo/jbo/com/tenwa/lease/comm/LB_PROJECT_INFO_TEMP.java +++ b/src_jbo/jbo/com/tenwa/lease/comm/LB_PROJECT_INFO_TEMP.java @@ -265,4 +265,8 @@ public interface LB_PROJECT_INFO_TEMP{ * 中车合同号 STRING(32)
*/ public static final String ZC_CONTRACT_NUMBER = "ZC_CONTRACT_NUMBER"; + /** + * 资方名称 STRING(10)
+ */ + public static final String CORPUS_SOURCE = "CORPUS_SOURCE"; } \ No newline at end of file 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 68ed90490..77e3c0a71 100644 --- a/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBProjectIntoTempInitCarBusiness.java +++ b/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBProjectIntoTempInitCarBusiness.java @@ -22,6 +22,7 @@ import jbo.com.tenwa.lease.comm.LB_PROJECT_INFO; import jbo.com.tenwa.lease.comm.LB_PROJECT_INFO_TEMP; import jbo.com.tenwa.lease.comm.LB_UNION_LESSEE; import jbo.com.tenwa.lease.comm.LB_UNION_LESSEE_TEMP; +import jbo.prd.LB_PRODUCT_CORPUS_SOURCE; import jbo.prd.PRD_SPECIFIC_LIBRARY; import java.util.*; @@ -389,6 +390,19 @@ public class LBProjectIntoTempInitCarBusiness extends BaseBussiness { if("03".equals(this.getAttribute("CustomerType")) && "app".equals(sourcetype)){ bo.setAttributeValue("is_netcar",this.getAttribute("isnetcar") ); } + + /* + 排名顺序第n个的sql = + select o.corpus_source from lb_product_corpus_source o where o.product_id='H01-C01-E-CXC1-DB-3' + and order_list =(select ot.order_list from lb_product_corpus_source ot where ot.product_id='H01-C01-E-CXC1-DB-3' order by ot.order_list limit n-1,1); + */ + String sql = "select O.CORPUS_SOURCE from O where PRODUCT_ID=:PRODUCTID and O.ORDER_LIST = (select min(ot.order_list) from jbo.prd.LB_PRODUCT_CORPUS_SOURCE ot where ot.PRODUCT_ID=:PRODUCTID)"; + BizObject boLPCS = JBOFactory.createBizObjectQuery(LB_PRODUCT_CORPUS_SOURCE.CLASS_NAME,sql).setParameter("PRODUCTID",productId).getSingleResult(false); + String corpusSource = "AP"; + if(boLPCS!=null&&boLPCS.getAttribute("CORPUS_SOURCE")!=null){ + corpusSource=boLPCS.getAttribute("CORPUS_SOURCE").toString(); + } + bo.setAttributeValue("CORPUS_SOURCE",corpusSource); bomLPI.saveObject(bo); }catch (Exception e){ tx.rollback(); @@ -409,4 +423,5 @@ public class LBProjectIntoTempInitCarBusiness extends BaseBussiness { e.printStackTrace(); } } + }