农行回单修复-单行返回多行 to 陆正友

src/main/webapp/WEB-INF/classes/csh/CSH1400/csh_ocr_abc_bank.lwm

@@ -57,16 +57,8 @@
                 NULL AS payer_name_r,
                 NULL AS payer_bank_r,
                 NULL AS total_amount_r,
-                COALESCE((SELECT v.code_value_name
-                FROM sys_code_values_v           v,
-                csh_transaction_import_temp ct
-                WHERE v.code = 'DS_COLLECTION_CLASSES'
-                AND v.code_value = ct.collection_classes
-                and ct.bp_bank_name = hx.payer_name),
-                '非保证金类') AS collection_classes_desc,
-                (SELECT ct.guarantor_name_duty
-                FROM csh_transaction_import_temp ct
-                WHERE ct.bp_bank_name = hx.payer_name) guarantor_name_duty
+                null AS collection_classes_desc,
+                null guarantor_name_duty
                 FROM hlcm_ele_abc_bank_slip_trx hx
                 where hx.create_trx_flag = 'Y'
                 and not exists (select 1
@@ -127,16 +119,16 @@
                 a.payer_name payer_name_r,
                 a.bank_name payer_bank_r,
                 a.total_amount total_amount_r,
-                COALESCE((SELECT v.code_value_name
-                FROM sys_code_values_v           v,
-                csh_transaction_import_temp ct
-                WHERE v.code = 'DS_COLLECTION_CLASSES'
-                AND v.code_value = ct.collection_classes
-                and ct.bp_bank_name = hx.payer_name),
-                '非保证金类') AS collection_classes_desc,
-                (SELECT ct.guarantor_name_duty
-                FROM csh_transaction_import_temp ct
-                WHERE ct.bp_bank_name = hx.payer_name) guarantor_name_duty
+                decode(a.collection_classes_desc,
+                'DEPOSIT',
+                '保证金类',
+                'NON_DEPOSIT',
+                '非保证金类',
+                'COMBINED',
+                '混合类',
+                'REFUND',
+                '日立为优质客户付租金') AS collection_classes_desc,
+                 decode(a.guarantor_name_duty, 'Y', '是', 'N', '否') guarantor_name_duty
                 FROM hlcm_ele_abc_bank_slip_trx hx, hlcm_ele_trx_import_itfc a
                 where hx.create_trx_flag = 'Y'
                 and a.receipt_no = hx.receipt_no