diff --git a/WebContent/WEB-INF/etc/jbo/jbo_prd.xml b/WebContent/WEB-INF/etc/jbo/jbo_prd.xml index fb12414da..511512f54 100644 --- a/WebContent/WEB-INF/etc/jbo/jbo_prd.xml +++ b/WebContent/WEB-INF/etc/jbo/jbo_prd.xml @@ -191,7 +191,8 @@ - + + diff --git a/src_jbo/jbo/prd/VI_PRODUCTS_NUMBER.java b/src_jbo/jbo/prd/VI_PRODUCTS_NUMBER.java index 6c2fabe8f..784476461 100644 --- a/src_jbo/jbo/prd/VI_PRODUCTS_NUMBER.java +++ b/src_jbo/jbo/prd/VI_PRODUCTS_NUMBER.java @@ -53,4 +53,8 @@ public interface VI_PRODUCTS_NUMBER{ * 产品类型 STRING(20)
*/ public static final String Attribute2 = "Attribute2"; + /** + * 经销商名称 STRING(20)
+ */ + public static final String distributor_name = "distributor_name"; } \ No newline at end of file diff --git a/src_sql/view/vi_products_number.sql b/src_sql/view/vi_products_number.sql index 27d201e24..8dc23fa42 100644 --- a/src_sql/view/vi_products_number.sql +++ b/src_sql/view/vi_products_number.sql @@ -1,12 +1,11 @@ - CREATE VIEW apzl.vi_products_number AS ( -SELECT bt.TYPENO,bt.TYPENAME,psl.payType,psl.LeasForm,psl.equip_type,psl.EFFECTIVEDATE,num.INCOME_NUMBER,num.fact_money,num.fact_date,bt.Attribute2 +SELECT bt.TYPENO,bt.TYPENAME,psl.payType,psl.LeasForm,psl.equip_type,psl.EFFECTIVEDATE,num.INCOME_NUMBER,num.fact_money,num.fact_date,bt.Attribute2,di.distributor_name FROM BUSINESS_TYPE bt LEFT JOIN PRD_SPECIFIC_LIBRARY psl ON bt.typeno=psl.PRODUCTID -LEFT JOIN (SELECT lcc.INCOME_NUMBER INCOME_NUMBER,lci.product_id product_id,SUM(lfi.fact_money) fact_money,MIN(lfi.fact_date) fact_date +LEFT JOIN (SELECT lcc.INCOME_NUMBER INCOME_NUMBER,lci.product_id product_id,SUM(lfi.fact_money) fact_money,MIN(lfi.fact_date) fact_date,lci.distributor_id AS distributor_id FROM lb_contract_info lci LEFT JOIN LC_CALC_CONDITION lcc ON lci.id=lcc.contract_id LEFT JOIN lc_fund_income lfi ON lci.id=lfi.contract_id AND lfi.pay_type='pay_type_out' AND lfi.fee_type='feetype10' AND lfi.pay_status='have_paid' WHERE lci.contract_status >=31 AND lci.contract_status <=100 -GROUP BY lci.product_id,lcc.INCOME_NUMBER) num ON num.product_id=bt.typeno +GROUP BY lci.product_id,lcc.INCOME_NUMBER,lci.distributor_id) num ON num.product_id=bt.typeno LEFT JOIN distributor_info di ON di.distributor_no=num.distributor_id ); \ No newline at end of file diff --git a/src_sql/鎶曚骇SQL/V20200404/tft_20200404.sql b/src_sql/鎶曚骇SQL/V20200404/tft_20200404.sql index 45dac18ed..2deac043d 100644 --- a/src_sql/鎶曚骇SQL/V20200404/tft_20200404.sql +++ b/src_sql/鎶曚骇SQL/V20200404/tft_20200404.sql @@ -3,12 +3,12 @@ ALTER TABLE lb_equipment_car ADD COLUMN FRAME_NUMBER2 VARCHAR(100) NULL COMMENT ALTER TABLE lb_equipment_car_temp ADD COLUMN FRAME_NUMBER2 VARCHAR(100) NULL COMMENT '车架号2' AFTER FRAME_NUMBER, ADD COLUMN FRAME_NUMBER3 VARCHAR(100) NULL COMMENT '车架号3' AFTER FRAME_NUMBER2, ADD COLUMN FRAME_NUMBER4 VARCHAR(100) NULL COMMENT '车架号4' AFTER FRAME_NUMBER3; ALTER TABLE lb_equipment_car_his ADD COLUMN FRAME_NUMBER2 VARCHAR(100) NULL COMMENT '车架号2' AFTER FRAME_NUMBER, ADD COLUMN FRAME_NUMBER3 VARCHAR(100) NULL COMMENT '车架号3' AFTER FRAME_NUMBER2, ADD COLUMN FRAME_NUMBER4 VARCHAR(100) NULL COMMENT '车架号4' AFTER FRAME_NUMBER3; -- 模板添加字段 -DELETE FROM awe_do_library WHERE dono='LBEquipmentInfoTemp_Cars' AND colindex='1081'; -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 ('LBEquipmentInfoTemp_Cars','1081','1081','1','O','FRAME_NUMBER2','FRAME_NUMBER2','String','','挂车车架号1','','1','Text','1','1','','','','100','1','0','0','1','0',0,'','0010','','SYS_Designer','2020/03/12 13:54:39','SYS_Designer','2020/04/13 08:59:43','0','','1','','','',''); -DELETE FROM awe_do_library WHERE dono='LBEquipmentInfoTemp_Cars' AND colindex='1082'; -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 ('LBEquipmentInfoTemp_Cars','1082','1082','1','O','FRAME_NUMBER3','FRAME_NUMBER3','String','','挂车车架号2','','1','Text','1','1','','','','100','1','0','0','1','0',0,'','0010','','SYS_Designer','2020/03/12 13:54:39','SYS_Designer','2020/04/13 08:59:43','','','1','','','',''); -DELETE FROM awe_do_library WHERE dono='LBEquipmentInfoTemp_Cars' AND colindex='1083'; -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 ('LBEquipmentInfoTemp_Cars','1083','1083','1','O','FRAME_NUMBER4','FRAME_NUMBER4','String','','挂车车架号3','','1','Text','1','1','','','','100','1','0','0','1','0',0,'','0010','','SYS_Designer','2020/03/12 13:54:39','SYS_Designer','2020/04/13 08:59:43','','','1','','','',''); +delete from awe_do_library where dono='LBEquipmentInfoTemp_Cars' and colindex='1081'; +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 ('LBEquipmentInfoTemp_Cars','1081','1081','1','O','FRAME_NUMBER2','FRAME_NUMBER2','String','','挂车车架号','','1','Text','1','1','','','','100','1','0','0','1','0',0,'','0010','','SYS_Designer','2020/03/12 13:54:39','SYS_Designer','2020/04/17 16:34:48','0','','1','','','',''); +delete from awe_do_library where dono='LBEquipmentInfoTemp_Cars' and colindex='1082'; +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 ('LBEquipmentInfoTemp_Cars','1082','1082','1','O','FRAME_NUMBER3','FRAME_NUMBER3','String','','挂车车架号2','','1','Text','1','1','','','','100','0','0','0','1','0',0,'','0010','','SYS_Designer','2020/03/12 13:54:39','SYS_Designer','2020/04/17 16:34:48','','','1','','','',''); +delete from awe_do_library where dono='LBEquipmentInfoTemp_Cars' and colindex='1083'; +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 ('LBEquipmentInfoTemp_Cars','1083','1083','1','O','FRAME_NUMBER4','FRAME_NUMBER4','String','','挂车车架号3','','1','Text','1','1','','','','100','0','0','0','1','0',0,'','0010','','SYS_Designer','2020/03/12 13:54:39','SYS_Designer','2020/04/17 16:34:48','','','1','','','',''); -- 创建业务申请初审记录表 CREATE TABLE business_apply_userinfo ( @@ -265,6 +265,7 @@ Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualn 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 ('ProductsBusinessList','1310','1310','1','','com.amarsoft.awe.dw.ui.list.ProductsBusinessListUtil.getProductISIncidental(TYPENO)','ISincidentals','String','','杂费（是否参融）','','1','Select','1','1','Code','DeleteFlag','',null,'1','0','0','1','0',0,'','','','SYS_Designer','2020/04/15 11:02:26','SYS_Designer','2020/04/15 11:08:53','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 ('ProductsBusinessList','1320','1320','1','O','EFFECTIVEDATE','EFFECTIVEDATE','String','','生效日期','','1','Text','1','1','','','','10','1','0','0','1','0',0,'','','','SYS_Designer','2020/04/12 16:39:35','SYS_Designer','2020/04/15 10:54:41','','','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 ('ProductsBusinessList','1340','1340','1','O','fact_date','fact_date','String','','初次投放时间','','1','Text','1','1','','','',null,'1','0','0','1','0',0,'','','','SYS_Designer','2020/04/12 16:38:11','SYS_Designer','2020/04/15 10:55:02','','','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 ('ProductsBusinessList','1350','1350','1','O','distributor_name','distributor_name','String','','经销商名称','','1','Text','1','1','','','','20','1','0','0','1','0',0,'','','','SYS_Designer','2020/04/21 21:32:54','SYS_Designer','2020/04/21 21:33:32','','','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 ('ProductsBusinessList','1360','1360','1','O','fact_money','fact_money','String','','产品投放金额','','1','Text','2','1','','','',null,'1','0','0','1','0',0,'','','','SYS_Designer','2020/04/12 16:38:11','SYS_Designer','2020/04/15 10:56:41','0','','1','','','',''); -- 添加对应的菜单 Insert Into AWE_MENU_INFO (menuid,menuname,displayname,sortno,url,urlparam,target,style,isinuse,remark,inputorgid,inputuserid,inputtime,updateorgid,updateuserid,updatetime,accesstype,icon,appicon) Values ('9600100313','产品管理报表','产品管理报表','9600100313','/ProductManage/ProductsBusinessList.jsp','','_self','','1','',null,'SYS_Designer','2020/04/12 16:09:26',null,'SYS_Designer','2020/04/12 16:09:26','10','','');