mostrar excel con las nuevas tablas finales

application/controllers/ExportXls.php

@@ -11,6 +11,7 @@ class ExportXls extends CI_Controller
     private $filaDocumentoAdd = 2;
     private $filaDocumentoLegal = 2;
     private $filaProjectLot = 2;
+    private $filaDatoLicitacion = 2;
 
     public function __construct()
     {
@@ -18,9 +19,17 @@ class ExportXls extends CI_Controller
         $this->load->model("Xlsexport_model");
     }
 
+    public function index()
+    {
+        $licitaciones = $this->Xlsexport_model->getLicitaciones("HAVING LI.fecha_creacion_log = '2022-02-23 11:06:44'");
+
+        insertBucleDuplicateOnKey($licitaciones['datos'], "vista_datos_licitacion", "");
+
+    }
+
     public function exportDatosCompletos()
     {
-        $licitacionesResult = $this->Xlsexport_model->getLicitaciones();
+        $licitacionesResult = $this->Xlsexport_model->getFullDatosUltimasInsertadas();
         $result = array();
 
         //$start = $this->starttime();
@@ -28,9 +37,6 @@ class ExportXls extends CI_Controller
             $result = $this->mapearDatos($licitacionesResult);
         }
         $spreadsheet = new Spreadsheet();
-        //$sheet = $spreadsheet->getActiveSheet();
-        //$sheet->setCellValue('A1', 'Hello World !');
-
         $spreadsheet->createSheet();
         $spreadsheet->createSheet();
         $spreadsheet->createSheet();
@@ -46,54 +52,41 @@ class ExportXls extends CI_Controller
         $spreadsheet->createSheet();
         $spreadsheet->createSheet();
 
-        $filaExcel = 1;
-        foreach ($result as $dato) {
-            if ($filaExcel == 1) {
-                $spreadsheet = $this->cabecerasOpenPlacspFirstSheet($spreadsheet);
-                /*$spreadsheet = $this->cabecerasOpenPlacsBitacora($spreadsheet, 1);
-            $spreadsheet = $this->cabeceraMediosComunicacion($spreadsheet);
-            $spreadsheet = $this->cabeceraMediosComunicacionDocumentos($spreadsheet);
-            $spreadsheet = $this->cabeceraTenderResult($spreadsheet);
-            $spreadsheet = $this->cabeceraTenderingTerms($spreadsheet);
-            $spreadsheet = $this->cabeceraTipoProcedimiento($spreadsheet);
-            $spreadsheet = $this->cabeceraCriterioADjudicacion($spreadsheet);
-            $spreadsheet = $this->cabeceraCriteriosFinancieros($spreadsheet);
-            $spreadsheet = $this->cabeceraCriteriosTecnicos($spreadsheet);
-            $spreadsheet = $this->cabeceraRequisitosParticipacion($spreadsheet);
-            $spreadsheet = $this->cabecerasOpenPlacspDocumentos($spreadsheet, 11);
-            $spreadsheet = $this->cabecerasOpenPlacspDocumentos($spreadsheet, 12);
-            $spreadsheet = $this->cabecerasOpenPlacspDocumentos($spreadsheet, 13);
-            $spreadsheet = $this->cabecerasOpenPlacspDocumentos($spreadsheet, 14);*/
-            } else {
-                $spreadsheet = $this->datosCompletosHojaLicitacion($spreadsheet, $filaExcel, $dato);
-                /*$spreadsheet = $this->datosCompletosHojaBitacora($spreadsheet, $dato);
-            $spreadsheet = $this->datosCompletosDocumentosGenerales($spreadsheet, $dato);
-            $spreadsheet = $this->datosCompletosDocumentosTecnicos($spreadsheet, $dato);
-            $spreadsheet = $this->datosCompletosDocumentosAdicionales($spreadsheet, $dato);
-            $spreadsheet = $this->datosCompletosDocumentosLegales($spreadsheet, $dato);*/
-            }
-            //$spreadsheet = $this->datosCompletosMediosPublicacion($spreadsheet);
-            //$spreadsheet = $this->datosMedioPublicacion($spreadsheet);
-            /*$spreadsheet = $this->datosCompletosResultadoDelProcedimiento($spreadsheet);
-            $spreadsheet = $this->datosCompletosOfertas($spreadsheet);
-            $spreadsheet = $this->datosCriterioAdjudicacion($spreadsheet);
-            $spreadsheet = $this->datosCriterioEvaluacionFinanciera($spreadsheet);
-            $spreadsheet = $this->datosCriterioEvaluacionTecnica($spreadsheet);
-            $spreadsheet = $this->datosRequisitosParticipacion($spreadsheet);
-            $spreadsheet = $this->datosCompletosTipoProcedimiento($spreadsheet);*/
-
-            $filaExcel++;
-        }
+        $spreadsheet = $this->cabecerasOpenPlacspFirstSheet($spreadsheet);
+        $spreadsheet = $this->cabecerasOpenPlacsBitacora($spreadsheet, 1);
+        $spreadsheet = $this->cabecerasOpenPlacspDocumentos($spreadsheet, 11);
+        $spreadsheet = $this->cabecerasOpenPlacspDocumentos($spreadsheet, 12);
+        $spreadsheet = $this->cabecerasOpenPlacspDocumentos($spreadsheet, 13);
+        $spreadsheet = $this->cabecerasOpenPlacspDocumentos($spreadsheet, 14);
+
+        $spreadsheet = $this->datosCompletosHojaLicitacion($spreadsheet, $result['hoja1']);
+        $spreadsheet = $this->datosCompletosHojaBitacora($spreadsheet, $result);
+        $spreadsheet = $this->datosCompletosMediosPublicacion($spreadsheet, $result['validNoticeInfo']);
+        $spreadsheet = $this->datosMedioPublicacion($spreadsheet, $result['validNoticeInfoDocumentos']);
+        $spreadsheet = $this->datosCriterioAdjudicacion($spreadsheet, $result['tenderFinancial']);
+        $spreadsheet = $this->datosCriterioEvaluacionFinanciera($spreadsheet, $result['tenderAwarding']);
+        $spreadsheet = $this->datosCriterioEvaluacionTecnica($spreadsheet, $result['tenderTecnicos']);
+        $spreadsheet = $this->datosRequisitosParticipacion($spreadsheet, $result['tenderQualification']);
+
+        $spreadsheet = $this->datosCompletosDocumentosGenerales($spreadsheet, $result['generalDocs']);
+        $spreadsheet = $this->datosCompletosDocumentosAdicionales($spreadsheet, $result['additDocs']);
+        $spreadsheet = $this->datosCompletosDocumentosTecnicos($spreadsheet, $result['techDocs']);
+        $spreadsheet = $this->datosCompletosDocumentosLegales($spreadsheet, $result['legalDocs']);
+        $spreadsheet = $this->datosCompletosTipoProcedimiento($spreadsheet, $result['tenderProcess']);
+        $spreadsheet = $this->datosCompletosOfertas($spreadsheet, $result['tenderingTerms']);
+        $spreadsheet = $this->datosCompletosResultadoDelProcedimiento($spreadsheet, $result['tenderResult']);
 
         $nombreAchivo = 'test.xlsx';
         $ruta = FCPATH . 'uploads/' . $nombreAchivo;
 
+        guardar_log("Excel", "Guardando Datos en excel--");
         $writer = new Xlsx($spreadsheet);
 
         $writer->save($ruta);
 
         // Write the Excel file to filename some_excel_file.xlsx in the current directory
         // Redirect output to a client’s web browser (Excel5)
+        guardar_log("Excel", "Enviando Excel");
         header('Content-Type: application/vnd.openxmlformats-officedocument.spreadsheetml.sheet');
         header('Content-Disposition: attachment;filename=' . $nombreAchivo . '');
         header('Pragma: cache');
