From 97ff0384cd2192d114e6a674f08826be68af9b28 Mon Sep 17 00:00:00 2001 From: tangfutang Date: Thu, 2 Jan 2020 11:28:59 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=BE=E6=AC=BE=E9=80=9A=E7=9F=A5=E4=B9=A6?= =?UTF-8?q?=E5=92=8C=E7=A7=9F=E9=87=91=E8=AE=A1=E5=88=92=E8=A1=A8=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E5=A4=9A=E4=B8=BB=E4=BD=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Comm/LBContractEnd/LoanNoticeList.jsp | 9 +++---- .../Lease/Flow/RentNotify/RentNotifyList.jsp | 5 +++- WebContent/WEB-INF/etc/jbo/jbo_calc.xml | 2 ++ .../calc/VI_LC_RENT_COLLECTION_SORTING.java | 4 ++++ .../view/vi_lc_rent_collection_sorting.sql | 3 ++- src_sql/鎶曚骇SQL/v20191228/tft_20191228.sql | 24 ++++++++++--------- 6 files changed, 30 insertions(+), 17 deletions(-) diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LBContractEnd/LoanNoticeList.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBContractEnd/LoanNoticeList.jsp index 093148269..2aceaf8b4 100644 --- a/WebContent/Tenwa/Lease/Flow/Comm/LBContractEnd/LoanNoticeList.jsp +++ b/WebContent/Tenwa/Lease/Flow/Comm/LBContractEnd/LoanNoticeList.jsp @@ -64,7 +64,8 @@ } function generateQuotation(){ var projectId=getItemValueArray(0,"ID"); - var contractNos=getItemValueArray(0,"CONTRACT_NUMBER"); + //var contractNos=getItemValueArray(0,"CONTRACT_NUMBER"); + var subjectIds=getItemValueArray(0,"SUBJECTID"); var number = 0; if(typeof(projectId)=="undefined"||projectId==null||projectId==""){alert("请选择数据");return;} for(var i=0;i + + diff --git a/src_jbo/jbo/app/tenwa/calc/VI_LC_RENT_COLLECTION_SORTING.java b/src_jbo/jbo/app/tenwa/calc/VI_LC_RENT_COLLECTION_SORTING.java index df0bc2d1e..408393927 100644 --- a/src_jbo/jbo/app/tenwa/calc/VI_LC_RENT_COLLECTION_SORTING.java +++ b/src_jbo/jbo/app/tenwa/calc/VI_LC_RENT_COLLECTION_SORTING.java @@ -57,4 +57,8 @@ public interface VI_LC_RENT_COLLECTION_SORTING{ * orgid STRING(20)
*/ public static final String orgid = "orgid"; + /** + * 主体id STRING(20)
+ */ + public static final String subjectid = "subjectid"; } \ No newline at end of file diff --git a/src_sql/view/vi_lc_rent_collection_sorting.sql b/src_sql/view/vi_lc_rent_collection_sorting.sql index 594a6d114..e303518b7 100644 --- a/src_sql/view/vi_lc_rent_collection_sorting.sql +++ b/src_sql/view/vi_lc_rent_collection_sorting.sql @@ -9,7 +9,8 @@ SELECT LCF.PAYMENT_NUMBER AS PAYMENT_NUMBER, LDA.FILENAME AS FILENAME, LDA.INPUTTIME AS CREATIME, LDA.ID AS ATTRID, - LCI.INPUTORGID AS ORGID + LCI.INPUTORGID AS ORGID, + lci.subjectid AS subjectid FROM ((((((APZL.LC_RENT_PLAN LCF LEFT JOIN APZL.LB_CONTRACT_INFO LCI ON ((LCF.CONTRACT_ID = LCI.ID))) LEFT JOIN APZL.LB_UNION_LESSEE_TRANSFER LBU ON ((LCF.CONTRACT_ID = LBU.CONTRACT_ID))) LEFT JOIN APZL.LC_CALC_CONDITION LCC ON ((LCF.PAYMENT_NUMBER = LCC.PAYMENT_NUMBER))) LEFT JOIN APZL.LB_DOCRELATIVE LDR ON (((LDR.PLAN_NUMBER = LCF.PAYMENT_NUMBER) AND (LDR.PLAN_LIST = LCF.PLAN_LIST)))) LEFT JOIN APZL.LB_DOCLIBRARY LDL ON ((LDL.RELATIVE_ID = LDR.ID))) LEFT JOIN APZL.LB_DOCATTRIBUTE LDA ON ((LDA.LIBRARY_ID = LDL.ID))) WHERE (LCF.PLAN_LIST = 1) diff --git a/src_sql/鎶曚骇SQL/v20191228/tft_20191228.sql b/src_sql/鎶曚骇SQL/v20191228/tft_20191228.sql index 54169a500..6528753e5 100644 --- a/src_sql/鎶曚骇SQL/v20191228/tft_20191228.sql +++ b/src_sql/鎶曚骇SQL/v20191228/tft_20191228.sql @@ -4,12 +4,12 @@ Insert Into Code_Library (codeno,itemno,itemname,bankno,sortno,isinuse,itemdescr 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 ('ManySubject','d989246c11c111eaaa0000163e0e11e6','安鹏融资租赁（天津）有限公司','807001003','0020','1','','','','','','','','','','','','SYS_Designer',null,'2019/11/28 17:32:04','SYS_Designer','2019/12/13 10:52:40','',''); -- 添加字段 -ALTER TABLE prd_specific_library ADD COLUMN ManySubject VARCHAR(32) NULL COMMENT '主体' AFTER GPS_VENDOR; -ALTER TABLE lb_project_info ADD COLUMN SUBJECTNAME VARCHAR(100) NULL COMMENT '主体名称' AFTER SUBJECTID; -ALTER TABLE lb_project_info_temp ADD COLUMN SUBJECTNAME VARCHAR(100) NULL COMMENT '主体名称' AFTER SUBJECTID; -ALTER TABLE lb_contract_info ADD COLUMN SUBJECTNAME VARCHAR(100) NULL COMMENT '主体名称' AFTER SUBJECTID; -ALTER TABLE lb_contract_info_temp ADD COLUMN SUBJECTNAME VARCHAR(100) NULL COMMENT '主体名称' AFTER SUBJECTID; -ALTER TABLE lb_contract_info_his ADD COLUMN SUBJECTNAME VARCHAR(100) NULL COMMENT '主体名称' AFTER SUBJECTID; +ALTER TABLE prd_specific_library ADD COLUMN ManySubject VARCHAR(32) NULL COMMENT '主体' AFTER LENDING_TYPE; +ALTER TABLE lb_project_info ADD COLUMN SUBJECTID VARCHAR(32) NULL COMMENT '主体ID' AFTER APPLICATION_NO, ADD COLUMN SUBJECTNAME VARCHAR(100) NULL COMMENT '主体名称' AFTER SUBJECTID; +ALTER TABLE lb_project_info_temp ADD COLUMN SUBJECTID VARCHAR(32) NULL COMMENT '主体ID' AFTER PROJECT_ID, ADD COLUMN SUBJECTNAME VARCHAR(100) NULL COMMENT '主体名称' AFTER SUBJECTID; +ALTER TABLE lb_contract_info ADD COLUMN SUBJECTID VARCHAR(32) NULL COMMENT '主体ID' AFTER has_gps, ADD COLUMN SUBJECTNAME VARCHAR(100) NULL COMMENT '主体名称' AFTER SUBJECTID; +ALTER TABLE lb_contract_info_temp ADD COLUMN SUBJECTID VARCHAR(32) NULL COMMENT '主体ID' AFTER TURNOUTREMARKS, ADD COLUMN SUBJECTNAME VARCHAR(100) NULL COMMENT '主体名称' AFTER SUBJECTID; +ALTER TABLE lb_contract_info_his ADD COLUMN SUBJECTID VARCHAR(32) NULL COMMENT '主体ID' AFTER TURNOUTREMARKS, ADD COLUMN SUBJECTNAME VARCHAR(100) NULL COMMENT '主体名称' AFTER SUBJECTID; -- 产品中添加主体维护 delete from awe_do_library where dono='PRD_ProductSpecificInfo01' and colindex='12460'; @@ -206,11 +206,13 @@ insert into `bf_templatelable` (`ID`, `LABLEID`, `TEMPLATEID`, `INPUTUSERID`, `I - - - - - +-- 放款通知书列表页面添加主体字段 +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 ('LoanNoticeList','1120','1120','1','lci','SUBJECTID','SUBJECTID','String','','主体id','','1','Text','1','1','','','','20','0','0','0','1','0',0,'','','','SYS_Designer','2020/01/02 09:27:39','SYS_Designer','2020/01/02 09:27:39','0','','1','','','',''); +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 ('RnetList','1110','1110','1','O','subjectid','subjectid','String','','主体id','','1','Text','1','1','','','','20','0','0','0','1','0',0,'','','','SYS_Designer','2020/01/02 10:15:27','SYS_Designer','2020/01/02 10:15:27','0','','1','','','',''); + +-- 放款通知书添加模板和导出配置 +insert into `BF_TEMPLATE` (`ID`, `SERIALNO`, `SORTNUMBER`, `TEMPLATENAME`, `TEMPLATESHOWNAME`, `TEMPLATEPATH`, `TEMPLATETYPE`, `OPERATETYPE`, `CALLBACK`, `CREATEMETHOD`, `DOCTYPE`, `ONECLASSIFY`, `TWOCLASSIFY`, `THREECLASSIFY`, `FOURCLASSIFY`, `TEMPLATEVERSION`, `STATUS`, `REMARK`, `INPUTUSERID`, `INPUTORGID`, `INPUTTIME`, `UPDATEUSERID`, `UPDATEORGID`, `UPDATETIME`, `CREATECONDITION`, `CREATESHEETCONDITION`) values('5edc6ce108494e5982c1aa0cc5c117a0',NULL,'','放款通知书','放款通知书.docx','放款通知书及放款到账确认书_天津.docx','word','create','',NULL,'030','030002','','','','1','','天津放款通知书','administrator','8009001','2019/12/31 17:12:03','administrator','8009001','2019/12/31 05:29:48','',''); +insert into `bf_templatelable` (`ID`, `LABLEID`, `TEMPLATEID`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`) values('4906a3b1041e41caac4116d145dba9ea','79c470d8ea7148d7a5318d17ebfc26fe','5edc6ce108494e5982c1aa0cc5c117a0',NULL,NULL,NULL,NULL,NULL,NULL);