diff --git a/WebContent/WEB-INF/etc/jbo/jbo_calc.xml b/WebContent/WEB-INF/etc/jbo/jbo_calc.xml index 3f897b613..d87721d04 100644 --- a/WebContent/WEB-INF/etc/jbo/jbo_calc.xml +++ b/WebContent/WEB-INF/etc/jbo/jbo_calc.xml @@ -3361,6 +3361,7 @@ + diff --git a/src_jbo/jbo/app/tenwa/calc/VI_ACTUAL_FUND_PLAN.java b/src_jbo/jbo/app/tenwa/calc/VI_ACTUAL_FUND_PLAN.java index 54805111d..155993921 100644 --- a/src_jbo/jbo/app/tenwa/calc/VI_ACTUAL_FUND_PLAN.java +++ b/src_jbo/jbo/app/tenwa/calc/VI_ACTUAL_FUND_PLAN.java @@ -89,4 +89,8 @@ public interface VI_ACTUAL_FUND_PLAN{ * ʽ STRING(20)
*/ public static final String payType = "payType"; + /** + * STRING(20)
+ */ + public static final String subjectName = "subjectName"; } \ No newline at end of file diff --git a/src_sql/view/lc_fund_income_temp_hxm.sql b/src_sql/view/lc_fund_income_temp_hxm.sql index 024d2e85c..281756847 100644 --- a/src_sql/view/lc_fund_income_temp_hxm.sql +++ b/src_sql/view/lc_fund_income_temp_hxm.sql @@ -6,9 +6,9 @@ create view lc_fund_income_temp_hxm as SELECT DI.DISTRIBUTOR_NO AS DISTRIBUTOR DA.OPEN_BANK AS DA_BANK, DA.PROVINCEINFO AS PROVINCEINFO, DA.DISTRICT AS DISTRICT, - OA.ACC_BANK AS ACC_BANK, - OA.ACC_NAME AS ACC_NAME, - OA.ACC_NUMBER AS ACC_NUMBER, + LC.BANK AS ACC_BANK, + LC.ACCOUNT AS ACC_NAME, + LC.ACC_NUMBER AS ACC_NUMBER, LC.SMONEY AS SMONEY, LC.SCOUNT AS SCOUNT, CT.REQSTS AS REQSTS, @@ -17,21 +17,17 @@ create view lc_fund_income_temp_hxm as SELECT DI.DISTRIBUTOR_NO AS DISTRIBUTOR CT.RTNNAR AS RTNNAR, LC.IS_FLOWING AS IS_FLOWING, LC.PAYTYPE AS PAYTYPE -FROM ((((APZL.DISTRIBUTOR_INFO DI JOIN APZL.DISTRIBUTOR_ACCOUNT DA ON (((DI.DISTRIBUTOR_NO = DA.DISTRIBUTOR_ID) AND (DA.IS_MAIN = 'Y')))) JOIN ( - SELECT APZL.OWN_ACCOUNT.ACC_BANK AS ACC_BANK, APZL.OWN_ACCOUNT.ACC_NAME AS ACC_NAME, APZL.OWN_ACCOUNT.ACC_NUMBER AS ACC_NUMBER - FROM (APZL.OWN_ACCOUNT - LEFT JOIN APZL.OWN_INFO OI ON ((APZL.OWN_ACCOUNT.OWN_ID = OI.OWN_NUMBER))) - WHERE ((APZL.OWN_ACCOUNT.STATE_ = '0010') AND (OI.OWN_NAME = '安鹏国际融资租赁（深圳）有限公司') AND (APZL.OWN_ACCOUNT.ACC_TYPE = '0010') AND - ((APZL.OWN_ACCOUNT.ACCOUNT_TYPE = 'out_account') OR (APZL.OWN_ACCOUNT.ACCOUNT_TYPE = 'inAndOut_account')) AND - (APZL.OWN_ACCOUNT.FBSDK = 'Y') AND (APZL.OWN_ACCOUNT.MONEY_TYPE = '01')) -) OA) JOIN ( +FROM ((((APZL.DISTRIBUTOR_INFO DI JOIN APZL.DISTRIBUTOR_ACCOUNT DA ON (((DI.DISTRIBUTOR_NO = DA.DISTRIBUTOR_ID) AND (DA.IS_MAIN = 'Y')))) ) JOIN ( SELECT LFIT.FLOWUNID AS FLOWUNID, LCI.DISTRIBUTOR_ID AS DISTRIBUTOR_ID, LFIT.IS_FLOWING AS IS_FLOWING, PSL.PAYTYPE AS PAYTYPE, - sum(LFIT.FACT_MONEY) AS SMONEY, - count(LFIT.CONTRACT_ID) AS SCOUNT - FROM ((APZL.LB_CONTRACT_INFO LCI LEFT JOIN APZL.PRD_SPECIFIC_LIBRARY PSL ON ((convert(LCI.PRODUCT_ID USING UTF8) = PSL.PRODUCTID))) + SUM(LFIT.FACT_MONEY) AS SMONEY, + COUNT(LFIT.CONTRACT_ID) AS SCOUNT, + LFIT.BANK AS BANK , + LFIT.ACCOUNT AS ACCOUNT , + LFIT.ACC_NUMBER AS ACC_NUMBER + FROM ((APZL.LB_CONTRACT_INFO LCI LEFT JOIN APZL.PRD_SPECIFIC_LIBRARY PSL ON ((CONVERT(LCI.PRODUCT_ID USING UTF8) = PSL.PRODUCTID))) JOIN APZL.LC_FUND_INCOME_TEMP LFIT ON (((LCI.ID = LFIT.CONTRACT_ID) AND (LFIT.PAY_TYPE = 'pay_type_out') AND (LFIT.PAY_STATUS = 'apply_pass') AND (LFIT.ROLL_BACK = '0')))) GROUP BY LCI.DISTRIBUTOR_ID, LFIT.FLOWUNID diff --git a/src_sql/view/vi_actual_fund_plan.sql b/src_sql/view/vi_actual_fund_plan.sql index e1a482211..5afda66ff 100644 --- a/src_sql/view/vi_actual_fund_plan.sql +++ b/src_sql/view/vi_actual_fund_plan.sql @@ -22,7 +22,8 @@ create view vi_actual_fund_plan as SELECT LCI.ID LCI.PROJECT_ID AS PROJECT_ID, ( SELECT sum(`nvl`(VLFP.OVERMONEY, 0)) FROM APZL.VI_LC_FUND_PLAN VLFP WHERE (VLFP.CONTRACT_ID = LCI.ID) - ) AS OVERMONEY + ) AS OVERMONEY, + lci.subjectname AS subjectName FROM ((((((((((APZL.LB_CONTRACT_INFO LCI LEFT JOIN APZL.PRD_SPECIFIC_LIBRARY PSL ON ((convert(LCI.PRODUCT_ID USING UTF8) = PSL.PRODUCTID))) LEFT JOIN APZL.LB_UNION_LESSEE LUL ON (((LUL.CONTRACT_ID = LCI.ID) AND (LUL.IS_MAIN = 'Y')))) LEFT JOIN APZL.LC_FUND_INCOME LFI ON (( (LFI.CONTRACT_ID = LCI.ID) AND (LFI.FEE_TYPE = 'feetype10') AND (LFI.SETTLE_METHOD <> 'settlemethod11')))) LEFT JOIN APZL.DISTRIBUTOR_RECEIVABLES DR ON ((DR.CONTRACT_ID = LCI.ID))) LEFT JOIN APZL.DISTRIBUTOR_INFO DI ON (((DI.ID = LFI.FACT_OBJECT) AND ((CASE WHEN (DR.ISRENTER = 'Y') THEN 2 ELSE 1 END) = 1)))) LEFT JOIN APZL.CUSTOMER_INFO CI ON (( diff --git a/src_sql/投产SQL/v20200102/tft_20200102.sql b/src_sql/投产SQL/v20200102/tft_20200102.sql index 42c70fb5d..b3eccde81 100644 --- a/src_sql/投产SQL/v20200102/tft_20200102.sql +++ b/src_sql/投产SQL/v20200102/tft_20200102.sql @@ -254,4 +254,5 @@ 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 ('ViLcReviewAuditRentPlanList','1430','1430','1','O','SUBJECTID','SUBJECTID','String','','id','','1','Text','1','1','','','','20','0','0','0','1','0',0,'','','','SYS_Designer','2020/01/08 14:27:44','SYS_Designer','2020/01/08 14:27:54','0','','1','','','',''); -- ޸IJƷʷ UPDATE PRD_SPECIFIC_LIBRARY SET ManySubject='aa740e4111c111eaaa0000163e0e11e6' WHERE ManySubject IS 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 ('VIActualFundPlan','1005','1005','1','O','subjectName','subjectName','String','','','','1','Text','1','1','','','','20','1','1','0','1','1',0,'','','','SYS_Designer','2020/01/10 15:33:39','SYS_Designer','2020/01/10 15:34:23','0','','1','','','','');