月结报表修改

src/main/webapp/WEB-INF/classes/rpt/RPT5012/rpt5012_csh_result_query.lwm

@@ -24,7 +24,7 @@
                                  t.bp_id_agent_level1)                           agent_extra_name,
                           to_char(t.lease_start_date,
                                   'yyyy-mm-dd')                                  lease_start_date,
-                          ccli.machine_number,
+                           nvl(ccli.machine_number,ccli.machine_number_70) machine_number,
                           ccli.modelcd,
                         (CASE
                         WHEN ccc.cf_item = 8 THEN

src/main/webapp/WEB-INF/classes/rpt/RPT5012/rpt5012_result_query.lwm

@@ -25,7 +25,7 @@
                 FROM con_contract_lease_item ccli
                 WHERE ccli.contract_id = ct.contract_id) modelcd,
                 --机型
-                (SELECT i.machine_number
+                (SELECT nvl(i.machine_number,i.machine_number_70)
                 FROM con_contract_lease_item i
                 WHERE i.contract_id = ct.contract_id
                 AND i.equipment_type = 'MAIN') machine_number,