freeze 2024

app/Controllers/Kewilayahan/Kytp.php

@@ -156,8 +156,9 @@ class Kytp extends Controller
     public function sebaranSPTTahunan()
     {
 
-        $sebaran            = new SPTTAhunan;
+        $sebaran = new SPTTAhunan;
-        $tahun              = $this->request->getGet('tahun') ?? date('Y');
+        // $tahun              = $this->request->getGet('tahun') ?? date('Y');
+        $tahun              = 2024;
         $dataReturn['data'] = $sebaran->data($this->request, $tahun);
 
         return $this->respond($dataReturn, 200);

app/Controllers/Kewilayahan/Sebaran/SPTTAhunan.php

@@ -33,7 +33,8 @@ class SPTTAhunan extends \App\Controllers\Kewilayahan\Kytp
         $db   = \Config\Database::connect();
         $npwp = $db->table('KPDL_MV_LOKASI_SUBJEK A')->select('A.NPWP, STATUS_SPT_TAHUNAN_TERAKHIR, B.KETERANGAN')->distinct()
             ->join('KPDL_REF_STATUS_SPT B', "A.STATUS_SPT_TAHUNAN_TERAKHIR = B.ID_STATUS_SPT", "left")
-            ->where('A.NPWP IS NOT NULL');
+            ->where('A.NPWP IS NOT NULL')
+            ->where('EXTRACT (YEAR FROM A.creation_date) <=', $tahun);
 
         if ($opsiWilZona == 'wilayah') {
             $npwp->whereIn('ADM4_PCODE', $adm4_pcode);
@@ -200,11 +201,11 @@ class SPTTAhunan 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/Views/kewilayahan/kytp/componentProgresifitas/SPTTahunan.js

@@ -288,7 +288,7 @@ const SPTTahunan = ({ dataSend }) => {
     <>
       <Row>
         <Col>
-          <HighchartsReact ref={refChart} highcharts={Highcharts} options={optionsChart(data, 'SPT Tahunan Tahun Pajak 2024')} />
+          <HighchartsReact ref={refChart} highcharts={Highcharts} options={optionsChart(data, 'SPT Tahunan')} />
         </Col>
       </Row>
       <Row className="f-14">