@@ -120,23 +113,26 @@ class ExportXls extends CI_Controller
     public function mapearDatos($licitacionesResult): array
     {
         $result = array();
+        guardar_log("Excel", "Montando array datos licitacion");
         foreach ($licitacionesResult['datos'] as $licitacion) {
-            $result[$licitacion->id_licitacion]['licitacion'] = array(
+
+            $result['hoja1'][$licitacion->id_licitacion]['licitacion'] = array(
                 'id_licitacion' => $licitacion->id_licitacion,
                 "link_uri" => $licitacion->link_uri,
                 "updated" => $licitacion->updated,
             );
-            $result[$licitacion->id_licitacion]['contract'] = array(
+            $result['hoja1'][$licitacion->id_licitacion]['contract'] = array(
                 "descripcion" => $licitacion->contrato_status,
                 "contractFolderStatusCode" => $licitacion->contractFolderStatusCode,
                 "contractFolderID" => $licitacion->contractFolderID,
             );
-            $result[$licitacion->id_licitacion]['locatedParty'] = array(
+            $result['hoja1'][$licitacion->id_licitacion]['locatedParty'] = array(
                 "contractingPartyTypeCode" => $licitacion->contractingPartyTypeCode,
                 "buyerProfileURIID" => $licitacion->buyerProfileURIID,
                 "tipo_administracion" => $licitacion->tipo_administracion,
+                "itemClassification_attr" => $licitacion->itemClassification_attr,
             );
-            $result[$licitacion->id_licitacion]['party'] = array(
+            $result['hoja1'][$licitacion->id_licitacion]['party'] = array(
                 "partyName" => $licitacion->partyName,
                 "codpostal" => $licitacion->codpostal,
                 "websiteURI" => $licitacion->websiteURI,
@@ -144,14 +140,12 @@ class ExportXls extends CI_Controller
                 "direccion" => $licitacion->direccion,
                 "contact_name" => $licitacion->contact_name,
                 "contact_email" => $licitacion->contact_email,
+                "partyItem" => $licitacion->partyItem,
+                "tipoIdParty" => $licitacion->tipoIdParty,
             );
 
-            /*foreach ($result[$licitacion->id_licitacion]['party'] as $row) {
-            $result[$licitacion->id_licitacion]['partyActivity'] = $this->Xlsexport_model->getDatosByTablaAndLicitacion("maestro_party_party_idenfitication", "id_ajena_licitacion", $row['id']);
-            }*/
-
-            $result[$licitacion->id_licitacion]['project'] = array(
-                "name" => $licitacion->name,
+            $result['hoja1'][$licitacion->id_licitacion]['project'] = array(
+                "name" => $licitacion->nameProject,
                 "estimatedOverallContractAmount" => $licitacion->estimatedOverallContractAmount,
                 "taxExclusiveAmount" => $licitacion->taxExclusiveAmount,
                 "totalAmount" => $licitacion->totalAmount,
@@ -166,40 +160,68 @@ class ExportXls extends CI_Controller
 
             );
 
-            $result[$licitacion->id_licitacion]['tenderProcess'] = array(
+            $result['hoja1'][$licitacion->id_licitacion]['tenderProcess'] = array(
                 "tipoTender" => $licitacion->tipoTender,
                 "contrato_sistema" => $licitacion->contrato_sistema,
                 "urgency" => $licitacion->urgency,
                 "submision" => $licitacion->submision,
             );
 
-            $result[$licitacion->id_licitacion]['tenderTerms'] = array(
+            $result['hoja1'][$licitacion->id_licitacion]['tenderTerms'] = array(
                 "procurementLegislationDocumentReference" => $licitacion->procurementLegislationDocumentReference,
                 "allowedSubcontractTerms" => $licitacion->allowedSubcontractTerms,
             );
-            /*foreach ($result[$licitacion->id_licitacion]['project'] as $row) {
-            //$result[$licitacion->id_licitacion]['projectActivity'] = $this->Xlsexport_model->getDatosByTablaAndLicitacion("maestro_procurement_project_itemClass", "id_ajena_licitacion", $row['id']);
-            }*/
-
-            /*$result[$licitacion->id_licitacion]['projectLot'] = $this->Xlsexport_model->getDatosByTablaAndLicitacion("maestro_procurement_project_lot", $licitacion->id_licitacion);
-            foreach ($result[$licitacion->id_licitacion]['projectLot'] as $row) {
-            //$result[$licitacion->id_licitacion]['projectLotActivity'] = $this->Xlsexport_model->getDatosByTablaAndLicitacion("maestro_procurement_project_lot_item", "id_ajena_licitacion", $row['id']);
-            }*/
-
-            /*$result[$licitacion->id_licitacion]['tenderResult'] = $this->Xlsexport_model->getDatosByTablaAndLicitacion("maestro_tender_result", $licitacion->id_licitacion);
-        $result[$licitacion->id_licitacion]['tenderProcess'] = $this->Xlsexport_model->getDatosByTablaAndLicitacion("maestro_tendering_process", $licitacion->id_licitacion);
-        $result[$licitacion->id_licitacion]['tenderTerms'] = $this->Xlsexport_model->getDatosByTablaAndLicitacion("maestro_tendering_terms", $licitacion->id_licitacion);
-        $result[$licitacion->id_licitacion]['validNoticeInfo'] = $this->Xlsexport_model->getDatosByTablaAndLicitacion("maestro_valid_notice_info", $licitacion->id_licitacion);
-        $result[$licitacion->id_licitacion]['techDocs'] = $this->Xlsexport_model->getDatosByTablaAndLicitacion("maestro_technical_documents", $licitacion->id_licitacion);
-        $result[$licitacion->id_licitacion]['legalDocs'] = $this->Xlsexport_model->getDatosByTablaAndLicitacion("maestro_legal_documents", $licitacion->id_licitacion);
-        $result[$licitacion->id_licitacion]['generalDocs'] = $this->Xlsexport_model->getDatosByTablaAndLicitacion("maestro_general_documents", $licitacion->id_licitacion);
-        $result[$licitacion->id_licitacion]['additDocs'] = $this->Xlsexport_model->getDatosByTablaAndLicitacion("maestro_additional_documents", $licitacion->id_licitacion);*/
         }
 
+        guardar_log("Excel", "Consulta Valid notice info");
+        $result['validNoticeInfo'] = $this->Xlsexport_model->getTablaByFechaLog("maestro_valid_notice_info");
+
+        guardar_log("Excel", "Consulta Valid notice info documentos");
+        $result['validNoticeInfoDocumentos'] = $this->Xlsexport_model->getTablaByFechaLog("maestro_valid_notice_info_documento");
+
+        /* guardar_log("Excel", "Consulta Valid notice info");
+        $result['validNoticeInfo'] = $this->Xlsexport_model->getTablaByFechaLog("maestro_valid_notice_fechas"); */
+
+        guardar_log("Excel", "Consulta projectLot");
+        $result['projectLot'] = $this->Xlsexport_model->getProjectLotItem();
+
+        guardar_log("Excel", "Consulta documentos tecnicos");
+        $result['techDocs'] = $this->Xlsexport_model->getTablaByFechaLog("maestro_technical_documents");
+
+        guardar_log("Excel", "Consulta documentos legales");
+        $result['legalDocs'] = $this->Xlsexport_model->getTablaByFechaLog("maestro_legal_documents");
+
+        guardar_log("Excel", "Consulta documentos adicionales");
+        $result['additDocs'] = $this->Xlsexport_model->getTablaByFechaLog("maestro_additional_documents");
+
+        guardar_log("Excel", "Consulta documentos generales");
+        $result['generalDocs'] = $this->Xlsexport_model->getTablaByFechaLog("maestro_general_documents");
+
+        guardar_log("Excel", "Consulta tender process");
+        $result['tenderProcess'] = $this->Xlsexport_model->getTablaByFechaLog("maestro_tendering_process");
+
+        guardar_log("Excel", "Consulta tender terms");
+        $result['tenderingTerms'] = $this->Xlsexport_model->getTablaByFechaLog("maestro_tendering_terms");
+
+        guardar_log("Excel", "Consulta tender result");
+        $result['tenderResult'] = $this->Xlsexport_model->getTablaByFechaLog("maestro_tender_result");
+
+        guardar_log("Excel", "Consulta tender criterio financieros");
+        $result['tenderFinancial'] = $this->Xlsexport_model->getTablaByFechaLog("maestro_tendering_terms_financial_evaluation");
+
+        guardar_log("Excel", "Consulta tender criterio adjudicacion");
+        $result['tenderAwarding'] = $this->Xlsexport_model->getTablaByFechaLog("maestro_tendering_terms_awarding_terms");
+
+        guardar_log("Excel", "Consulta tender criterios tecnicos");
+        $result['tenderTecnicos'] = $this->Xlsexport_model->getTablaByFechaLog("maestro_tendering_terms_qualification_request");
+
+        guardar_log("Excel", "Consulta tender requisitos participacion");
+        $result['tenderQualification'] = $this->Xlsexport_model->getTablaByFechaLog("maestro_tendering_terms_qualification_request");
+
         return $result;
     }
 
-    private function datosCompletosHojaLicitacion($spreadsheet, $filaExcel, $datosLicitacion)
+    private function datosCompletosHojaLicitacion($spreadsheet, $datosLicitacion)
     {
 
         $sheet = $spreadsheet->getSheet(0);
@@ -211,104 +233,141 @@ class ExportXls extends CI_Controller
                 "size" => 13,
             ),
         );
-        $updatedFormat = new DateTime($datosLicitacion['licitacion']['updated']);
-        $updated = \PhpOffice\PhpSpreadsheet\Shared\Date::PHPToExcel($updatedFormat);
-        $sheet->getStyle("A1:AB1")->applyFromArray($styleArr);
-        $sheet->setCellValue('A' . $filaExcel, $datosLicitacion['licitacion']['id_licitacion']);
-        $sheet->setCellValue('B' . $filaExcel, $datosLicitacion['licitacion']['link_uri']);
-        $sheet->setCellValue('C' . $filaExcel, $updated);
-        $sheet->getStyle('C' . $filaExcel)
-            ->getNumberFormat()
-            ->setFormatCode(\PhpOffice\PhpSpreadsheet\Style\NumberFormat::FORMAT_DATE_DATETIME);
-        $sheet->setCellValue('E' . $filaExcel, "");
-        $sheet->setCellValue('F' . $filaExcel, $datosLicitacion['contract']['descripcion']);
-        $sheet->setCellValue('G' . $filaExcel, $datosLicitacion['contract']['contractFolderID']);
-        $sheet->setCellValue('H' . $filaExcel, $datosLicitacion['project']['name']);
-        $sheet->setCellValue('I' . $filaExcel, $datosLicitacion['project']['estimatedOverallContractAmount']);
-        $sheet->setCellValue('J' . $filaExcel, $datosLicitacion['project']['taxExclusiveAmount']);
-        $sheet->setCellValue('K' . $filaExcel, $datosLicitacion['project']['totalAmount']);
-
-        /*$cpvProject = "";
-        for ($i = 0; $i < count($datosLicitacion['projectActivity']); $i++) {
-        $cpvProject .= $datosLicitacion['projectActivity'][$i]['itemClassification_value'] . ";";
-        }*/
-
-        /*$cpvParty = "";
-        //TODO OBtener solo el DIR3
-        for ($i = 0; $i < count($datosLicitacion['partyActivity']); $i++) {
-        $cpvParty .= $datosLicitacion['partyActivity'][$i]['idPartyIdent'] . ";";
-        }*/
-
-        $sheet->setCellValue('L' . $filaExcel, ""); //$cpvProject);
-        $sheet->setCellValue('M' . $filaExcel, $datosLicitacion['project']['tipo_contrato']);
-        $sheet->setCellValue('N' . $filaExcel, $datosLicitacion['project']['countrySubentityCode'] . " - " . $datosLicitacion['project']['countrySubentity']);
-        $sheet->setCellValue('O' . $filaExcel, $datosLicitacion['party']['partyName']);
-        $sheet->setCellValue('P' . $filaExcel, "");
-        $sheet->setCellValue('Q' . $filaExcel, $datosLicitacion['locatedParty']['contractingPartyTypeCode']);
-        $sheet->setCellValue('R' . $filaExcel, ""); //$cpvParty);
-        $sheet->setCellValue('S' . $filaExcel, $datosLicitacion['locatedParty']['buyerProfileURIID']); //Buscar DIR3
-        $sheet->setCellValue('T' . $filaExcel, $datosLicitacion['locatedParty']['tipo_administracion']);
-        $sheet->setCellValue('U' . $filaExcel, $datosLicitacion['party']['codpostal']);
-        $sheet->setCellValue('V' . $filaExcel, $datosLicitacion['tenderProcess']['tipoTender']);
-        $sheet->setCellValue('W' . $filaExcel, $datosLicitacion['tenderProcess']['contrato_sistema']);
-        $sheet->setCellValue('X' . $filaExcel, $datosLicitacion['tenderProcess']['urgency']);
-        $sheet->setCellValue('Y' . $filaExcel, $datosLicitacion['tenderProcess']['submision']);
-        $sheet->setCellValue('Z' . $filaExcel, $datosLicitacion['tenderTerms']['procurementLegislationDocumentReference']);
-        $sheet->setCellValue('AA' . $filaExcel, $datosLicitacion['tenderTerms']['allowedSubcontractTerms']);
-        $sheet->setCellValue('AB' . $filaExcel, $datosLicitacion['project']['durationMesure']);
-        $sheet->setCellValue('AC' . $filaExcel, $datosLicitacion['project']['medida']);
-        $sheet->setCellValue('AD' . $filaExcel, $datosLicitacion['project']['duracion_inicio']);
-        $sheet->setCellValue('AE' . $filaExcel, $datosLicitacion['project']['duracion_fin']);
-        $sheet->setCellValue('AF' . $filaExcel, $datosLicitacion['project']['contractExtension']);
-        $sheet->setCellValue('AG' . $filaExcel, $datosLicitacion['party']['websiteURI']);
-        $sheet->setCellValue('AH' . $filaExcel, $datosLicitacion['party']['city']);
-        $sheet->setCellValue('AI' . $filaExcel, $datosLicitacion['party']['direccion']);
-        $sheet->setCellValue('AJ' . $filaExcel, $datosLicitacion['party']['contact_name']);
-        $sheet->setCellValue('AK' . $filaExcel, $datosLicitacion['party']['contact_email']);
+
+        //Primera Publicacion
+        $contador = 0;
+        foreach ($datosLicitacion as $row) {
+            guardar_log("Excel", "Escribir excel datos licitacion--" . $contador);
+            $contador++;
+            $primeraPublicacion = $this->primeraPublicacion($row['licitacion']['id_licitacion']);
+
+            $updated = $this->formatFechas($row['licitacion']['updated']);
+
+            $sheet->getStyle("A1:AJ1")->applyFromArray($styleArr);
+            $sheet->setCellValue('A' . $this->filaDatoLicitacion, $row['licitacion']['id_licitacion']);
+            $sheet->setCellValue('B' . $this->filaDatoLicitacion, $row['licitacion']['link_uri']);
+            $sheet->setCellValue('C' . $this->filaDatoLicitacion, $updated);
+            $sheet->getStyle('C' . $this->filaDatoLicitacion)
+                ->getNumberFormat()
+                ->setFormatCode(\PhpOffice\PhpSpreadsheet\Style\NumberFormat::FORMAT_DATE_DATETIME);
+            $sheet->setCellValue('E' . $this->filaDatoLicitacion, $primeraPublicacion);
+            $sheet->getStyle('E' . $this->filaDatoLicitacion)
+                ->getNumberFormat()
+                ->setFormatCode(\PhpOffice\PhpSpreadsheet\Style\NumberFormat::FORMAT_DATE_DDMMYYYY);
+            $sheet->setCellValue('F' . $this->filaDatoLicitacion, $row['contract']['descripcion']);
+            $sheet->setCellValue('G' . $this->filaDatoLicitacion, $row['contract']['contractFolderID']);
+            $sheet->setCellValue('H' . $this->filaDatoLicitacion, $row['project']['name']);
+            $sheet->setCellValue('I' . $this->filaDatoLicitacion, $row['project']['estimatedOverallContractAmount']);
+            $sheet->getStyle('I' . $this->filaDatoLicitacion)
+                ->getNumberFormat()
+                ->setFormatCode(\PhpOffice\PhpSpreadsheet\Style\NumberFormat::FORMAT_ACCOUNTING_EUR);
+            $sheet->setCellValue('J' . $this->filaDatoLicitacion, $row['project']['taxExclusiveAmount']);
+            $sheet->getStyle('J' . $this->filaDatoLicitacion)
+                ->getNumberFormat()
+                ->setFormatCode(\PhpOffice\PhpSpreadsheet\Style\NumberFormat::FORMAT_ACCOUNTING_EUR);
+
+            $sheet->setCellValue('K' . $this->filaDatoLicitacion, $row['locatedParty']['itemClassification_attr']);
+            $sheet->setCellValue('L' . $this->filaDatoLicitacion, $row['project']['tipo_contrato']);
+            $sheet->setCellValue('M' . $this->filaDatoLicitacion, $row['project']['countrySubentityCode'] . " - " . $row['project']['countrySubentity']);
+            $sheet->setCellValue('N' . $this->filaDatoLicitacion, $row['party']['partyName']);
+            $sheet->setCellValue('O' . $this->filaDatoLicitacion, ($row['party']['tipoIdParty'] == "ID_PLATAFORMA") ? $row['party']['partyItem'] : "");
+            $sheet->setCellValue('P' . $this->filaDatoLicitacion, ($row['party']['tipoIdParty'] == "NIF") ? $row['party']['partyItem'] : "");
+            $sheet->setCellValue('Q' . $this->filaDatoLicitacion, ($row['party']['tipoIdParty'] == "DIR3") ? $row['party']['partyItem'] : "");
+            $sheet->setCellValue('R' . $this->filaDatoLicitacion, $row['locatedParty']['buyerProfileURIID']);
+            $sheet->setCellValue('S' . $this->filaDatoLicitacion, $row['locatedParty']['tipo_administracion']);
+            $sheet->setCellValue('T' . $this->filaDatoLicitacion, $row['party']['codpostal']);
+            $sheet->setCellValue('U' . $this->filaDatoLicitacion, $row['tenderProcess']['tipoTender']);
+            $sheet->setCellValue('V' . $this->filaDatoLicitacion, $row['tenderProcess']['contrato_sistema']);
+            $sheet->setCellValue('W' . $this->filaDatoLicitacion, $row['tenderProcess']['urgency']);
+            $sheet->setCellValue('X' . $this->filaDatoLicitacion, $row['tenderProcess']['submision']);
+            $sheet->setCellValue('ZY' . $this->filaDatoLicitacion, $row['tenderTerms']['procurementLegislationDocumentReference']);
+            $sheet->setCellValue('Z' . $this->filaDatoLicitacion, $row['tenderTerms']['allowedSubcontractTerms']);
+            $sheet->setCellValue('AA' . $this->filaDatoLicitacion, $row['project']['durationMesure']);
+            $sheet->setCellValue('AB' . $this->filaDatoLicitacion, $row['project']['medida']);
+            $sheet->setCellValue('AC' . $this->filaDatoLicitacion, $this->formatFechas($row['project']['duracion_inicio']));
+            $sheet->getStyle('AC' . $this->filaDatoLicitacion)
+                ->getNumberFormat()
+                ->setFormatCode(\PhpOffice\PhpSpreadsheet\Style\NumberFormat::FORMAT_DATE_DDMMYYYY);
+            $sheet->setCellValue('AD' . $this->filaDatoLicitacion, $this->formatFechas($row['project']['duracion_fin']));
+            $sheet->getStyle('AD' . $this->filaDatoLicitacion)
+                ->getNumberFormat()
+                ->setFormatCode(\PhpOffice\PhpSpreadsheet\Style\NumberFormat::FORMAT_DATE_DDMMYYYY);
+            $sheet->setCellValue('AE' . $this->filaDatoLicitacion, $row['project']['contractExtension']);
+            $sheet->setCellValue('AF' . $this->filaDatoLicitacion, $row['party']['websiteURI']);
+            $sheet->setCellValue('AG' . $this->filaDatoLicitacion, $row['party']['city']);
+            $sheet->setCellValue('AH' . $this->filaDatoLicitacion, $row['party']['direccion']);
+            $sheet->setCellValue('AI' . $this->filaDatoLicitacion, $row['party']['contact_name']);
+            $sheet->setCellValue('AJ' . $this->filaDatoLicitacion, $row['party']['contact_email']);
+            $this->filaDatoLicitacion++;
+        }
 
         return $spreadsheet;
 
     }
 
-    private function datosCompletosHojaBitacora($spreadsheet, $datosLicitacion)
+    private function formatFechas($fecha)
     {
-        $spreadsheet->setActiveSheetIndex(1);
-        $spreadsheet->getActiveSheet()->setTitle("Bitácora");
+        $fechaFinal = "";
 
-        foreach ($datosLicitacion['projectLot'] as $datos) {
-            $spreadsheet->getActiveSheet()->SetCellValue('A' . $this->filaProjectLot, $datos['id_ajena_licitacion']);
-            $spreadsheet->getActiveSheet()->SetCellValue('B' . $this->filaProjectLot, $datos['name']);
-            $spreadsheet->getActiveSheet()->SetCellValue('C' . $this->filaProjectLot, $datos['idProcurementLot']);
-            $spreadsheet->getActiveSheet()->SetCellValue('D' . $this->filaProjectLot, $datos['totalAmount']);
-            $spreadsheet->getActiveSheet()->SetCellValue('E' . $this->filaProjectLot, $datos['taxExclusiveAmount']);
-            $spreadsheet->getActiveSheet()->SetCellValue('F' . $this->filaProjectLot, $datos['countrySubentity']);
-            $spreadsheet->getActiveSheet()->SetCellValue('G' . $this->filaProjectLot, $datos['countrySubentityCode']);
-            $spreadsheet->getActiveSheet()->SetCellValue('H' . $this->filaProjectLot, $datos['nameLocation']);
+        if ($fecha != "0000-00-00") {
+            $fechaFormat = new DateTime($fecha);
+            $fechaFinal = \PhpOffice\PhpSpreadsheet\Shared\Date::PHPToExcel($fechaFormat);
+        }
 
-            $cpv = "";
-            $projectLotActivity = $this->Xlsexport_model->getProjectLotActivityByProjectLot($datos['id']);
+        return $fechaFinal;
+    }
 
-            if ($projectLotActivity['num_rows'] > 0) {
-                for ($i = 0; $i < count($projectLotActivity['datos']); $i++) {
+    private function primeraPublicacion($idLicitacion)
+    {
+        $result = "";
 
-                    $cpv .= $projectLotActivity['datos'][$i]['idItem'] . ";";
-                }
-                $spreadsheet->getActiveSheet()->SetCellValue('I' . $this->filaProjectLot, $cpv);
-            }
+        $fechasPublicaciones = $this->Xlsexport_model->getFechasPublicadas($idLicitacion);
+
+        if ($fechasPublicaciones['num_rows'] > 0) {
+            $primeraFechaFormat = new Datetime($fechasPublicaciones['datos']->fecha);
+            $result = \PhpOffice\PhpSpreadsheet\Shared\Date::PHPToExcel($primeraFechaFormat);
+        }
+        return $result;
+    }
+
+    private function datosCompletosHojaBitacora($spreadsheet, $datosLicitacion)
+    {
+        $sheet = $spreadsheet->getSheet(1);
+        $sheet->setTitle("Bitacora");
+        $styleArr = array(
+            "font" => array(
+                "bold" => true,
+                "color" => array("rgb" => "22B9FF"),
+                "size" => 13,
+            ),
+        );
+        $sheet->getStyle("A1:F1")->applyFromArray($styleArr);
+        $contador = 0;
+        foreach ($datosLicitacion['projectLot']['datos'] as $bitacora) {
+            guardar_log("Excel", "Escribir bitacora--" . $contador);
+            $contador++;
+            $sheet->SetCellValue('A' . $this->filaProjectLot, $bitacora['id_ajena_licitacion']);
+            $sheet->SetCellValue('B' . $this->filaProjectLot, $bitacora['name']);
+            $sheet->setCellValue('C' . $this->filaProjectLot, $bitacora['idProcurementLot']);
+            $sheet->SetCellValue('D' . $this->filaProjectLot, $bitacora['taxExclusiveAmount']);
+            $sheet->SetCellValue('F' . $this->filaProjectLot, $bitacora['countrySubentity']);
+            $sheet->SetCellValue('I' . $this->filaProjectLot, $bitacora['itemClassification_attr']);
             $this->filaProjectLot++;
         }
         return $spreadsheet;
     }
 
-    private function datosCompletosMediosPublicacion($spreadsheet)
+    private function datosCompletosMediosPublicacion($spreadsheet, $datos)
     {
         $spreadsheet->setActiveSheetIndex(2);
         $spreadsheet->getActiveSheet()->setTitle("Medios de publicación");
-        $datos = $this->Xlsexport_model->getValidNoticeInfoRelacion();
 
         if ($datos['num_rows'] > 0) {
+            $contador = 0;
             $aux = 2;
             foreach ($datos['datos'] as $datos) {
+                guardar_log("Excel", "Escribir datos medio publicacion--" . $contador);
+                $contador++;
                 $spreadsheet->getActiveSheet()->SetCellValue('A' . $aux, $datos['id_ajena_licitacion']);
                 $spreadsheet->getActiveSheet()->SetCellValue('B' . $aux, $datos['noticeTypeCode']);
                 $spreadsheet->getActiveSheet()->SetCellValue('C' . $aux, $datos['publicationMediaName']);
@@ -319,14 +378,17 @@ class ExportXls extends CI_Controller
         return $spreadsheet;
     }
 
-    private function datosMedioPublicacion($spreadsheet)
+    private function datosMedioPublicacion($spreadsheet, $datos)
     {
         $spreadsheet->setActiveSheetIndex(3);
         $spreadsheet->getActiveSheet()->setTitle("Documentos Medios Comm");
-        $datos = $this->Xlsexport_model->getDatosRelacionadasTablaWithoutLicitacion("maestro_valid_notice_info_documento", "maestro_valid_notice_info", "id_ajena_vni");
+
         if ($datos['num_rows'] > 0) {
             $aux = 2;
+            $contador = 0;
             foreach ($datos['datos'] as $row) {
+                guardar_log("Excel", "Escribir documentios medios comunicacion--" . $contador);
+                $contador++;
                 $spreadsheet->getActiveSheet()->SetCellValue('A' . $aux, $row['id_ajena_licitacion']);
                 $spreadsheet->getActiveSheet()->SetCellValue('B' . $aux, $row['documento']);
                 $spreadsheet->getActiveSheet()->SetCellValue('C' . $aux, $row['filename']);
@@ -337,15 +399,17 @@ class ExportXls extends CI_Controller
         return $spreadsheet;
     }
 
-    private function datosCompletosResultadoDelProcedimiento($spreadsheet)
+    private function datosCompletosResultadoDelProcedimiento($spreadsheet, $datos)
     {
         $spreadsheet->setActiveSheetIndex(4);
         $spreadsheet->getActiveSheet()->setTitle("Resultado del Procedimiento");
 
-        $datos = $this->Xlsexport_model->getTenderResult("maestro_tender_result");
         if ($datos['num_rows'] > 0) {
             $aux = 2;
+            $contador = 0;
             foreach ($datos['datos'] as $datos) {
+                guardar_log("Excel", "Escribir tender result--" . $contador);
+                $contador++;
                 $spreadsheet->getActiveSheet()->SetCellValue('A' . $aux, $datos['id_ajena_licitacion']);
                 $spreadsheet->getActiveSheet()->SetCellValue('B' . $aux, $datos['resultCode']);
                 $spreadsheet->getActiveSheet()->SetCellValue('C' . $aux, $datos['description']);
@@ -368,15 +432,18 @@ class ExportXls extends CI_Controller
         return $spreadsheet;
     }
 
-    private function datosCompletosTipoProcedimiento($spreadsheet)
+    private function datosCompletosTipoProcedimiento($spreadsheet, $datos)
     {
         $spreadsheet->setActiveSheetIndex(5);
         $spreadsheet->getActiveSheet()->setTitle("Tipo Procedimiento");
 
-        $datos = $this->Xlsexport_model->getTenderProcessRelacion();
+        //$datos = $this->Xlsexport_model->getTenderProcessRelacion();
         if ($datos['num_rows'] > 0) {
             $aux = 2;
+            $contador = 0;
             foreach ($datos['datos'] as $datos) {
+                guardar_log("Excel", "Escribir tender process--" . $contador);
+                $contador++;
                 $spreadsheet->getActiveSheet()->SetCellValue('A' . $aux, $datos['id_ajena_licitacion']);
                 $spreadsheet->getActiveSheet()->SetCellValue('B' . $aux, $datos['procedureCode']);
                 $spreadsheet->getActiveSheet()->SetCellValue('C' . $aux, $datos['urgencyCode']);
@@ -400,15 +467,17 @@ class ExportXls extends CI_Controller
         return $spreadsheet;
     }
 
-    private function datosCompletosOfertas($spreadsheet)
+    private function datosCompletosOfertas($spreadsheet, $datos)
     {
         $spreadsheet->setActiveSheetIndex(6);
         $spreadsheet->getActiveSheet()->setTitle("Ofertas");
 
-        $datos = $this->Xlsexport_model->getTenderingTermsGarantia("maestro_tendering_terms");
         if ($datos['num_rows'] > 0) {
             $aux = 2;
+            $contador = 0;
             foreach ($datos['datos'] as $datos) {
+                guardar_log("Excel", "Escribir tender process--" . $contador);
+                $contador++;
                 $spreadsheet->getActiveSheet()->SetCellValue('A' . $aux, $datos['id_ajena_licitacion']);
                 $spreadsheet->getActiveSheet()->SetCellValue('B' . $aux, $datos['requiredCurriculaIndicator']);
                 $spreadsheet->getActiveSheet()->SetCellValue('C' . $aux, $datos['variantConstraintIndicator']);
@@ -427,35 +496,40 @@ class ExportXls extends CI_Controller
         return $spreadsheet;
     }
 
-    private function datosCriterioAdjudicacion($spreadsheet)
+    private function datosCriterioAdjudicacion($spreadsheet, $datos)
     {
         $spreadsheet->setActiveSheetIndex(7);
         $spreadsheet->getActiveSheet()->setTitle("Criterio Adjudicación");
 
-        /*$datos = $this->Xlsexport_model->getDatosRelacionadasTablaWithoutLicitacion("maestro_tendering_terms_awarding_terms", "maestro_tendering_terms", "id_ajena_tt");
+        //$datos = $this->Xlsexport_model->getDatosRelacionadasTablaWithoutLicitacion("maestro_tendering_terms_awarding_terms", "maestro_tendering_terms", "id_ajena_tt");
         if ($datos['num_rows'] > 0) {
-        $aux = 2;
-
-        foreach ($datos['datos'] as $datos) {
-        $spreadsheet->getActiveSheet()->SetCellValue('A' . $aux, $datos['id_ajena_tt']);
-        $spreadsheet->getActiveSheet()->SetCellValue('B' . $aux, $datos['evaluationCriteriaTypeCode']);
-        $spreadsheet->getActiveSheet()->SetCellValue('B' . $aux, $datos['description']);
-        $aux++;
+            $aux = 2;
+            $contador = 0;
+            foreach ($datos['datos'] as $datos) {
+                guardar_log("Excel", "Escribir criterio adjucicacion--" . $contador);
+                $contador++;
+                $spreadsheet->getActiveSheet()->SetCellValue('A' . $aux, $datos['id_ajena_licitacion']);
+                $spreadsheet->getActiveSheet()->SetCellValue('B' . $aux, $datos['evaluationCriteriaTypeCode']);
+                $spreadsheet->getActiveSheet()->SetCellValue('B' . $aux, $datos['description']);
+                $aux++;
+            }
         }
-        }*/
 
         return $spreadsheet;
     }
 
-    private function datosCriterioEvaluacionFinanciera($spreadsheet)
+    private function datosCriterioEvaluacionFinanciera($spreadsheet, $datos)
     {
         $spreadsheet->setActiveSheetIndex(8);
         $spreadsheet->getActiveSheet()->setTitle("CriteriosEvaluacionFinanciera");
 
-        $datos = $this->Xlsexport_model->getTenderingTermsCriteriosFinanciacion();
+        //$datos = $this->Xlsexport_model->getTenderingTermsCriteriosFinanciacion();
         if ($datos['num_rows'] > 0) {
             $aux = 2;
+            $contador = 0;
             foreach ($datos['datos'] as $datos) {
+                guardar_log("Excel", "Escribir criterios evaluacion financiera--" . $contador);
+                $contador++;
                 $spreadsheet->getActiveSheet()->SetCellValue('A' . $aux, $datos['id_ajena_licitacion']);
                 $spreadsheet->getActiveSheet()->SetCellValue('B' . $aux, $datos['evaluationCriteriaTypeCode']);
                 $spreadsheet->getActiveSheet()->SetCellValue('C' . $aux, $datos['description']);
@@ -465,15 +539,18 @@ class ExportXls extends CI_Controller
         return $spreadsheet;
     }
 
-    private function datosCriterioEvaluacionTecnica($spreadsheet)
+    private function datosCriterioEvaluacionTecnica($spreadsheet, $datos)
     {
         $spreadsheet->setActiveSheetIndex(9);
         $spreadsheet->getActiveSheet()->setTitle("Criterios Evaluación Técnica");
 
-        $datos = $this->Xlsexport_model->getTenderingTermsCriteriosTecnicos();
+        //$datos = $this->Xlsexport_model->getTenderingTermsCriteriosTecnicos();
         if ($datos['num_rows'] > 0) {
             $aux = 2;
+            $contador = 0;
             foreach ($datos['datos'] as $datos) {
+                guardar_log("Excel", "Escribir criterio evaluacion tecnica--" . $contador);
+                $contador++;
                 $spreadsheet->getActiveSheet()->SetCellValue('A' . $aux, $datos['id_ajena_licitacion']);
                 $spreadsheet->getActiveSheet()->SetCellValue('B' . $aux, $datos['evaluationCriteriaTypeCode']);
                 $spreadsheet->getActiveSheet()->SetCellValue('C' . $aux, $datos['description']);
@@ -484,15 +561,18 @@ class ExportXls extends CI_Controller
         return $spreadsheet;
     }
 
-    private function datosRequisitosParticipacion($spreadsheet)
+    private function datosRequisitosParticipacion($spreadsheet, $datos)
     {
         $spreadsheet->setActiveSheetIndex(10);
         $spreadsheet->getActiveSheet()->setTitle("Requisitos Participación");
 
-        $datos = $this->Xlsexport_model->getTenderingTermsRequisitos();
+        //$datos = $this->Xlsexport_model->getTenderingTermsRequisitos();
         if ($datos['num_rows'] > 0) {
             $aux = 2;
+            $contador = 0;
             foreach ($datos['datos'] as $datos) {
+                guardar_log("Excel", "Escribir requisitos participacion--" . $contador);
+                $contador++;
                 $spreadsheet->getActiveSheet()->SetCellValue('A' . $aux, $datos['id_ajena_licitacion']);
                 $spreadsheet->getActiveSheet()->SetCellValue('B' . $aux, $datos['evaluationCriteriaTypeCode']);
                 $aux++;
@@ -507,7 +587,10 @@ class ExportXls extends CI_Controller
 
         $spreadsheet->setActiveSheetIndex(11);
         $spreadsheet->getActiveSheet()->setTitle("Documentos Generales");
-        foreach ($datosLicitacion['generalDocs'] as $doc) {
+        $contador = 0;
+        foreach ($datosLicitacion['datos'] as $doc) {
+            guardar_log("Excel", "Escribir documentos generales--" . $contador);
+            $contador++;
             $spreadsheet->getActiveSheet()->SetCellValue('A' . $this->filaDocumentoGeneral, $doc['id_ajena_licitacion']);
             $spreadsheet->getActiveSheet()->SetCellValue('B' . $this->filaDocumentoGeneral, $doc['attachment']);
             $spreadsheet->getActiveSheet()->SetCellValue('C' . $this->filaDocumentoGeneral, $doc['fileName']);
@@ -523,7 +606,10 @@ class ExportXls extends CI_Controller
     {
         $spreadsheet->setActiveSheetIndex(12);
         $spreadsheet->getActiveSheet()->setTitle("Documentos Adicionales");
-        foreach ($datosLicitacion['additDocs'] as $doc) {
+        $contador = 0;
+        foreach ($datosLicitacion['datos'] as $doc) {
+            guardar_log("Excel", "Escribir documentos adicionales--" . $contador);
+            $contador++;
             $spreadsheet->getActiveSheet()->SetCellValue('A' . $this->filaDocumentoAdd, $doc['id_ajena_licitacion']);
             $spreadsheet->getActiveSheet()->SetCellValue('B' . $this->filaDocumentoAdd, $doc['attachment']);
             $spreadsheet->getActiveSheet()->SetCellValue('C' . $this->filaDocumentoAdd, $doc['idDoc']);
@@ -538,7 +624,10 @@ class ExportXls extends CI_Controller
     {
         $spreadsheet->setActiveSheetIndex(13);
         $spreadsheet->getActiveSheet()->setTitle("Documentos Técnicos");
-        foreach ($datosLicitacion['techDocs'] as $doc) {
+        $contador = 0;
+        foreach ($datosLicitacion['datos'] as $doc) {
+            guardar_log("Excel", "Escribir documentos tecnicos--" . $contador);
+            $contador++;
             $spreadsheet->getActiveSheet()->SetCellValue('A' . $this->filaDocumentoTech, $doc['id_ajena_licitacion']);
             $spreadsheet->getActiveSheet()->SetCellValue('B' . $this->filaDocumentoTech, $doc['attachment']);
             $spreadsheet->getActiveSheet()->SetCellValue('C' . $this->filaDocumentoTech, $doc['idDoc']);
@@ -553,7 +642,10 @@ class ExportXls extends CI_Controller
     {
         $spreadsheet->setActiveSheetIndex(14);
         $spreadsheet->getActiveSheet()->setTitle("Documentos Legales");
-        foreach ($datosLicitacion['legalDocs'] as $doc) {
+        $contador = 0;
+        foreach ($datosLicitacion['datos'] as $doc) {
+            guardar_log("Excel", "Escribir documentos legales--" . $contador);
+            $contador++;
             $spreadsheet->getActiveSheet()->SetCellValue('A' . $this->filaDocumentoLegal, $doc['id_ajena_licitacion']);
             $spreadsheet->getActiveSheet()->SetCellValue('B' . $this->filaDocumentoLegal, $doc['attachment']);
             $spreadsheet->getActiveSheet()->SetCellValue('C' . $this->filaDocumentoLegal, $doc['idDoc']);
@@ -577,33 +669,32 @@ class ExportXls extends CI_Controller
         $spreadsheet->getActiveSheet()->SetCellValue('H1', "Objeto del Contrato");
         $spreadsheet->getActiveSheet()->SetCellValue('I1', "Valor estimado del contrato");
         $spreadsheet->getActiveSheet()->SetCellValue('J1', "Presupuesto base sin impuestos");
-        $spreadsheet->getActiveSheet()->SetCellValue('K1', "Presupuesto base con impuestos");
-        $spreadsheet->getActiveSheet()->SetCellValue('L1', "CPV");
-        $spreadsheet->getActiveSheet()->SetCellValue('M1', "Tipo de contrato");
-        $spreadsheet->getActiveSheet()->SetCellValue('N1', "Lugar de ejecución");
-        $spreadsheet->getActiveSheet()->SetCellValue('O1', "Órgano de Contratación");
-        $spreadsheet->getActiveSheet()->SetCellValue('P1', "ID OC en PLACSP");
-        $spreadsheet->getActiveSheet()->SetCellValue('Q1', "NIF OC");
-        $spreadsheet->getActiveSheet()->SetCellValue('R1', "DIR3");
-        $spreadsheet->getActiveSheet()->SetCellValue('S1', "Enlace al Perfil de Contratante del OC");
-        $spreadsheet->getActiveSheet()->SetCellValue('T1', "Tipo de Administración");
-        $spreadsheet->getActiveSheet()->SetCellValue('U1', "Código Postal");
-        $spreadsheet->getActiveSheet()->SetCellValue('V1', "Tipo de procedimiento");
-        $spreadsheet->getActiveSheet()->SetCellValue('W1', "Sistema de contratación");
-        $spreadsheet->getActiveSheet()->SetCellValue('X1', "Tramitación");
-        $spreadsheet->getActiveSheet()->SetCellValue('Y1', "Forma de presentación de la oferta");
-        $spreadsheet->getActiveSheet()->SetCellValue('Z1', "Directiva de aplicación");
-        $spreadsheet->getActiveSheet()->SetCellValue('AA1', "Subcontratación permitida");
-        $spreadsheet->getActiveSheet()->SetCellValue('AB1', "Duración Contrato");
-        $spreadsheet->getActiveSheet()->SetCellValue('AC1', "Tipo de duración");
-        $spreadsheet->getActiveSheet()->SetCellValue('AD1', "Inicio contrato");
-        $spreadsheet->getActiveSheet()->SetCellValue('AE1', "Fin contrato");
-        $spreadsheet->getActiveSheet()->SetCellValue('AF1', "Extension Contrato");
-        $spreadsheet->getActiveSheet()->SetCellValue('AG1', "URL Organo Contratación");
-        $spreadsheet->getActiveSheet()->SetCellValue('AH1', "Ciudad Organo Contratación");
-        $spreadsheet->getActiveSheet()->SetCellValue('AI1', "Dirección Organo Contratación");
-        $spreadsheet->getActiveSheet()->SetCellValue('AJ1', "Nombre Contacto Organo Contratación");
-        $spreadsheet->getActiveSheet()->SetCellValue('AK1', "Email contacto Organo Contratación");
+        $spreadsheet->getActiveSheet()->SetCellValue('K1', "CPV");
+        $spreadsheet->getActiveSheet()->SetCellValue('L1', "Tipo de contrato");
+        $spreadsheet->getActiveSheet()->SetCellValue('M1', "Lugar de ejecución");
+        $spreadsheet->getActiveSheet()->SetCellValue('N1', "Órgano de Contratación");
+        $spreadsheet->getActiveSheet()->SetCellValue('O1', "ID OC en PLACSP");
+        $spreadsheet->getActiveSheet()->SetCellValue('P1', "NIF OC");
+        $spreadsheet->getActiveSheet()->SetCellValue('Q1', "DIR3");
+        $spreadsheet->getActiveSheet()->SetCellValue('R1', "Enlace al Perfil de Contratante del OC");
+        $spreadsheet->getActiveSheet()->SetCellValue('S1', "Tipo de Administración");
+        $spreadsheet->getActiveSheet()->SetCellValue('T1', "Código Postal");
+        $spreadsheet->getActiveSheet()->SetCellValue('U1', "Tipo de procedimiento");
+        $spreadsheet->getActiveSheet()->SetCellValue('V1', "Sistema de contratación");
+        $spreadsheet->getActiveSheet()->SetCellValue('W1', "Tramitación");
+        $spreadsheet->getActiveSheet()->SetCellValue('X1', "Forma de presentación de la oferta");
+        $spreadsheet->getActiveSheet()->SetCellValue('Y1', "Directiva de aplicación");
+        $spreadsheet->getActiveSheet()->SetCellValue('Z1', "Subcontratación permitida");
+        $spreadsheet->getActiveSheet()->SetCellValue('AA1', "Duración Contrato");
+        $spreadsheet->getActiveSheet()->SetCellValue('AB1', "Tipo de duración");
+        $spreadsheet->getActiveSheet()->SetCellValue('AC1', "Inicio contrato");
+        $spreadsheet->getActiveSheet()->SetCellValue('AD1', "Fin contrato");
+        $spreadsheet->getActiveSheet()->SetCellValue('AE1', "Extension Contrato");
+        $spreadsheet->getActiveSheet()->SetCellValue('AF1', "URL Organo Contratación");
+        $spreadsheet->getActiveSheet()->SetCellValue('AG1', "Ciudad Organo Contratación");
+        $spreadsheet->getActiveSheet()->SetCellValue('AH1', "Dirección Organo Contratación");
+        $spreadsheet->getActiveSheet()->SetCellValue('AI1', "Nombre Contacto Organo Contratación");
+        $spreadsheet->getActiveSheet()->SetCellValue('AJ1', "Email contacto Organo Contratación");
         return $spreadsheet;
     }
 
@@ -628,9 +719,6 @@ class ExportXls extends CI_Controller
         $spreadsheet->getActiveSheet()->SetCellValue('D1', "Importe sin Impuestos");
         $spreadsheet->getActiveSheet()->SetCellValue('E1', "Importe con Impuestos");
         $spreadsheet->getActiveSheet()->SetCellValue('F1', "Lugar de ejecución del lote");
-        $spreadsheet->getActiveSheet()->SetCellValue('G1', "Codigo de ejecución del lote");
-        $spreadsheet->getActiveSheet()->SetCellValue('H1', "Ciudad de ejecución del lote");
-        $spreadsheet->getActiveSheet()->SetCellValue('I1', "CPV Project Lot");
 
         return $spreadsheet;
     }

application/libraries/ParserFile.php

@@ -390,7 +390,6 @@ class ParserFile
                                 "id_compuesta_padre" => $this->idLicitacion . "_05_" . $i,
                                 "fecha_creacion_log" => $this->fechaInicioParser,
                                 "id_attr" => $this->existAttribute($xmlPrimitivo->ContractFolderStatus->ProcurementProjectLot->RequiredCommodityClassification, "ItemClassificationCode", "string", 'listURI'),
-                                //$resultEntries["itemClassification"][$i]['itemClassification'][$j]['id_attr'] = $this->existAttribute($clasificacionItems[$j], "ItemClassificationCode", "string", 'listURI');
                             );
                         }
                     }
@@ -665,6 +664,7 @@ class ParserFile
                 $resultEntries['noticeInfo'][$i]['noticeTypeCode'] = $this->existNodo($validNoticeInfo[$i], 'NoticeTypeCode', 'string');
                 $resultEntries['noticeInfo'][$i]['id_ajena_licitacion'] = $this->idLicitacion;
                 $resultEntries['noticeInfo'][$i]['id_compuesta'] = $this->idLicitacion . "_12_" . $i;
+                $resultEntries['noticeInfo'][$i]['fecha_creacion_log'] = $this->fechaInicioParser;
 
                 if (array_key_exists("AdditionalPublicationStatus", $validNoticeInfo[$i])) {
                     $AdditionalPublicationStatus = $validNoticeInfo[$i]['AdditionalPublicationStatus'];
@@ -689,6 +689,7 @@ class ParserFile
                                     $resultEntries['fechas'][$x]['id_ajena_licitacion'] = $this->idLicitacion;
                                     $resultEntries['fechas'][$x]['id_compuesta'] = $this->idLicitacion . "_12_" . $i . "_" . $j . "_" . $x;
                                     $resultEntries['fechas'][$x]['id_compuesta_padre'] = $this->idLicitacion . "_12_" . $i;
+                                    $resultEntries['fechas'][$x]['fecha_creacion_log'] = $this->fechaInicioParser;
                                 }
 
                                 if (array_key_exists("DocumentTypeCode", $additionalPublicationDocument[$x])) {
@@ -698,42 +699,18 @@ class ParserFile
                                     $resultEntries['documento'][$x]['id_ajena_licitacion'] = $this->idLicitacion;
                                     $resultEntries['documento'][$x]['id_compuesta'] = $this->idLicitacion . "_12_" . $i . "_" . $j . "_" . $x;
                                     $resultEntries['documento'][$x]['id_compuesta_padre'] = $this->idLicitacion . "_12_" . $i;
+                                    $resultEntries['documento'][$x]['fecha_creacion_log'] = $this->fechaInicioParser;
                                 }
                             }
                         }
                         unset($additionalPublicationDocument);
                     }
-
-                    /*$firstKey = array_key_first($additionalPublicationDocument['AdditionalPublicationDocumentReference']);
-                if ($firstKey !== 0) {
-                $additionalPublicationDocument['AdditionalPublicationDocumentReference'] = array(0 => $additionalPublicationDocument['AdditionalPublicationDocumentReference']);
-                }
-                for ($j = 0; $j < count($additionalPublicationDocument['AdditionalPublicationDocumentReference']); $j++) {
-
-                $firstKey = array_key_first($additionalPublicationDocument['AdditionalPublicationDocumentReference']);
-
-                if ($additionalPublicationDocument['AdditionalPublicationDocumentReference'][$j]['IssueDate']) {
-                $resultEntries[$i]['fechas'][$j]['fechas'] = $this->existNodo($additionalPublicationDocument['AdditionalPublicationDocumentReference'][$j], 'IssueDate', 'string');
-                $resultEntries[$i]['fechas'][$j]['id_ajena_licitacion'] = $this->idLicitacion;
-                $resultEntries[$i]['fechas'][$j]['id_compuesta'] = $this->idLicitacion . "_12_" . $i . "_" . $j;
-                $resultEntries[$i]['fechas'][$j]['id_compuesta_padre'] = $this->idLicitacion . "_12_" . $i;
-                }
-
-                if ($additionalPublicationDocument['AdditionalPublicationDocumentReference'][$j]['DocumentTypeCode']) {
-                $resultEntries[$i]['documento'][$j]['documento'] = $this->existNodo($additionalPublicationDocument['AdditionalPublicationDocumentReference'][$j]['Attachment']['ExternalReference'], 'URI', 'string');
-                $resultEntries[$i]['documento'][$j]['filename'] = $this->existNodo($additionalPublicationDocument['AdditionalPublicationDocumentReference'][$j]['Attachment']['ExternalReference'], 'FileName', 'string');
-                $resultEntries[$i]['documento'][$j]['id_ajena_licitacion'] = $this->idLicitacion;
-                $resultEntries[$i]['documento'][$j]['id_compuesta'] = $this->idLicitacion . "_12_" . $i . "_" . $j;
-                $resultEntries[$i]['documento'][$j]['id_compuesta_padre'] = $this->idLicitacion . "_12_" . $i;
-                }
-                }*/
                 }
             }
         }
 
         unset($AdditionalPublicationStatus);
         unset($validNoticeInfo);
-        //$resultFinal = $this->checkArrayValuesEmpty($resultEntries);
         return $resultEntries;
     }
 

application/models/Xlsexport_model.php

@@ -48,7 +48,9 @@ class Xlsexport_model extends CI_Model
                     MP.direccion,
                     MP.contact_name,
                     MP.contact_email,
-                    PROJ.NAME as name,
+                    MPI.idPartyIdent AS partyItem,
+                    MPI.attr as tipoIdParty,
+                    PROJ.NAME as nameProject,
                     PROJ.estimatedOverallContractAmount,
                     PROJ.taxExclusiveAmount,
                     PROJ.totalAmount,
@@ -70,22 +72,22 @@ class Xlsexport_model extends CI_Model
                     RTPU.nombre AS urgency,
                     LI.fecha_creacion_log
                 FROM
-                    maestro_datos_iniciales_licitacion LI
-                    JOIN import_licitaciones_temp temp ON LI.id_licitacion = temp.id_licitacion
-                    LEFT JOIN maestro_contract_folder CF ON CF.id_ajena_licitacion = LI.id_licitacion
-                    LEFT JOIN maestro_located_contracting_party LP ON LP.id_ajena_licitacion = LI.id_licitacion
-                    LEFT JOIN maestro_party MP ON MP.id_ajena_licitacion = LI.id_licitacion
-                    LEFT JOIN maestro_procurement_project PROJ ON PROJ.id_ajena_licitacion = LI.id_licitacion
-                    LEFT JOIN maestro_procurement_project_itemclass PROJI ON PROJI.id_ajena_licitacion = LI.id_licitacion
-                    LEFT JOIN maestro_tendering_process TP ON TP.id_ajena_licitacion = LI.id_licitacion
-                    LEFT JOIN maestro_tendering_terms TT ON TT.id_ajena_licitacion = LI.id_licitacion
-                    LEFT JOIN relacionada_contract_status RCF ON RCF.CODE = CF.contractFolderStatusCode
-                    LEFT JOIN relacionada_located_contracting_party RLP ON RLP.CODE = LP.contractingPartyTypeCode
-                    LEFT JOIN relacionada_tipo_contrato TPC ON TPC.CODE = PROJ.typeCode
-                    LEFT JOIN relacionada_tender_process RTP ON RTP.CODE = TP.procedureCode
-                    LEFT JOIN relacionada_tender_process_contracting_code RTPC ON RTPC.CODE = TP.contractingSystemCode
-                    LEFT JOIN relacionada_tender_process_submission RTPS ON RTPS.CODE = TP.submissionMethodCode
-                    LEFT JOIN relacionada_tender_process_urgency_code RTPU ON RTPU.CODE = TP.urgencyCode /*WHERE
+                maestro_datos_iniciales_licitacion LI
+                JOIN maestro_contract_folder CF ON CF.id_ajena_licitacion = LI.id_licitacion
+                JOIN maestro_located_contracting_party LP ON LP.id_ajena_licitacion = LI.id_licitacion
+                JOIN maestro_party MP ON MP.id_ajena_licitacion = LI.id_licitacion
+                JOIN maestro_party_party_idenfitication MPI on MPI.id_ajena_licitacion = LI.id_licitacion AND MPI.attr = 'DIR3'
+                JOIN maestro_procurement_project PROJ ON PROJ.id_ajena_licitacion = LI.id_licitacion
+                JOIN maestro_procurement_project_itemclass PROJI ON PROJI.id_ajena_licitacion = LI.id_licitacion
+                JOIN maestro_tendering_process TP ON TP.id_ajena_licitacion = LI.id_licitacion
+                JOIN maestro_tendering_terms TT ON TT.id_ajena_licitacion = LI.id_licitacion
+                JOIN relacionada_contract_status RCF ON RCF.CODE = CF.contractFolderStatusCode
+                JOIN relacionada_located_contracting_party RLP ON RLP.CODE = LP.contractingPartyTypeCode
+                JOIN relacionada_tipo_contrato TPC ON TPC.CODE = PROJ.typeCode
+                JOIN relacionada_tender_process RTP ON RTP.CODE = TP.procedureCode
+                JOIN relacionada_tender_process_contracting_code RTPC ON RTPC.CODE = TP.contractingSystemCode
+                JOIN relacionada_tender_process_submission RTPS ON RTPS.CODE = TP.submissionMethodCode
+                JOIN relacionada_tender_process_urgency_code RTPU ON RTPU.CODE = TP.urgencyCode /*WHERE
                 LI.id < 17174 */
 
                 GROUP BY
@@ -99,6 +101,63 @@ class Xlsexport_model extends CI_Model
         return $datos;
     }
 
+    public function getFullDatosUltimasInsertadas()
+    {
+        $sql = "SELECT *
+                FROM
+                vista_datos_licitacion";
+        $result = $this->db->query($sql);
+        $datos['datos'] = $result->result();
+        $datos['num_rows'] = $result->num_rows();
+        return $datos;
+    }
+
+    public function getTablaByFechaLog($tabla)
+    {
+        $sql = "SELECT * FROM $tabla
+                WHERE fecha_creacion_log = '2022-02-24 14:38:36'";
+        $result = $this->db->query($sql);
+        $datos['datos'] = $result->result_array();
+        $datos['num_rows'] = $result->num_rows();
+        return $datos;
+    }
+
+    public function getProjectLotItem()
+    {
+        $sql = "SELECT
+                    MP.idProcurementLot,
+                    MP.countrySubentity,
+                    MP.countrySubentityCode,
+                    MP.totalAmount,
+                    MP.taxExclusiveAmount,
+                    MP.`name`,
+                    MP.id_ajena_licitacion,
+                    GROUP_CONCAT( MPI.idItem ) AS itemClassification_attr
+
+                FROM
+                    maestro_procurement_project_lot MP
+                    JOIN maestro_procurement_project_lot_item MPI ON MP.id_compuesta = MPI.id_compuesta_padre
+                WHERE
+                    MPI.fecha_creacion_log = '2022-02-24 14:38:36'
+                    GROUP BY
+                    MP.id_compuesta";
+        $result = $this->db->query($sql);
+        $datos['datos'] = $result->result_array();
+        $datos['num_rows'] = $result->num_rows();
+        return $datos;
+    }
+
+    public function getFechasPublicadas($idLicitacion)
+    {
+        $sql = "SELECT MIN(fechas) as fecha
+                FROM
+                maestro_valid_notice_info_fecha WHERE id_ajena_licitacion = '$idLicitacion'";
+        $result = $this->db->query($sql);
+        $datos['datos'] = $result->row();
+        $datos['num_rows'] = $result->num_rows();
+        return $datos;
+    }
+
     public function getDatosByTablaAndLicitacion($tabla, $licitacionID)
     {
         $sql = "SELECT *
@@ -262,7 +321,7 @@ class Xlsexport_model extends CI_Model
                     *
                 FROM
                     maestro_procurement_project_lot_item
-                WHERE id_ajena_ppl = $projectLotId";
+                WHERE id_compuesta_padre = '$projectLotId'";
         $result = $this->db->query($sql);
         $datos['datos'] = $result->result_array();
         $datos['num_rows'] = $result->num_rows();