anyadir columna vigente/anulada/archivada en excel y su logica

application/controllers/ExportXls.php

@@ -1,5 +1,5 @@
 <?php
-ini_set('max_execution_time', '300');
+
 defined('BASEPATH') or exit('No direct script access allowed');
 
 use PhpOffice\PhpSpreadsheet\Spreadsheet;
@@ -132,6 +132,7 @@ class ExportXls extends CI_Controller
                 'id_licitacion' => $licitacion->id_licitacion,
                 "link_uri" => $licitacion->link_uri,
                 "updated" => $licitacion->updated,
+                'estadoLicitacion' => $licitacion->estadoLicitacion,
             );
             $result['hoja1'][$licitacion->id_licitacion]['contract'] = array(
                 "descripcion" => $licitacion->contrato_status,
@@ -256,6 +257,7 @@ class ExportXls extends CI_Controller
             $sheet->getStyle('C' . $this->filaDatoLicitacion)
                 ->getNumberFormat()
                 ->setFormatCode(\PhpOffice\PhpSpreadsheet\Style\NumberFormat::FORMAT_DATE_DATETIME);
+            $sheet->setCellValue('D' . $this->filaDatoLicitacion, $row['licitacion']['estadoLicitacion']);
             $sheet->setCellValue('E' . $this->filaDatoLicitacion, $primeraPublicacion);
             $sheet->getStyle('E' . $this->filaDatoLicitacion)
                 ->getNumberFormat()
@@ -451,6 +453,9 @@ class ExportXls extends CI_Controller
                 $sheet->SetCellValue('M' . $aux, $datos['partyIdentification']);
                 $sheet->SetCellValue('N' . $aux, $datos['partyName']);
                 $sheet->SetCellValue('O' . $aux, $datos['TaxExclusiveAmount']);
+                $sheet->getStyle('O' . $aux)
+                    ->getNumberFormat()
+                    ->setFormatCode(\PhpOffice\PhpSpreadsheet\Style\NumberFormat::FORMAT_ACCOUNTING_EUR);
 
                 $aux++;
             }

application/controllers/Parser.php

@@ -157,7 +157,7 @@ class Parser extends CI_Controller
 
     private function regExIniciosEsquema($xml)
     {
-        $pattern = "/(<cac:)|(<cbc:)|(<cac-place-ext:)|(<cbc-place-ext:)/";
+        $pattern = "/(<cac:)|(<cbc:)|(<cac-place-ext:)|(<cbc-place-ext:)|(<at:)/";
         $result = preg_replace($pattern, "<", $xml);
 
         return $result;
@@ -165,7 +165,7 @@ class Parser extends CI_Controller
 
     private function regExFinalesEsquema($xml)
     {
-        $pattern = "/(<\/cac:)|(<\/cbc:)|(<\/cac-place-ext:)|(<\/cbc-place-ext:)/";
+        $pattern = "/(<\/cac:)|(<\/cbc:)|(<\/cac-place-ext:)|(<\/cbc-place-ext:)|(<\/at:)/";
         $result = preg_replace($pattern, "</", $xml);
 
         return $result;

application/libraries/ParserFile.php

@@ -57,15 +57,16 @@ class ParserFile
             foreach ($tablasTruncate['datos'] as $row) {
                 $this->CI->Parser_model->truncateTables($row->tabla_sucia);
             }
+            $arrayDeletedEntries = array();
+            $arrayDeletedEntries = $array['deleted-entry'];
 
             foreach ($array['entry'] as $clave => $row) {
 
                 $existLicitacionActualizada = $this->getDatosLicitacion($row);
 
                 if (!$existLicitacionActualizada) {
-                    //$arrayDeletedEntries = $xml->children('at', true);
 
-                    $resultEntries[$filename]['general'][$aux] = $this->nodoEntry($row, $xml->entry[$clave], $datosPerfil->id, $idUltimaImportacion);
+                    $resultEntries[$filename]['general'][$aux] = $this->nodoEntry($row, $xml->entry[$clave], $datosPerfil->id, $idUltimaImportacion, $arrayDeletedEntries);
 
                     $contractFolder = $this->nodoContractFolderStatus($row, $xml->entry[$clave]);
 
@@ -172,7 +173,7 @@ class ParserFile
         return $result;
     }
 
-    private function nodoEntry($xml, $xmlPrimitivo, $tipoPerfil, $idUltimaImportacion)
+    private function nodoEntry($xml, $xmlPrimitivo, $tipoPerfil, $idUltimaImportacion, $deletedEntry)
     {
         $resultEntries = array();
         $id_licitacion = (string) substr($xml['id'], strrpos($xml['id'], '/') + 1);
@@ -186,6 +187,26 @@ class ParserFile
         $resultEntries['tipo_perfil_licitacion'] = $tipoPerfil;
         $resultEntries['fecha_creacion_log'] = $this->fechaInicioParser;
         $resultEntries['id_importacion'] = $idUltimaImportacion;
+
+        $resultEntries['estadoLicitacion'] = "VIGENTE";
+        if ($deletedEntry) {
+            foreach ($deletedEntry as $row) {
+                $idBorrado = (string) substr($row['@attributes']["ref"], strrpos($row['@attributes']["ref"], '/') + 1);
+                if ($id_licitacion == $idBorrado) {
+                    $anyo1 = date_create($row['@attributes']['when']);
+                    $anyo2 = date_create($resultEntries['updated']);
+                    $diferencia = $anyo2->diff($anyo1);
+                    $diferenciaFormat = $diferencia->y;
+                    if ($diferenciaFormat > 5) {
+                        $resultEntries['estadoLicitacion'] = "ARCHIVADA";
+                    } else {
+                        $resultEntries['estadoLicitacion'] = "ANULADA";
+                    }
+                }
+            }
+
+        }
+
         return $resultEntries;
     }
 

application/models/Xlsexport_model.php

@@ -46,6 +46,7 @@ class Xlsexport_model extends CI_Model
                     GROUP_CONCAT( PROJI.itemClassification_value ) AS itemClassification_attr,
                     LI.link_uri,
                     LI.updated,
+                    LI.estadoLicitacion,
                     CF.contractFolderID,
                     CF.contractFolderStatusCode,
                     LP.buyerProfileURIID,