From b0704d612a0e8858d2ac2293be1e2d162a734878 Mon Sep 17 00:00:00 2001
From: Arthur Egberink <arthur.egberink@aareon.nl>
Date: Fri, 10 Apr 2020 08:14:01 +0000
Subject: [PATCH] GVBA#61715 -- Importeren mandaten en vrijstellingen.

svn path=/Customer/trunk/; revision=46537
---
 GVBA/gvba.sql | 40 ++++++++++++++++++++++++++++++++--------
 1 file changed, 32 insertions(+), 8 deletions(-)

diff --git a/GVBA/gvba.sql b/GVBA/gvba.sql
index 6af3d90a8..734dd2424 100644
--- a/GVBA/gvba.sql
+++ b/GVBA/gvba.sql
@@ -863,6 +863,7 @@ CREATE OR REPLACE PACKAGE BODY gvba AS
         v_loop              NUMBER;
         v_deel_key          NUMBER;
         v_vrijstelling_nr   NUMBER;
+        v_einddatum         DATE;
 
         oracle_err_num      NUMBER;
         oracle_err_mes      VARCHAR2 (200);
@@ -899,6 +900,14 @@ CREATE OR REPLACE PACKAGE BODY gvba AS
               FROM prs_bedrijf
              WHERE prs_bedrijf_key = rec.bedrijf_key;
 
+            v_hint := 'Instellen einddatum: ' || rec.einddatum;
+            IF rec.einddatum IS NULL
+            THEN
+               v_einddatum := TO_DATE (TO_CHAR (SYSDATE, 'yy') || '1231', 'yymmdd');
+            ELSE
+               v_einddatum := TO_DATE (rec.einddatum, 'dd-mm-yyyy');
+            END IF;
+
             WHILE v_berijder_arr IS NOT NULL AND v_loop < 20
             LOOP
                 BEGIN
@@ -907,6 +916,8 @@ CREATE OR REPLACE PACKAGE BODY gvba AS
                     v_loop := v_loop + 1;
                     v_hint := 'Aanmaken mandaat: ' || v_berijder;
 
+
+
                     INSERT INTO ins_deel (ins_srtdeel_key,
                                           ins_alg_ruimte_key,
                                           ins_alg_ruimte_type,
@@ -928,8 +939,7 @@ CREATE OR REPLACE PACKAGE BODY gvba AS
                              || v_berijder,
                              641,
                              NULL,
-                             TO_DATE (TO_CHAR (SYSDATE, 'yy') || '1231',
-                                      'yymmdd'))
+                             v_einddatum)
                       RETURNING ins_deel_key
                            INTO v_deel_key;
 
@@ -999,6 +1009,14 @@ CREATE OR REPLACE PACKAGE BODY gvba AS
             v_kenteken_arr := REPLACE (v_kenteken_arr, '##', '#');
             v_loop := 1;
 
+            v_hint := 'Instellen einddatum: ' || rec.einddatum;
+            IF rec.einddatum IS NULL
+            THEN
+               v_einddatum := TO_DATE (TO_CHAR (SYSDATE, 'yy') || '1231', 'yymmdd');
+            ELSE
+               v_einddatum := TO_DATE (rec.einddatum, 'dd-mm-yyyy');
+            END IF;
+
             WHILE v_kenteken_arr IS NOT NULL AND v_loop < 20
             LOOP
                 BEGIN
@@ -1041,8 +1059,7 @@ CREATE OR REPLACE PACKAGE BODY gvba AS
                              || TO_CHAR (v_vrijstelling_nr, 'fm0000'),
                              641,
                              NULL,
-                             TO_DATE (TO_CHAR (SYSDATE, 'yy') || '1231',
-                                      'yymmdd'))
+                             v_einddatum)
                       RETURNING ins_deel_key
                            INTO v_deel_key;
 
@@ -3202,6 +3219,7 @@ BEGIN
 END;
 /
 
+-- begin gvba_export_daily_task('DAILY_TASK', 'NOW', NULL, NULL); end;
 CREATE OR REPLACE PROCEDURE gvba_export_daily_task (
    p_applname   IN   VARCHAR2,
    p_applrun    IN   VARCHAR2,
@@ -3216,7 +3234,8 @@ END;
 -- rapport tbv mandaten en vrijstellingen
 CREATE OR REPLACE VIEW gvba_v_rap_mand_vrij
 AS
-SELECT ins_srtdeel_upper,
+SELECT d.ins_deel_key,
+       ins_srtdeel_upper,
        ins_deel_omschrijving,
        prs_perslid_volnaam,
        ins_deel_vervaldatum,
@@ -3243,9 +3262,14 @@ SELECT ins_srtdeel_upper,
        (SELECT ins_kenmerkdeel_waarde
           FROM ins_kenmerkdeel kmd
          WHERE kmd.ins_deel_key = d.ins_deel_key AND kmd.ins_kenmerk_key = 61)
-           afw_contact
-  FROM ins_v_deel_gegevens d
- WHERE ins_discipline_key = 641 AND ins_deel_vervaldatum > SYSDATE;
+           afw_contact,
+       m.mld_melding_key,
+       s.mld_statuses_omschrijving
+  FROM ins_v_deel_gegevens d, mld_melding_object mo, mld_melding m, mld_statuses s
+ WHERE ins_discipline_key = 641 AND ins_deel_vervaldatum > SYSDATE
+   AND d.ins_deel_key = mo.ins_deel_key(+)
+   AND mo.mld_melding_key = m.mld_melding_key(+)
+   AND m.mld_melding_status = s.mld_statuses_key(+);
 
 ------ payload end   ------