diff --git a/WebContent/WEB-INF/etc/jbo/jbo_lease.xml b/WebContent/WEB-INF/etc/jbo/jbo_lease.xml index f1927bc4e..0602324cd 100644 --- a/WebContent/WEB-INF/etc/jbo/jbo_lease.xml +++ b/WebContent/WEB-INF/etc/jbo/jbo_lease.xml @@ -5242,7 +5242,6 @@ - diff --git a/src_jbo/jbo/com/tenwa/lease/comm/VI_BUSINESS_AFFINFO.java b/src_jbo/jbo/com/tenwa/lease/comm/VI_BUSINESS_AFFINFO.java index c964288c3..266d85912 100644 --- a/src_jbo/jbo/com/tenwa/lease/comm/VI_BUSINESS_AFFINFO.java +++ b/src_jbo/jbo/com/tenwa/lease/comm/VI_BUSINESS_AFFINFO.java @@ -365,8 +365,4 @@ public interface VI_BUSINESS_AFFINFO{ * contract_stat STRING(20)
*/ public static final String contract_stat = "contract_stat"; - /** - * contract_status_name STRING(20)
- */ - public static final String contract_status_name = "contract_status_name"; } \ No newline at end of file diff --git a/src_sql/view/vi_business_affinfo.sql b/src_sql/view/vi_business_affinfo.sql index def2736d5..c40c0ddb5 100644 --- a/src_sql/view/vi_business_affinfo.sql +++ b/src_sql/view/vi_business_affinfo.sql @@ -86,16 +86,10 @@ create view vi_business_affinfo as SELECT O.DISTRIBUTOR_ID LFI.APPLYPAY_DATE AS APPLYPAY_DATE, (CASE WHEN (O.CONTRACT_STATUS = '21') THEN (LCC.START_DATE = NULL) ELSE LCC.START_DATE END) AS START_DATE_NEW, CLL.ITEMNAME AS CONTRACT_STAT, - lcs.status_name AS contract_status_name -FROM ((((((((((APZL.LB_CONTRACT_INFO O left join lb_contract_status lcs ON o.contract_status=lcs.status_code LEFT JOIN APZL.LB_PROJECT_INFO LPI ON ((convert(O.PROJECT_ID USING UTF8) = LPI.ID))) LEFT JOIN APZL.LB_UNION_LESSEE LUL ON ((O.PROJECT_ID = LUL.PROJECT_ID))) LEFT JOIN APZL.CUSTOMER_PERSON CP ON ((CP.CUSTOMERID = LUL.CUSTOMER_ID))) LEFT JOIN APZL.CUSTOMER_FAMILY CF ON (((O.PROJECT_ID = CF.PROJECT_ID) AND (CF.PARTNER_ = 'Y')))) LEFT JOIN APZL.LB_EQUIPMENT_CAR LEC ON ((convert(O.PROJECT_ID USING UTF8) = LEC.PROJECT_ID))) LEFT JOIN ( - SELECT APZL.LC_FUND_INCOME.CONTRACT_ID AS CONTRACT_ID, - min(APZL.LC_FUND_INCOME.PROJECT_ID) AS PROJECT_ID, - max(APZL.LC_FUND_INCOME.APPLYPAY_DATE) AS APPLYPAY_DATE, - APZL.LC_FUND_INCOME.FACT_DATE AS FACT_DATE - FROM APZL.LC_FUND_INCOME - WHERE ((APZL.LC_FUND_INCOME.FEE_TYPE = 'feetype10') AND (APZL.LC_FUND_INCOME.SETTLE_METHOD = 'settlemethod11')) - GROUP BY APZL.LC_FUND_INCOME.CONTRACT_ID -) LFI ON ((O.PROJECT_ID = LFI.PROJECT_ID))) LEFT JOIN APZL.LC_CALC_CONDITION LCC ON ((O.ID = LCC.CONTRACT_ID))) LEFT JOIN APZL.PRD_SPECIFIC_LIBRARY PSL ON ((LPI.PRODUCT_ID = PSL.PRODUCTID))) LEFT JOIN APZL.CODE_LIBRARY CL ON (((convert(CL.ITEMNO USING UTF8) = PSL.OPERATIONTYPE) AND (CL.CODENO = 'operationType')))) +FROM ((((((((((APZL.LB_CONTRACT_INFO O LEFT JOIN APZL.LB_PROJECT_INFO LPI ON ((convert(O.PROJECT_ID USING UTF8) = LPI.ID))) LEFT JOIN APZL.LB_UNION_LESSEE LUL ON ((O.PROJECT_ID = LUL.PROJECT_ID))) LEFT JOIN APZL.CUSTOMER_PERSON CP ON ((CP.CUSTOMERID = LUL.CUSTOMER_ID))) LEFT JOIN APZL.CUSTOMER_FAMILY CF ON (((O.PROJECT_ID = CF.PROJECT_ID) AND (CF.PARTNER_ = 'Y')))) LEFT JOIN APZL.LB_EQUIPMENT_CAR LEC ON ((convert(O.PROJECT_ID USING UTF8) = LEC.PROJECT_ID))) +LEFT JOIN ( + SELECT CONTRACT_ID AS contract_id,LEFT(inputtime,10) AS APPLYPAY_DATE FROM flow_bussiness_object WHERE flow_name='付款申请(汽车)' +GROUP BY contract_id) LFI ON ((O.id = LFI.contract_id))) LEFT JOIN APZL.LC_CALC_CONDITION LCC ON ((O.ID = LCC.CONTRACT_ID))) LEFT JOIN APZL.PRD_SPECIFIC_LIBRARY PSL ON ((LPI.PRODUCT_ID = PSL.PRODUCTID))) LEFT JOIN APZL.CODE_LIBRARY CL ON (((convert(CL.ITEMNO USING UTF8) = PSL.OPERATIONTYPE) AND (CL.CODENO = 'operationType')))) LEFT JOIN ( SELECT BS.CONTRACT_NUMBER AS CONTRACT_NUMBER, BS.INPUTTIME AS INPUTTIME, CL.ITEMNAME AS ITEMNAME FROM (APZL.BUSINESS_STATUS BS diff --git a/src_sql/投产SQL/V20200206/tft_20200206.sql b/src_sql/投产SQL/V20200206/tft_20200206.sql index 5d8d12b4f..df3133a9c 100644 --- a/src_sql/投产SQL/V20200206/tft_20200206.sql +++ b/src_sql/投产SQL/V20200206/tft_20200206.sql @@ -47,4 +47,22 @@ delete from select_catalog where selname='SelectOwnAccountForContract'; insert into `select_catalog` (`selname`, `seltype`, `seldescribe`, `seltablename`, `selprimarykey`, `selbrowsemode`, `selargs`, `selhidefield`, `selcode`, `selfieldname`, `selfielddisp`, `selreturnvalue`, `selfilterfield`, `isinuse`, `mutilorsingle`, `attribute1`, `attribute2`, `attribute3`, `attribute4`, `attribute5`, `inputuser`, `inputorg`, `inputtime`, `updateuser`, `updatetime`, `remark`) values('SelectOwnAccountForContract','Sql','²éѯ±¾·½ÕË»§',NULL,NULL,'Grid','String LessorId','account_purpose','select acc_number,acc_bank,acc_name,account_purpose from own_account where own_id=\'#LessorId\'','¿ª»§ÕʺÅ,¿ª»§ÒøÐÐ,¿ª»§»§Ãû,ÓÃ;','acc_number@style={width:300px;}@acc_name@style={width:300px;}','acc_number@acc_bank@acc_name@account_purpose',NULL,'1','Single',NULL,NULL,NULL,NULL,NULL,'SYS_Designer',NULL,'2017/08/15 13:45:07','SYS_Designer','2018/03/08 15:13:26',NULL); -- ºÏͬÐÅÏ¢²éѯÌí¼ÓºÏͬ״̬ -Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('ViBusinessAffinfo','14080','14080','1','O','contract_status_name','contract_status_name','String','','ºÏͬ״̬','','1','Text','1','1','','','','20','1','0','0','1','0',0,'','','','SYS_Designer','2020/02/13 15:39:11','SYS_Designer','2020/02/13 15:39:11','','','1','','','',''); +DELETE FROM awe_do_library WHERE dono='ViBusinessAffinfo' AND colindex='14020'; +INSERT INTO awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) VALUES ('ViBusinessAffinfo','14020','14020','1','O','CONTRACT_STATUS','CONTRACT_STATUS','String','','ºÏͬ״̬','','1','Text','1','1','','','','20','0','0','0','1','1',0,'','','','SYS_Designer','2019/12/17 11:18:15','SYS_Designer','2020/02/13 16:12:46','0','','1','','','','Like'); +DELETE FROM awe_do_library WHERE dono='ViBusinessAffinfo' AND colindex='1002'; +INSERT INTO awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) VALUES ('ViBusinessAffinfo','1002','1001','1','O','contract_stat','contract_stat','String','','ºÏͬ״̬','','1','Text','1','1','','','','20','1','0','0','1','0',0,'','','','SYS_Designer','2019/12/17 15:09:29','SYS_Designer','2020/02/13 16:20:46','0','','1','','','',''); + + +-- Ìí¼ÓÌì½òÏÞ¶î +Insert Into CODE_CATALOG (codeno,sortno,codetypeone,codetypetwo,codename,codedescribe,codeattribute,inputuser,inputorg,inputtime,updateuser,updatetime,remark) Values ('TjbankType','34500790','»ù´¡ÅäÖÃ','ÒµÎñÔ±ÉêÇë','ÒøÐÐÀàÐÍ',null,null,'SYS_Designer',null,'2018/07/05 17:05:21','SYS_Designer','2018/07/05 17:05:21',null); +Insert Into Code_Library (codeno,itemno,itemname,bankno,sortno,isinuse,itemdescribe,itemattribute,relativecode,attribute1,attribute2,attribute3,attribute4,attribute5,attribute6,attribute7,attribute8,inputuser,inputorg,inputtime,updateuser,updatetime,remark,helptext) Values ('TjbankType','04135810','¹ãÖÝÒøÐÐ',null,'04135810','1',null,null,null,null,null,null,null,null,null,null,null,'SYS_Designer',null,'2018/07/05 17:05:21','SYS_Designer','2018/11/13 10:39:10',null,null); +Insert Into Code_Library (codeno,itemno,itemname,bankno,sortno,isinuse,itemdescribe,itemattribute,relativecode,attribute1,attribute2,attribute3,attribute4,attribute5,attribute6,attribute7,attribute8,inputuser,inputorg,inputtime,updateuser,updatetime,remark,helptext) Values ('TjbankType','102','¹¤ÉÌÒøÐÐ','','102','1','2000','','','','','','','','','','','SYS_Designer',null,'2018/07/05 17:10:07','SYS_Designer','2020/02/14 09:08:13','',''); +Insert Into Code_Library (codeno,itemno,itemname,bankno,sortno,isinuse,itemdescribe,itemattribute,relativecode,attribute1,attribute2,attribute3,attribute4,attribute5,attribute6,attribute7,attribute8,inputuser,inputorg,inputtime,updateuser,updatetime,remark,helptext) Values ('TjbankType','103','Å©ÒµÒøÐÐ',null,'103','1','2000',null,null,null,null,null,null,null,null,null,null,'SYS_Designer',null,'2018/07/05 17:10:07','SYS_Designer','2018/11/16 09:34:33',null,null); +Insert Into Code_Library (codeno,itemno,itemname,bankno,sortno,isinuse,itemdescribe,itemattribute,relativecode,attribute1,attribute2,attribute3,attribute4,attribute5,attribute6,attribute7,attribute8,inputuser,inputorg,inputtime,updateuser,updatetime,remark,helptext) Values ('TjbankType','104','ÖйúÒøÐÐ',null,'104','1','10000',null,null,null,null,null,null,null,null,null,null,'SYS_Designer',null,'2018/07/05 17:10:07','SYS_Designer','2018/11/13 10:39:10',null,null); +Insert Into Code_Library (codeno,itemno,itemname,bankno,sortno,isinuse,itemdescribe,itemattribute,relativecode,attribute1,attribute2,attribute3,attribute4,attribute5,attribute6,attribute7,attribute8,inputuser,inputorg,inputtime,updateuser,updatetime,remark,helptext) Values ('TjbankType','105','½¨ÉèÒøÐÐ',null,'105','1','10000',null,null,null,null,null,null,null,null,null,null,'SYS_Designer',null,'2018/07/05 17:10:07','SYS_Designer','2018/11/13 10:39:10',null,null); +Insert Into Code_Library (codeno,itemno,itemname,bankno,sortno,isinuse,itemdescribe,itemattribute,relativecode,attribute1,attribute2,attribute3,attribute4,attribute5,attribute6,attribute7,attribute8,inputuser,inputorg,inputtime,updateuser,updatetime,remark,helptext) Values ('TjbankType','305','ÃñÉúÒøÐÐ',null,'305','1',null,null,null,null,null,null,null,null,null,null,null,'SYS_Designer',null,'2018/07/05 17:10:07','SYS_Designer','2018/11/13 10:39:10',null,null); +Insert Into Code_Library (codeno,itemno,itemname,bankno,sortno,isinuse,itemdescribe,itemattribute,relativecode,attribute1,attribute2,attribute3,attribute4,attribute5,attribute6,attribute7,attribute8,inputuser,inputorg,inputtime,updateuser,updatetime,remark,helptext) Values ('TjbankType','306','¹ã·¢ÒøÐÐ',null,'306','1',null,null,null,null,null,null,null,null,null,null,null,'SYS_Designer',null,'2018/07/05 17:10:07','SYS_Designer','2018/11/13 10:39:10',null,null); +Insert Into Code_Library (codeno,itemno,itemname,bankno,sortno,isinuse,itemdescribe,itemattribute,relativecode,attribute1,attribute2,attribute3,attribute4,attribute5,attribute6,attribute7,attribute8,inputuser,inputorg,inputtime,updateuser,updatetime,remark,helptext) Values ('TjbankType','307','ƽ°²ÒøÐÐ',null,'307','1',null,null,null,null,null,null,null,null,null,null,null,'SYS_Designer',null,'2018/07/05 17:10:07','SYS_Designer','2018/11/13 10:39:10',null,null); +Insert Into Code_Library (codeno,itemno,itemname,bankno,sortno,isinuse,itemdescribe,itemattribute,relativecode,attribute1,attribute2,attribute3,attribute4,attribute5,attribute6,attribute7,attribute8,inputuser,inputorg,inputtime,updateuser,updatetime,remark,helptext) Values ('TjbankType','308','ÕÐÉÌÒøÐÐ',null,'308','1','5000',null,null,null,null,null,null,null,null,null,null,'SYS_Designer',null,'2018/07/05 17:10:07','SYS_Designer','2018/11/13 10:39:10',null,null); +Insert Into Code_Library (codeno,itemno,itemname,bankno,sortno,isinuse,itemdescribe,itemattribute,relativecode,attribute1,attribute2,attribute3,attribute4,attribute5,attribute6,attribute7,attribute8,inputuser,inputorg,inputtime,updateuser,updatetime,remark,helptext) Values ('TjbankType','309','ÐËÒµÒøÐÐ',null,'309','1',null,null,null,null,null,null,null,null,null,null,null,'SYS_Designer',null,'2018/07/05 17:10:07','SYS_Designer','2018/11/13 10:39:10',null,null); +Insert Into Code_Library (codeno,itemno,itemname,bankno,sortno,isinuse,itemdescribe,itemattribute,relativecode,attribute1,attribute2,attribute3,attribute4,attribute5,attribute6,attribute7,attribute8,inputuser,inputorg,inputtime,updateuser,updatetime,remark,helptext) Values ('TjbankType','310','¹â´óÒøÐÐ',null,'08271311','1','5000',null,null,null,null,null,null,null,null,null,null,'SYS_Designer',null,'2019/06/05 09:48:30','SYS_Designer','2019/06/05 09:48:30',null,null); diff --git a/src_tenwa/com/tenwa/collectaudit/cache/CollectAuditInfoCacheTj.java b/src_tenwa/com/tenwa/collectaudit/cache/CollectAuditInfoCacheTj.java index c12c11330..c6685a0a6 100644 --- a/src_tenwa/com/tenwa/collectaudit/cache/CollectAuditInfoCacheTj.java +++ b/src_tenwa/com/tenwa/collectaudit/cache/CollectAuditInfoCacheTj.java @@ -250,7 +250,7 @@ public class CollectAuditInfoCacheTj { BizObjectManager bc = JBOFactory.getFactory().getManager(LC_RENT_PLAN.CLASS_NAME); List bolist = bm.createQuery("select distinct O.contract_id,O.plan_date,O.id,ca.ACC_NUMBER,ca.ACCOUNT,ca.BANK_NAME,ca.ACCOUNT_PROVINCE,ca.BANK_DEPOSIT,O.rent from O , jbo.app.tenwa.customer.CUSTOMER_ACCOUNT ca where O.contract_id=ca.contract_id and ca.acc_info = 'Debit' and O.id in ("+parms.toString()+")").getResultList(false); for (BizObject bo : bolist) { - List codelist = JBOFactory.getFactory().getBizObjectManager(CODE_LIBRARY.CLASS_NAME).createQuery("O.codeno = 'bankType' and O.itemdescribe is not null ").getResultList(false); + List codelist = JBOFactory.getFactory().getBizObjectManager(CODE_LIBRARY.CLASS_NAME).createQuery("O.codeno = 'TjbankType' and O.itemdescribe is not null ").getResultList(false); for (BizObject code : codelist) { String itemname = code.getAttribute("itemname").toString().trim(); double itemdescribe = code.getAttribute("itemdescribe").getDouble(); @@ -828,7 +828,7 @@ public class CollectAuditInfoCacheTj { String bank_name = bo.getAttribute("BANK_NAME").toString(); int m = 0; String[] singleRent = null; - List codelist = JBOFactory.getFactory().getBizObjectManager(CODE_LIBRARY.CLASS_NAME).createQuery("O.codeno = 'bankType' and O.itemdescribe is not null ").getResultList(false); + List codelist = JBOFactory.getFactory().getBizObjectManager(CODE_LIBRARY.CLASS_NAME).createQuery("O.codeno = 'TjbankType' and O.itemdescribe is not null ").getResultList(false); for (BizObject code : codelist) { String itemname = code.getAttribute("itemname").toString().trim(); double itemdescribe = code.getAttribute("itemdescribe").getDouble(); @@ -1265,7 +1265,7 @@ public class CollectAuditInfoCacheTj { BigDecimal m = new BigDecimal(single); mutly = mutly.add(m); String bank_name = bo.getAttribute("BANK_NAME").toString(); - List codelist = JBOFactory.getFactory().getBizObjectManager(CODE_LIBRARY.CLASS_NAME).createQuery("O.codeno = 'bankType' and O.itemdescribe is not null ").getResultList(false); + List codelist = JBOFactory.getFactory().getBizObjectManager(CODE_LIBRARY.CLASS_NAME).createQuery("O.codeno = 'TjbankType' and O.itemdescribe is not null ").getResultList(false); //Êý¾Ý×ÖµäÖеÄitemdescribe×ֶδú±íÒøÐе¥±ÊÏÞ double itemdescribe = 0; boolean flag = false; @@ -1315,7 +1315,7 @@ public class CollectAuditInfoCacheTj { String acc_number = biz.getAttribute("acc_number").toString(); String account = biz.getAttribute("account").toString(); String bank_name = biz.getAttribute("BANK_NAME").toString(); - List codelist = JBOFactory.getFactory().getBizObjectManager(CODE_LIBRARY.CLASS_NAME).createQuery("O.codeno = 'bankType' and O.itemdescribe is not null ").getResultList(false); + List codelist = JBOFactory.getFactory().getBizObjectManager(CODE_LIBRARY.CLASS_NAME).createQuery("O.codeno = 'TjbankType' and O.itemdescribe is not null ").getResultList(false); double itemdescribe = 0; boolean flag = false; for (BizObject code : codelist) {