freeze 2024

app/Controllers/Kewilayahan/IdentAktifitasHasil/IdentifikasiLapangan.php

@@ -7,7 +7,7 @@ use App\Libraries\KpdlLibrary;
 class IdentifikasiLapangan extends \App\Controllers\Kewilayahan\Kytp
 {
 
-    protected function dataKpdl($request, $bulan)
+    protected function dataKpdl($request, $bulan, $tahun)
     {
         $Ald      = new AldLibrary;
         $username = session('nip');
@@ -43,8 +43,8 @@ class IdentifikasiLapangan extends \App\Controllers\Kewilayahan\Kytp
                 ->join('PEGAWAI C', 'NIP_AR_ZONA = C.NIP9', 'left')
                 ->join('KPDL_MV_OBJEK_PERSUBJEK D', 'A.ID_KPDL_SUBJEK = D.ID_KPDL_SUBJEK', 'left')
                 ->join('PEGAWAI E', 'NIP_AR_PENGAMPU = E.NIP9', 'left')
-                ->where("TO_CHAR(CREATION_DATE, 'YYYY') =", date('Y'))
+                ->where("TO_CHAR(CREATION_DATE, 'YYYY') =", $tahun)
-                ->where("TO_CHAR(CREATION_DATE,'MM') <=", date('m'))
+                ->where("TO_CHAR(CREATION_DATE,'MM') <=", 12)
                 ->groupBy("TO_CHAR(CREATION_DATE,'MM')");
 
             if ($opsiWilZona == 'wilayah') {
@@ -151,7 +151,7 @@ class IdentifikasiLapangan extends \App\Controllers\Kewilayahan\Kytp
             return $KpdlLibrary->single_array($data->get()->getResult(), 'JML');
 
         } else {
-            $tgl_format  = date('Y') . '-' . $bulan . '-' . '01';
+            $tgl_format  = $tahun . '-' . $bulan . '-' . '01';
             $generateTgl = "SELECT TO_CHAR(LAST_DAY(to_date('" . $tgl_format . "','YYYY-MM-DD')) - level + 1,'DD') AS TGL
                                 FROM
                                 dual
@@ -159,7 +159,7 @@ class IdentifikasiLapangan extends \App\Controllers\Kewilayahan\Kytp
 
             $data = $db->table('KPDL_MV_LOKASI_SUBJEK A')
                 ->select("TO_CHAR(CREATION_DATE,'DD') as TGL, COUNT(1) JML")
-                ->where("to_char(CREATION_DATE,'YYYY') = ", date('Y'))
+                ->where("to_char(CREATION_DATE,'YYYY') = ", $tahun)
                 ->where("to_char(CREATION_DATE,'MM') = " . $bulan)
                 ->groupBy("TO_CHAR(CREATION_DATE,'DD')");
 
@@ -270,10 +270,10 @@ class IdentifikasiLapangan extends \App\Controllers\Kewilayahan\Kytp
         }
     }
 
-    protected function generateSeries($bulan)
+    protected function generateSeries($bulan, $tahun)
     {
         $db          = \Config\Database::connect();
-        $tgl_format  = date('Y') . '-' . $bulan . '-' . '01';
+        $tgl_format  = $tahun . '-' . $bulan . '-' . '01';
         $generateTgl = $db->query("SELECT TO_CHAR(LAST_DAY(to_date('" . $tgl_format . "','YYYY-MM-DD')) - level + 1,'DD') AS TGL
                     FROM
                     dual
@@ -309,9 +309,9 @@ class IdentifikasiLapangan extends \App\Controllers\Kewilayahan\Kytp
 
         $selectedBulan = $Ald->decryptKpdl($request->selectedBulan ?? '', $username) ?? 'semua'; // 1 - 12 / semua
         $query         = $request->query; //bulan (1-12) / tanggal (1-31)
-
+        $tahun         = 2024;
-        $opsiWilZona = $Ald->decryptMe($request->opsiWilZona ?? '', $username);
+        $opsiWilZona   = $Ald->decryptMe($request->opsiWilZona ?? '', $username);
-        $adm4_pcode  = [];
+        $adm4_pcode    = [];
         foreach ($request->adm4_pcode ?? [] as $key => $value) {
             $adm4_pcode[] = $Ald->decryptKpdl($value, $username);
         }
@@ -433,7 +433,7 @@ class IdentifikasiLapangan extends \App\Controllers\Kewilayahan\Kytp
             $data->whereIn('NIP_AR_PENGAMPU', $nip_ar_pengampu);
         }
 
-        $data->where("TO_CHAR(CREATION_DATE,'YYYY')", date('Y'));
+        $data->where("TO_CHAR(CREATION_DATE,'YYYY')", $tahun);
 
         if ($selectedBulan == 'semua') {
             $data->where("TO_CHAR(CREATION_DATE,'MM')", sprintf("%02d", $query));

app/Controllers/Kewilayahan/IdentAktifitasHasil/PerubahanPerilaku/Perubahan.php

@@ -8,9 +8,9 @@ class Perubahan extends \App\Controllers\Kewilayahan\Kytp
 {
     protected function dataPerilakuPembayaran($request)
     {
-        $Ald      = new AldLibrary;
+        $Ald         = new AldLibrary;
-        $username = session('nip');
+        $username    = session('nip');
-
+        $tahun       = 2024;
         $opsiWilZona = $Ald->decryptMe($request->getPost('opsiWilZona'), $username);
         $adm4_pcode  = [];
         foreach ($request->getPost('adm4_pcode') ?? [] as $key => $value) {
@@ -37,7 +37,9 @@ class Perubahan extends \App\Controllers\Kewilayahan\Kytp
         $npwp        = $db->table('KPDL_MV_LOKASI_SUBJEK A')
             ->select('COUNT(DISTINCT A.NPWP) as JML_WP')
             ->join('KPDL_MV_PEMBAYARAN_PERTAMA B', "A.NPWP = B.NPWP AND A.CREATION_DATE<= B.TGL_BYR", 'inner')
-            ->where('A.JUMLAH_PEMBAYARAN_THN_TERAKHIR >', 0);
+            ->where('EXTRACT (YEAR FROM A.creation_date) <=', $tahun)
+            ->where('EXTRACT (YEAR FROM B.TGL_BYR) =', $tahun);
+        //->where('A.JUMLAH_PEMBAYARAN_THN_TERAKHIR >', 0);
 
         if ($opsiWilZona == 'wilayah') {
             $npwp = $npwp->whereIn('ADM4_PCODE', $adm4_pcode);
@@ -162,13 +164,15 @@ class Perubahan extends \App\Controllers\Kewilayahan\Kytp
         foreach ($request->getPost('nip_ar_pengampu') ?? [] as $key => $value) {
             $nip_ar_pengampu[] = $Ald->decryptMe($value, $username);
         }
-
+        $tahun       = 2024;
         $db          = \Config\Database::connect();
         $KpdlLibrary = new KpdlLibrary;
         $npwp        = $db->table('KPDL_MV_LOKASI_SUBJEK A')
             ->select('A.NPWP, A.JUMLAH_PEMBAYARAN_THN_TERAKHIR')->distinct()
             ->join('KPDL_MV_PEMBAYARAN_PERTAMA B', "A.NPWP = B.NPWP AND A.CREATION_DATE<= B.TGL_BYR", 'inner')
-            ->where('A.JUMLAH_PEMBAYARAN_THN_TERAKHIR >', 0);
+            ->where('EXTRACT (YEAR FROM A.creation_date) <=', $tahun)
+            ->where('EXTRACT (YEAR FROM B.TGL_BYR) =', $tahun);
+        // ->where('A.JUMLAH_PEMBAYARAN_THN_TERAKHIR >', 0);
 
         if ($opsiWilZona == 'wilayah') {
             $npwp = $npwp->whereIn('ADM4_PCODE', $adm4_pcode);
@@ -295,12 +299,14 @@ class Perubahan extends \App\Controllers\Kewilayahan\Kytp
         foreach ($request->getPost('nip_ar_pengampu') ?? [] as $key => $value) {
             $nip_ar_pengampu[] = $Ald->decryptMe($value, $username);
         }
-
+        $tahun       = 2024;
         $db          = \Config\Database::connect();
         $KpdlLibrary = new KpdlLibrary;
         $npwp        = $db->table('KPDL_MV_LOKASI_SUBJEK A')
             ->select('COUNT(DISTINCT A.NPWP) as JML_WP')
-            ->join('KPDL_MV_SPT_TAHUNAN_PERTAMA B', "A.NPWP = B.NPWP AND A.CREATION_DATE<= B.TGL_TERIMA", 'inner');
+            ->join('KPDL_MV_SPT_TAHUNAN_PERTAMA B', "A.NPWP = B.NPWP AND A.CREATION_DATE<= B.TGL_TERIMA", 'inner')
+        //tambahan
+            ->where('EXTRACT (YEAR FROM A.creation_date) <=', $tahun);
 
         if ($opsiWilZona == 'wilayah') {
             $npwp = $npwp->whereIn('ADM4_PCODE', $adm4_pcode);
@@ -425,12 +431,13 @@ class Perubahan extends \App\Controllers\Kewilayahan\Kytp
         foreach ($request->getPost('nip_ar_pengampu') ?? [] as $key => $value) {
             $nip_ar_pengampu[] = $Ald->decryptMe($value, $username);
         }
-
+        $tahun       = 2024;
         $db          = \Config\Database::connect();
         $KpdlLibrary = new KpdlLibrary;
         $npwp        = $db->table('KPDL_MV_LOKASI_SUBJEK A')
             ->select('COUNT(A.NO_IDENTITAS) as JML_WP')
-            ->join('KPDL_MV_PENDAFTARAN_PERTAMA B', "A.NO_IDENTITAS = B.NO_IDENTITAS AND A.CREATION_DATE <= B.TGL_DAFTAR", 'inner');
+            ->join('KPDL_MV_PENDAFTARAN_PERTAMA B', "A.NO_IDENTITAS = B.NO_IDENTITAS AND A.CREATION_DATE <= B.TGL_DAFTAR", 'inner')
+            ->where('EXTRACT (YEAR FROM A.creation_date) <=', $tahun);
 
         if ($opsiWilZona == 'wilayah') {
             $npwp = $npwp->whereIn('ADM4_PCODE', $adm4_pcode);

app/Controllers/Kewilayahan/Kytp.php

@@ -69,8 +69,10 @@ class Kytp extends Controller
         $Ald      = new AldLibrary;
         $username = session('nip');
 
-        $tahun             = $Ald->decryptMe($this->request->getPost('tahun'), $username) ?? date('Y');
+        // $tahun             = $Ald->decryptMe($this->request->getPost('tahun'), $username) ?? date('Y');
-        $bulan             = $Ald->decryptMe($this->request->getPost('bulan'), $username) ?? date('m');
+        // $bulan             = $Ald->decryptMe($this->request->getPost('bulan'), $username) ?? date('m');
+        $tahun             = 2024;
+        $bulan             = 12;
         $sebaranPembayaran = new Pembayaran;
 
         $dataReturn['dataC']    = $sebaranPembayaran->dataC($this->request, $tahun, $bulan);
@@ -92,8 +94,10 @@ class Kytp extends Controller
     {
         $Ald      = new AldLibrary;
         $username = session('nip');
-        $tahun    = $Ald->decryptMe($this->request->getPost('tahun'), $username) ?? date('Y');
+        // $tahun    = $Ald->decryptMe($this->request->getPost('tahun'), $username) ?? date('Y');
-        $bulan    = $Ald->decryptMe($this->request->getPost('bulan'), $username) ?? date('m');
+        // $bulan    = $Ald->decryptMe($this->request->getPost('bulan'), $username) ?? date('m');
+        $tahun = 2024;
+        $bulan = 12;
 
         $sebaran = new PayComp;
 
@@ -109,8 +113,10 @@ class Kytp extends Controller
         $Ald      = new AldLibrary;
         $username = session('nip');
 
-        $tahun = $Ald->decryptMe($this->request->getPost('tahun'), $username) ?? date('Y');
+        // $tahun = $Ald->decryptMe($this->request->getPost('tahun'), $username) ?? date('Y');
-        $bulan = $Ald->decryptMe($this->request->getPost('bulan'), $username) ?? date('m');
+        // $bulan = $Ald->decryptMe($this->request->getPost('bulan'), $username) ?? date('m');
+        $tahun = 2024;
+        $bulan = 12;
 
         $sebaran            = new Sof;
         $dataReturn['data'] = $sebaran->dataC($this->request, $tahun, $bulan);
@@ -182,13 +188,14 @@ class Kytp extends Controller
 
         $sebaran            = new IdentifikasiLapangan;
         $bulan              = $Ald->decryptMe($this->request->getPost('bulan'), $username) ?? 'semua';
-        $dataReturn['kpdl'] = $sebaran->dataKpdl($this->request, $bulan);
+        $tahun              = 2024;
+        $dataReturn['kpdl'] = $sebaran->dataKpdl($this->request, $bulan, $tahun);
 
         $dataReturn['categories'] = ["Jan", "Feb", "Mar", "Apr", "Mei", "Jun", "Jul", "Agu", "Sep", "Okt", "Nov", "Des"];
         if ($bulan == 'semua') {
             $dataReturn['categories'] = ["Jan", "Feb", "Mar", "Apr", "Mei", "Jun", "Jul", "Agu", "Sep", "Okt", "Nov", "Des"];
         } else {
-            $dataReturn['categories'] = $sebaran->generateSeries($bulan);
+            $dataReturn['categories'] = $sebaran->generateSeries($bulan, $tahun);
         }
 
         $arr_data_akum_dikenali = array();
@@ -215,7 +222,9 @@ class Kytp extends Controller
         $sebaran           = new Perubahan;
         $sebaranPembayaran = new Pembayaran;
 
-        $dataReturn['dataC']            = $sebaranPembayaran->dataC($this->request, date('Y'), date('m'));
+        $tahun                          = 2024;
+        $bulan                          = 12;
+        $dataReturn['dataC']            = $sebaranPembayaran->dataC($this->request, $tahun, $bulan);
         $dataReturn['pembayaran']       = $sebaran->dataPerilakuPembayaran($this->request);
         $dataReturn['pembayaranRupiah'] = $sebaran->dataPerilakuPembayaranRupiah($this->request);
         $dataReturn['pelaporan']        = $sebaran->dataPerilakuPelaporan($this->request);

app/Controllers/Kewilayahan/Sebaran/Identifikasi.php

@@ -11,7 +11,12 @@ class Identifikasi extends \App\Controllers\Kewilayahan\Kytp
         $username = session('nip');
 
         $opsiWilZona = $Ald->decryptMe($request->getPost('opsiWilZona'), $username);
-        $adm4_pcode  = [];
+
+        $tahun = 2024;
+        // $tahun = $Ald->decryptMe(($this->request->getPost('tahun') ?? ''), $username) ?? '2024';
+        //$bulan    = $Ald->decryptMe($this->request->getPost('bulan'), $username) ?? date('m');
+
+        $adm4_pcode = [];
         foreach ($request->getPost('adm4_pcode') ?? [] as $key => $value) {
             $adm4_pcode[] = $Ald->decryptKpdl($value, $username);
         }
@@ -34,6 +39,7 @@ class Identifikasi extends \App\Controllers\Kewilayahan\Kytp
         $db = \Config\Database::connect();
 
         $npwp = $db->table('KPDL_MV_LOKASI_SUBJEK A')->select("CASE WHEN (A.NPWP IS NULL) THEN 'NON NPWP' ELSE 'BER NPWP' END AS IDENTIFIKASI, count(1) JML", false)
+            ->where('EXTRACT (YEAR FROM creation_date) <=', $tahun)
             ->groupBy("CASE WHEN (A.NPWP IS NULL) THEN 'NON NPWP' ELSE 'BER NPWP' END");
 
         if ($opsiWilZona == 'wilayah') {
@@ -197,8 +203,9 @@ class Identifikasi extends \App\Controllers\Kewilayahan\Kytp
         $filters      = json_decode($this->request->getGet('filters')); //     [{"id":"MERK_USAHA","value":"toko"},{"id":"ALAMAT","value":"graha"}]
         $sorting      = json_decode($this->request->getGet('sorting')); //    [{"id":"ALAMAT","desc":false}]
 
-        $db   = \Config\Database::connect();
+        $db    = \Config\Database::connect();
-        $data = $db->table('KPDL_MV_LOKASI_SUBJEK A');
+        $tahun = 2024;
+        $data  = $db->table('KPDL_MV_LOKASI_SUBJEK A')->where('EXTRACT (YEAR FROM A.creation_date) <=', $tahun);
         $data->join('KPDL_REF_STATUS_SPT', 'ID_STATUS_SPT = STATUS_SPT_TAHUNAN_TERAKHIR', 'left');
         $data->join('PEGAWAI C', 'NIP_AR_ZONA = C.NIP9', 'left');
         $data->join('KPDL_MV_OBJEK_PERSUBJEK D', 'A.ID_KPDL_SUBJEK = D.ID_KPDL_SUBJEK', 'left');

app/Controllers/Kewilayahan/Sebaran/JenisStatus.php

@@ -7,9 +7,9 @@ class JenisStatus extends \App\Controllers\Kewilayahan\Kytp
 {
     protected function data($request, $jenisOrStatus)
     {
-        $Ald      = new AldLibrary;
+        $Ald         = new AldLibrary;
-        $username = session('nip');
+        $username    = session('nip');
-
+        $tahun       = 2024;
         $opsiWilZona = $Ald->decryptMe($request->getPost('opsiWilZona'), $username);
         $adm4_pcode  = [];
         foreach ($request->getPost('adm4_pcode') ?? [] as $key => $value) {
@@ -47,7 +47,7 @@ class JenisStatus extends \App\Controllers\Kewilayahan\Kytp
         }
 
         $npwp = $db->table('KPDL_MV_LOKASI_SUBJEK A')->select($kolom . ", count(DISTINCT A.NPWP) JML", false)
-            ->where($kolom . " IS NOT NULL")
+            ->where($kolom . " IS NOT NULL")->where('EXTRACT (YEAR FROM A.creation_date) <=', $tahun)
             ->groupBy($kolom);
 
         if ($opsiWilZona == 'wilayah') {
@@ -216,10 +216,12 @@ class JenisStatus extends \App\Controllers\Kewilayahan\Kytp
         $filters      = json_decode($this->request->getGet('filters')); //     [{"id":"MERK_USAHA","value":"toko"},{"id":"ALAMAT","value":"graha"}]
         $sorting      = json_decode($this->request->getGet('sorting')); //    [{"id":"ALAMAT","desc":false}]
 
+        $tahun = 2024;
+
         $db   = \Config\Database::connect();
         $data = $db->table('KPDL_MV_LOKASI_SUBJEK A')->distinct()->select('A.NPWP, A.NAMA_WP, A.ALAMAT_MFWP, A.KELURAHAN_MFWP, A.KECAMATAN_MFWP, A.KOTA_MFWP, A.PROPINSI_MFWP,
             A.KPPADM_MFWP, A.NAMA_AR_MFWP, A.FLAG_WPS_WPK, A.STATUS_WP_MFWP, A.JNS_WP_MFWP, A.STATUS_SPT_TAHUNAN_TERAKHIR,
-            A.TGL_DAFTAR,JUMLAH_PEMBAYARAN_THN_TERAKHIR')->where('A.NPWP IS NOT NULL');
+            A.TGL_DAFTAR,JUMLAH_PEMBAYARAN_THN_TERAKHIR')->where('A.NPWP IS NOT NULL')->where('EXTRACT (YEAR FROM A.creation_date) <=', $tahun);
 
         if ($opsiWilZona == 'wilayah') {
             $data->whereIn('ADM4_PCODE', $adm4_pcode);

app/Controllers/Kewilayahan/Sebaran/KLU.php

@@ -7,9 +7,9 @@ class KLU extends \App\Controllers\Kewilayahan\Kytp
 {
     protected function data($request, $jenischart)
     {
-        $Ald      = new AldLibrary;
+        $Ald         = new AldLibrary;
-        $username = session('nip');
+        $username    = session('nip');
-
+        $tahun       = 2024;
         $opsiWilZona = $Ald->decryptMe($request->getPost('opsiWilZona'), $username);
         $adm4_pcode  = [];
         foreach ($request->getPost('adm4_pcode') ?? [] as $key => $value) {
@@ -33,7 +33,7 @@ class KLU extends \App\Controllers\Kewilayahan\Kytp
 
         $db   = \Config\Database::connect();
         $npwp = $db->table('KPDL_MV_LOKASI_SUBJEK A')->select("A.NPWP, NVL(KD_GOLPOK,'ZZ') KD_GOLPOK, NVL(NM_GOLPOK,'TIDAK DIKETAHUI') NM_GOLPOK, NVL(JUMLAH_PEMBAYARAN_THN_TERAKHIR,0) JUMLAH_PEMBAYARAN_THN_TERAKHIR")->distinct()
-            ->where('A.NPWP IS NOT NULL'); //default jenis chart = kluterdaftar
+            ->where('A.NPWP IS NOT NULL')->where('EXTRACT (YEAR FROM A.creation_date) <=', $tahun); //default jenis chart = kluterdaftar
 
         if ($jenischart == 'dataKluYgBayar') {
             $npwp = $npwp->where("JUMLAH_PEMBAYARAN_THN_TERAKHIR >", 0);
@@ -214,15 +214,15 @@ class KLU extends \App\Controllers\Kewilayahan\Kytp
         $globalFilter = $this->request->getGet('globalFilter'); //string
         $filters      = json_decode($this->request->getGet('filters')); //     [{"id":"MERK_USAHA","value":"toko"},{"id":"ALAMAT","value":"graha"}]
         $sorting      = json_decode($this->request->getGet('sorting')); //    [{"id":"ALAMAT","desc":false}]
-
+        $tahun        = 2024;
-        $db   = \Config\Database::connect();
+        $db           = \Config\Database::connect();
-        $npwp = $db->table('KPDL_MV_LOKASI_SUBJEK A')->select("A.NPWP, A.NAMA_WP, A.ALAMAT_MFWP, A.KELURAHAN_MFWP, A.KECAMATAN_MFWP, A.KOTA_MFWP, A.PROPINSI_MFWP,
+        $npwp         = $db->table('KPDL_MV_LOKASI_SUBJEK A')->select("A.NPWP, A.NAMA_WP, A.ALAMAT_MFWP, A.KELURAHAN_MFWP, A.KECAMATAN_MFWP, A.KOTA_MFWP, A.PROPINSI_MFWP,
             A.KPPADM_MFWP, A.NAMA_AR_MFWP, A.FLAG_WPS_WPK, A.STATUS_WP_MFWP, A.JNS_WP_MFWP, A.STATUS_SPT_TAHUNAN_TERAKHIR,
             A.TGL_DAFTAR, NVL(KD_GOLPOK,'ZZ') KD_GOLPOK,
             NVL(NM_GOLPOK,'TIDAK DIKETAHUI') NM_GOLPOK,
             NVL(JUMLAH_PEMBAYARAN_THN_TERAKHIR,0) JUMLAH_PEMBAYARAN_THN_TERAKHIR")
             ->distinct()
-            ->where('A.NPWP IS NOT NULL'); //default jenis chart = kluterdaftar
+            ->where('A.NPWP IS NOT NULL')->where('EXTRACT (YEAR FROM A.creation_date) <=', $tahun); //default jenis chart = kluterdaftar
 
         if ($jenischart == 'dataKluYgBayar') {
             $npwp = $npwp->where("JUMLAH_PEMBAYARAN_THN_TERAKHIR >", 0);

app/Controllers/Kewilayahan/Sebaran/PayComp.php

@@ -34,7 +34,7 @@ class PayComp extends \App\Controllers\Kewilayahan\Kytp
 
         $db = \Config\Database::connect();
         //npwp
-        $npwp = $db->table('KPDL_MV_LOKASI_SUBJEK A')->select('A.NPWP')->distinct()->where('A.NPWP IS NOT NULL');
+        $npwp = $db->table('KPDL_MV_LOKASI_SUBJEK A')->select('A.NPWP')->distinct()->where('A.NPWP IS NOT NULL')->where('EXTRACT (YEAR FROM A.creation_date)<=', $tahun);
 
         if ($opsiWilZona == 'wilayah') {
             $npwp->whereIn('ADM4_PCODE', $adm4_pcode);
@@ -198,13 +198,13 @@ class PayComp extends \App\Controllers\Kewilayahan\Kytp
         $globalFilter = $this->request->getGet('globalFilter'); //string
         $filters      = json_decode($this->request->getGet('filters')); //     [{"id":"MERK_USAHA","value":"toko"},{"id":"ALAMAT","value":"graha"}]
         $sorting      = json_decode($this->request->getGet('sorting')); //    [{"id":"ALAMAT","desc":false}]
-
+        $tahun        = 2024;
-        $db   = \Config\Database::connect();
+        $db           = \Config\Database::connect();
-        $data = $db->table('KPDL_MV_LOKASI_SUBJEK A')->distinct()
+        $data         = $db->table('KPDL_MV_LOKASI_SUBJEK A')->distinct()
             ->select('A.NPWP, A.NAMA_WP, A.ALAMAT_MFWP, A.KELURAHAN_MFWP, A.KECAMATAN_MFWP, A.KOTA_MFWP, A.PROPINSI_MFWP,
             A.KPPADM_MFWP, A.NAMA_AR_MFWP, A.FLAG_WPS_WPK, A.STATUS_WP_MFWP, A.JNS_WP_MFWP, A.STATUS_SPT_TAHUNAN_TERAKHIR,
             A.TGL_DAFTAR,
-            JUMLAH_PEMBAYARAN_THN_TERAKHIR')->where('A.NPWP IS NOT NULL');
+            JUMLAH_PEMBAYARAN_THN_TERAKHIR')->where('A.NPWP IS NOT NULL')->where('EXTRACT (YEAR FROM A.creation_date)<=', $tahun);
 
         if ($opsiWilZona == 'wilayah') {
             $data->whereIn('ADM4_PCODE', $adm4_pcode);

app/Controllers/Kewilayahan/Sebaran/Pembayaran.php

@@ -34,7 +34,7 @@ class Pembayaran extends \App\Controllers\Kewilayahan\Kytp
 
         $db = \Config\Database::connect();
         //npwp
-        $npwp = $db->table('KPDL_MV_LOKASI_SUBJEK A')->select('A.NPWP')->distinct()->where('A.NPWP IS NOT NULL');
+        $npwp = $db->table('KPDL_MV_LOKASI_SUBJEK A')->select('A.NPWP')->distinct()->where('A.NPWP IS NOT NULL')->where('EXTRACT (YEAR FROM A.creation_date)<=', $tahun);
 
         if ($opsiWilZona == 'wilayah') {
             $npwp->whereIn('ADM4_PCODE', $adm4_pcode);
@@ -229,12 +229,12 @@ class Pembayaran extends \App\Controllers\Kewilayahan\Kytp
         $globalFilter = $this->request->getGet('globalFilter'); //string
         $filters      = json_decode($this->request->getGet('filters')); //     [{"id":"MERK_USAHA","value":"toko"},{"id":"ALAMAT","value":"graha"}]
         $sorting      = json_decode($this->request->getGet('sorting')); //    [{"id":"ALAMAT","desc":false}]
-
+        $tahun        = 2024;
-        $db   = \Config\Database::connect();
+        $db           = \Config\Database::connect();
-        $data = $db->table('KPDL_MV_LOKASI_SUBJEK A')->distinct()
+        $data         = $db->table('KPDL_MV_LOKASI_SUBJEK A')->distinct()
             ->select('A.NPWP, A.NAMA_WP, A.ALAMAT_MFWP, A.KELURAHAN_MFWP, A.KECAMATAN_MFWP, A.KOTA_MFWP, A.PROPINSI_MFWP,
             A.KPPADM_MFWP, A.NAMA_AR_MFWP, A.FLAG_WPS_WPK, A.STATUS_WP_MFWP, A.JNS_WP_MFWP, A.STATUS_SPT_TAHUNAN_TERAKHIR,
-            A.TGL_DAFTAR, JUMLAH_PEMBAYARAN_THN_TERAKHIR')->where('A.NPWP IS NOT NULL');
+            A.TGL_DAFTAR, JUMLAH_PEMBAYARAN_THN_TERAKHIR')->where('A.NPWP IS NOT NULL')->where('EXTRACT (YEAR FROM A.creation_date)<=', $tahun);
 
         if ($opsiWilZona == 'wilayah') {
             $data->whereIn('ADM4_PCODE', $adm4_pcode);

app/Controllers/Kewilayahan/Sebaran/Pengampu.php

@@ -8,9 +8,9 @@ class Pengampu extends \App\Controllers\Kewilayahan\Kytp
     protected function data($request, $jenis)
     {
         ini_set('max_input_vars', 3000);
-        $Ald      = new AldLibrary;
+        $Ald         = new AldLibrary;
-        $username = session('nip');
+        $username    = session('nip');
-
+        $tahun       = 2024;
         $opsiWilZona = $Ald->decryptMe($request->getPost('opsiWilZona'), $username);
         $adm4_pcode  = [];
         foreach ($request->getPost('adm4_pcode') ?? [] as $key => $value) {
@@ -35,6 +35,7 @@ class Pengampu extends \App\Controllers\Kewilayahan\Kytp
         $db = \Config\Database::connect();
 
         $npwp = $db->table('KPDL_MV_LOKASI_SUBJEK A')->select("KPPADM_PENGAMPU, NM_KANTOR_PENGAMPU, count(DISTINCT A.NPWP) JML", false)
+            ->where('EXTRACT (YEAR FROM A.creation_date) <=', $tahun)
             ->groupBy("KPPADM_PENGAMPU, NM_KANTOR_PENGAMPU")->orderBy("JML", 'desc');
 
         switch ($jenis) {
@@ -211,12 +212,12 @@ class Pengampu extends \App\Controllers\Kewilayahan\Kytp
         $globalFilter = $this->request->getGet('globalFilter'); //string
         $filters      = json_decode($this->request->getGet('filters')); //     [{"id":"MERK_USAHA","value":"toko"},{"id":"ALAMAT","value":"graha"}]
         $sorting      = json_decode($this->request->getGet('sorting')); //    [{"id":"ALAMAT","desc":false}]
-
+        $tahun        = 2024;
-        $db   = \Config\Database::connect();
+        $db           = \Config\Database::connect();
-        $data = $db->table('KPDL_MV_LOKASI_SUBJEK A')->distinct()
+        $data         = $db->table('KPDL_MV_LOKASI_SUBJEK A')->distinct()
             ->select('A.NPWP, A.NAMA_WP, A.ALAMAT_MFWP, A.KELURAHAN_MFWP, A.KECAMATAN_MFWP, A.KOTA_MFWP, A.PROPINSI_MFWP,
             A.KPPADM_MFWP, A.NAMA_AR_MFWP, A.FLAG_WPS_WPK, A.STATUS_WP_MFWP, A.JNS_WP_MFWP, A.STATUS_SPT_TAHUNAN_TERAKHIR,
-            A.TGL_DAFTAR, JUMLAH_PEMBAYARAN_THN_TERAKHIR')->where('A.NPWP IS NOT NULL');
+            A.TGL_DAFTAR, JUMLAH_PEMBAYARAN_THN_TERAKHIR')->where('A.NPWP IS NOT NULL')->where('EXTRACT (YEAR FROM A.creation_date) <=', $tahun);
 
         if ($opsiWilZona == 'wilayah') {
             $data->whereIn('ADM4_PCODE', $adm4_pcode);

app/Controllers/Kewilayahan/Sebaran/Sof.php

@@ -33,7 +33,7 @@ class Sof extends \App\Controllers\Kewilayahan\Kytp
         }
         $db = \Config\Database::connect();
         //npwp
-        $npwp = $db->table('KPDL_MV_LOKASI_SUBJEK A')->select('A.NPWP')->distinct()->where('A.NPWP IS NOT NULL');
+        $npwp = $db->table('KPDL_MV_LOKASI_SUBJEK A')->select('A.NPWP')->distinct()->where('A.NPWP IS NOT NULL')->where('EXTRACT (YEAR FROM A.creation_date)<=', $tahun);
 
         if ($opsiWilZona == 'wilayah') {
             $npwp->whereIn('ADM4_PCODE', $adm4_pcode);
@@ -213,11 +213,11 @@ class Sof extends \App\Controllers\Kewilayahan\Kytp
         $globalFilter = $this->request->getGet('globalFilter'); //string
         $filters      = json_decode($this->request->getGet('filters')); //     [{"id":"MERK_USAHA","value":"toko"},{"id":"ALAMAT","value":"graha"}]
         $sorting      = json_decode($this->request->getGet('sorting')); //    [{"id":"ALAMAT","desc":false}]
-
+        $tahun        = 2024;
-        $db   = \Config\Database::connect();
+        $db           = \Config\Database::connect();
-        $data = $db->table('KPDL_MV_LOKASI_SUBJEK A')->distinct()->select('A.NPWP, A.NAMA_WP, A.ALAMAT_MFWP, A.KELURAHAN_MFWP, A.KECAMATAN_MFWP, A.KOTA_MFWP, A.PROPINSI_MFWP,
+        $data         = $db->table('KPDL_MV_LOKASI_SUBJEK A')->distinct()->select('A.NPWP, A.NAMA_WP, A.ALAMAT_MFWP, A.KELURAHAN_MFWP, A.KECAMATAN_MFWP, A.KOTA_MFWP, A.PROPINSI_MFWP,
             A.KPPADM_MFWP, A.NAMA_AR_MFWP, A.FLAG_WPS_WPK, A.STATUS_WP_MFWP, A.JNS_WP_MFWP, A.STATUS_SPT_TAHUNAN_TERAKHIR,
-            A.TGL_DAFTAR, JUMLAH_PEMBAYARAN_THN_TERAKHIR')->where('A.NPWP IS NOT NULL');
+            A.TGL_DAFTAR, JUMLAH_PEMBAYARAN_THN_TERAKHIR')->where('A.NPWP IS NOT NULL')->where('EXTRACT (YEAR FROM A.creation_date)<=', $tahun);
 
         if ($opsiWilZona == 'wilayah') {
             $data->whereIn('ADM4_PCODE', $adm4_pcode);

app/Controllers/Kewilayahan/Sebaran/ZonaPengawasan.php

@@ -8,9 +8,9 @@ class ZonaPengawasan extends \App\Controllers\Kewilayahan\Kytp
     protected function data($request)
     {
         ini_set('max_input_vars', 3000);
-        $Ald      = new AldLibrary;
+        $Ald         = new AldLibrary;
-        $username = session('nip');
+        $username    = session('nip');
-
+        $tahun       = 2024;
         $opsiWilZona = $Ald->decryptMe($request->getPost('opsiWilZona'), $username);
         $adm4_pcode  = [];
         foreach ($request->getPost('adm4_pcode') ?? [] as $key => $value) {
@@ -35,6 +35,7 @@ class ZonaPengawasan extends \App\Controllers\Kewilayahan\Kytp
         $db = \Config\Database::connect();
 
         $npwp = $db->table('KPDL_MV_LOKASI_SUBJEK A')->select("KPPADM_ZONA, NM_KPP_ZONA, count(1) JML", false)
+            ->where('EXTRACT (YEAR FROM A.creation_date) <=', $tahun)
             ->groupBy("KPPADM_ZONA, NM_KPP_ZONA")->orderBy("JML", 'desc');
 
         // switch ($jenis) {
@@ -210,9 +211,9 @@ class ZonaPengawasan extends \App\Controllers\Kewilayahan\Kytp
         $globalFilter = $this->request->getGet('globalFilter'); //string
         $filters      = json_decode($this->request->getGet('filters')); //     [{"id":"MERK_USAHA","value":"toko"},{"id":"ALAMAT","value":"graha"}]
         $sorting      = json_decode($this->request->getGet('sorting')); //    [{"id":"ALAMAT","desc":false}]
-
+        $tahun        = 2024;
-        $db   = \Config\Database::connect();
+        $db           = \Config\Database::connect();
-        $data = $db->table('KPDL_MV_LOKASI_SUBJEK A');
+        $data         = $db->table('KPDL_MV_LOKASI_SUBJEK A')->where('EXTRACT (YEAR FROM A.creation_date) <=', $tahun);
         $data->join('KPDL_REF_STATUS_SPT', 'ID_STATUS_SPT = STATUS_SPT_TAHUNAN_TERAKHIR', 'left');
         $data->join('PEGAWAI C', 'NIP_AR_ZONA = C.NIP9', 'left');
         $data->join('KPDL_MV_OBJEK_PERSUBJEK D', 'A.ID_KPDL_SUBJEK = D.ID_KPDL_SUBJEK', 'left');

app/Views/kewilayahan/kytp/kpdl.js

@@ -725,7 +725,7 @@ const Root = () => {
           <Card>
             <CardHeader className="d-flex justify-content-center p-2">
               <CardTitle tag={'h1'} className="font-weight-bold">
-                Statistik Progresifitas & Sebaran Data Hasil Kegiatan Matoa
+                Tindak Lanjut Pengawasan KPD Matoa : registrasi, pembayaran, dan pelaporan SPT
               </CardTitle>
             </CardHeader>
             <CardBody>