diff --git a/报表/凯捷租赁报表/保证金比列报表.xml b/报表/凯捷租赁报表/保证金比列报表.xml index ef0450ae4..519223c50 100644 --- a/报表/凯捷租赁报表/保证金比列报表.xml +++ b/报表/凯捷租赁报表/保证金比列报表.xml @@ -19,14 +19,13 @@ 2c9c81b5687ebb7e016a85f20d130535 保证金比例报表 margin_ratio - REPORT_CODE_1557025393939 true 42 REPORT 2c9c81b5687ebb7e016a682764fb0404 - 2c9c81b5687ebb7e016a85f3203b053d + ff80808171959a140171bf61e4160155 @@ -43,12 +42,12 @@ IFNULL(lccs.fact_money,0) factMoney, IFNULL(ddis.CAUTION_MONEY_S,'0.00') CAUTION_MONEY_S, IFNULL(ddris.CAUTION_MONEY_S,0)-IFNULL(ddcis.CAUTION_MONEY_S,0) AS rents, -ROUND((IFNULL(vlrp.corpus_over,0) * IFNULL(di.margin_scale_set,0))/100,2)- IFNULL(di.total,0)-(IFNULL(vlrp.corpus_over,0)) AS should_money, +ROUND((IFNULL(vlrp.corpus_over,0) * IFNULL(di.margin_scale_set,0))/100- (IFNULL(dp.CAUTION_MONEY,0) -IFNULL(de.CAUTION_MONEY,0)),2) AS should_money, di.distributor_no, di.distributor_name, (IFNULL(dp.CAUTION_MONEY,0) - IFNULL(de.CAUTION_MONEY,0)) over_list, (IFNULL(vlrp.corpus_over,0)) corpus_over, -IFNULL(di.total,0)-(IFNULL(vlrp.corpus_over,0)) AS leftover_money, +round(IFNULL(di.total,0)-(IFNULL(vlrp.corpus_over,0)),2) AS leftover_money, CONCAT(CASE WHEN (di.margin_scale_set IS NULL OR di.margin_scale_set='') THEN '0.00' ELSE ROUND(di.margin_scale_set,2) END,'%') margin_scale_set, ROUND((IFNULL(vlrp.corpus_over,0) * IFNULL(di.margin_scale_set,0))/100,2) over_info, CASE WHEN (IFNULL(dp.CAUTION_MONEY,0) - IFNULL(de.CAUTION_MONEY,0)) >= (IFNULL(vlrp.corpus_over,0) * IFNULL(di.margin_scale_set,0))/100 THEN '否' ELSE '是' END AS 'polishing' @@ -69,7 +68,7 @@ LEFT JOIN (SELECT DISTRIBUTOR_ID,SUM(IFNULL(CAUTION_MONEY,0)) AS CAUTION_MONEY_S - 2c9c81b5687ebb7e016a85f300c2053c + ff80808171959a140171bf61e417015c distributor_no STRING @@ -88,7 +87,7 @@ LEFT JOIN (SELECT DISTRIBUTOR_ID,SUM(IFNULL(CAUTION_MONEY,0)) AS CAUTION_MONEY_S - 2c9c81b5687ebb7e016a85f300c20539 + ff80808171959a140171bf61e417015d distributor_name STRING @@ -107,7 +106,7 @@ LEFT JOIN (SELECT DISTRIBUTOR_ID,SUM(IFNULL(CAUTION_MONEY,0)) AS CAUTION_MONEY_S - 2c9c81b57188845c0171a181733c0001 + ff80808171959a140171bf61e4170159 total STRING @@ -126,7 +125,7 @@ LEFT JOIN (SELECT DISTRIBUTOR_ID,SUM(IFNULL(CAUTION_MONEY,0)) AS CAUTION_MONEY_S - 2c9c81b57188845c0171a1817bff0004 + ff80808171959a140171bf61e4170160 factMoney NUMBER @@ -145,7 +144,7 @@ LEFT JOIN (SELECT DISTRIBUTOR_ID,SUM(IFNULL(CAUTION_MONEY,0)) AS CAUTION_MONEY_S - 2c9c81b57188845c0171a1817bff0002 + ff80808171959a140171bf61e4170162 leftover_money NUMBER @@ -164,7 +163,7 @@ LEFT JOIN (SELECT DISTRIBUTOR_ID,SUM(IFNULL(CAUTION_MONEY,0)) AS CAUTION_MONEY_S - 2c9c81b5687ebb7e016a9035e3ce053f + ff80808171959a140171bf61e417015e corpus_over NUMBER @@ -183,7 +182,7 @@ LEFT JOIN (SELECT DISTRIBUTOR_ID,SUM(IFNULL(CAUTION_MONEY,0)) AS CAUTION_MONEY_S - 2c9c81b5687ebb7e016a85f300c2053b + ff80808171959a140171bf61e4170161 margin_scale_set STRING @@ -202,7 +201,7 @@ LEFT JOIN (SELECT DISTRIBUTOR_ID,SUM(IFNULL(CAUTION_MONEY,0)) AS CAUTION_MONEY_S - 2c9c81b5687ebb7e016a85f300c20538 + ff80808171959a140171bf61e4170157 over_info NUMBER @@ -221,7 +220,7 @@ LEFT JOIN (SELECT DISTRIBUTOR_ID,SUM(IFNULL(CAUTION_MONEY,0)) AS CAUTION_MONEY_S - 2c9c81b57188845c0171a1817bff0003 + ff80808171959a140171bf61e417015f CAUTION_MONEY_S STRING @@ -240,7 +239,7 @@ LEFT JOIN (SELECT DISTRIBUTOR_ID,SUM(IFNULL(CAUTION_MONEY,0)) AS CAUTION_MONEY_S - 2c9c81b57114bb240171294ff0690002 + ff80808171959a140171bf61e417015b rents NUMBER @@ -259,7 +258,7 @@ LEFT JOIN (SELECT DISTRIBUTOR_ID,SUM(IFNULL(CAUTION_MONEY,0)) AS CAUTION_MONEY_S - 2c9c81b5687ebb7e016a85f300c2053a + ff80808171959a140171bf61e4170156 over_list NUMBER @@ -278,7 +277,7 @@ LEFT JOIN (SELECT DISTRIBUTOR_ID,SUM(IFNULL(CAUTION_MONEY,0)) AS CAUTION_MONEY_S - 2c9c81b5687ebb7e016a904c834b0540 + ff80808171959a140171bf61e417015a polishing STRING @@ -297,7 +296,7 @@ LEFT JOIN (SELECT DISTRIBUTOR_ID,SUM(IFNULL(CAUTION_MONEY,0)) AS CAUTION_MONEY_S - 2c9c81b571a47ba00171b40fb03d0001 + ff80808171959a140171bf61e4170158 should_money NUMBER @@ -321,7 +320,7 @@ LEFT JOIN (SELECT DISTRIBUTOR_ID,SUM(IFNULL(CAUTION_MONEY,0)) AS CAUTION_MONEY_S - 2c9c81b5687ebb7e016a90539eec0541 + ff80808171959a140171bf61e4170164 distributor_no distributor_no @@ -331,7 +330,7 @@ LEFT JOIN (SELECT DISTRIBUTOR_ID,SUM(IFNULL(CAUTION_MONEY,0)) AS CAUTION_MONEY_S 0 - 2c9c81b5687ebb7e016a90545e7a0542 + ff80808171959a140171bf61e4170163 distributor_name distributor_name @@ -354,7 +353,7 @@ LEFT JOIN (SELECT DISTRIBUTOR_ID,SUM(IFNULL(CAUTION_MONEY,0)) AS CAUTION_MONEY_S - 2c9c81b5687ebb7e016a85f3203b053d + ff80808171959a140171bf61e4160155 0 0 0