Library update
This commit is contained in:
Michael RICOIS
parent
aa0230fcf5
commit
edfe7e30bd
@ -5628,28 +5628,31 @@ class Metier_Insee_MInsee extends Metier_Insee_Table
|
||||
}
|
||||
$strIdAnn = " AND Num_Affaire='$num' AND Num_Parution='$par' ";
|
||||
}
|
||||
}
|
||||
|
||||
$mBalo = new Metier_Bodacc_MBalo();
|
||||
$mBalo = new Metier_Bodacc_MBalo();
|
||||
|
||||
$stmt = $this->conn->executeQuery("SELECT Societe_Rcs, Categorie, Num_Affaire, Date_Parution,
|
||||
Num_Parution, Url_Annonce_Html, Url_Annonce_Pdf, Annonce_Html, dateInsert
|
||||
FROM jo.balo WHERE Societe_Rcs='$siren' $strIdAnn ORDER BY Date_Parution DESC, Num_Affaire LIMIT $offset, $lignes");
|
||||
try {
|
||||
$stmt = $this->conn->executeQuery("SELECT Societe_Rcs, Categorie, Num_Affaire,
|
||||
Date_Parution, Num_Parution, Url_Annonce_Html, Url_Annonce_Pdf, Annonce_Html, dateInsert
|
||||
FROM jo.balo WHERE Societe_Rcs='$siren' $strIdAnn
|
||||
ORDER BY Date_Parution DESC, Num_Affaire LIMIT $offset, $lignes");
|
||||
} catch (\Doctrine\DBAL\DBALException $e) {
|
||||
}
|
||||
|
||||
if ($stmt->rowCount() > 0) {
|
||||
while ($row = $stmt->fetch(\PDO::FETCH_ASSOC)) {
|
||||
$tabRetEven = array( 0 => array(
|
||||
if ($stmt->rowCount() > 0) {
|
||||
while ($row = $stmt->fetch(\PDO::FETCH_ASSOC)) {
|
||||
$tabRetEven = array( 0 => array(
|
||||
'CodeEven' => $mBalo->getLibEven($row['Categorie']),
|
||||
'LibEven' => $row['Categorie']
|
||||
));
|
||||
}
|
||||
|
||||
$texte = '';
|
||||
if ($idAnnonce != 0) {
|
||||
$texte = strtr(
|
||||
preg_replace('/<html.*<body.*>/Uis', '',
|
||||
preg_replace('/( class=".*")/ie', ' ', $row['Annonce_Html'])),
|
||||
array(' '=>' ', '</html>'=>'', '</body>'=>'')
|
||||
);
|
||||
$texte = strtr(preg_replace('/<html.*<body.*>/Uis', '',
|
||||
preg_replace('/( class=".*")/ie', ' ', $row['Annonce_Html'])),
|
||||
array(' '=>' ', '</html>'=>'', '</body>'=>'')
|
||||
);
|
||||
}
|
||||
|
||||
$tabRet[] = array(
|
||||
@ -5718,6 +5721,7 @@ class Metier_Insee_MInsee extends Metier_Insee_Table
|
||||
$strIdAnn = "";
|
||||
}
|
||||
}
|
||||
try {
|
||||
$stmt = $this->conn->executeQuery("SELECT l.id, l.idAnn, l.Boamp_Code, l.Boamp_Rubrique,
|
||||
b.Boamp_Rubrique_Lib, b.typeAnnonce, l.Boamp_Date_Parution, b.Boamp_Num,
|
||||
b.Boamp_Annee_Parution, b.Num_AnnoncePre, b.Num_Annonce, b.Boamp_Dept, b.annonce,
|
||||
@ -5727,7 +5731,11 @@ class Metier_Insee_MInsee extends Metier_Insee_Table
|
||||
l.cpvComp, l.volume, l.execution, l.livraison, l.dureeJours, l.dureeMois, l.dateDeb,
|
||||
l.dateFin, l.dateInsert, d.titre, d.objet, d.titreMarche, d.typeObjetMarche, d.objetAutre, d.autres
|
||||
FROM jo.boamp_lots l, jo.boamp b, jo.boamp_detail d
|
||||
WHERE l.siren=$siren AND l.idAnn=b.id AND l.idAnn=d.id $strIdAnn GROUP BY b.id ORDER BY l.Boamp_Date_Parution DESC LIMIT $offset,$lignes");
|
||||
WHERE l.siren=$siren AND l.idAnn=b.id $strIdAnn
|
||||
GROUP BY b.id ORDER BY l.Boamp_Date_Parution DESC LIMIT $offset,$lignes");
|
||||
} catch(\Doctrine\DBAL\DBALException $e) {
|
||||
file_put_contents('test.log', $e->getMessage());
|
||||
}
|
||||
if ($stmt->rowCount() > 0) {
|
||||
while ($ann = $stmt->fetch(\PDO::FETCH_ASSOC)) {
|
||||
$tabRetEven = array();
|
||||
@ -5813,13 +5821,20 @@ class Metier_Insee_MInsee extends Metier_Insee_Table
|
||||
$strIdAnn = "";
|
||||
}
|
||||
}
|
||||
$stmt = $this->conn->executeQuery("SELECT d.id, d.Boamp_Code, d.Boamp_Rubrique,
|
||||
b.Boamp_Rubrique_Lib, b.typeAnnonce, d.Boamp_Date_Parution, b.Boamp_Num,
|
||||
b.Boamp_Annee_Parution, b.Num_AnnoncePre, b.Num_Annonce, b.Boamp_Dept,
|
||||
b.annonce, titre AS description, d.raisonSociale, d.estimValeur AS montantTxt,
|
||||
d.estimValeurMin AS montantAnMin, d.estimValeurMax AS montantAnMax,
|
||||
objet, cpv_obj, cpv_comp, d.dateInsert FROM jo.boamp b, jo.boamp_detail d
|
||||
WHERE d.siren=$siren AND d.id=b.id $strIdAnn GROUP BY b.id ORDER BY d.Boamp_Date_Parution DESC");
|
||||
try {
|
||||
$stmt = $this->conn->executeQuery("SELECT d.id, d.Boamp_Code, d.Boamp_Rubrique,
|
||||
b.Boamp_Rubrique_Lib, b.typeAnnonce, d.Boamp_Date_Parution, b.Boamp_Num,
|
||||
b.Boamp_Annee_Parution, b.Num_AnnoncePre, b.Num_Annonce, b.Boamp_Dept,
|
||||
b.annonce, titre AS description, d.raisonSociale, d.estimValeur AS montantTxt,
|
||||
d.estimValeurMin AS montantAnMin, d.estimValeurMax AS montantAnMax,
|
||||
objet, cpv_obj, cpv_comp, d.dateInsert
|
||||
FROM jo.boamp b, jo.boamp_detail d
|
||||
WHERE d.siren=$siren AND d.id=b.id $strIdAnn
|
||||
GROUP BY b.id ORDER BY d.Boamp_Date_Parution DESC LIMIT $offset,$lignes");
|
||||
} catch(\Doctrine\DBAL\DBALException $e) {
|
||||
file_put_contents('test.log', $e->getMessage());
|
||||
}
|
||||
|
||||
if ($stmt->rowCount() > 0) {
|
||||
while ($ann = $stmt->fetch(\PDO::FETCH_ASSOC)) {
|
||||
$id = $ann['id'];
|
||||
@ -5832,16 +5847,16 @@ class Metier_Insee_MInsee extends Metier_Insee_Table
|
||||
|
||||
if ($rub=='6' || // Avis d'attribution
|
||||
$rub=='7' || // Avis en cas de transparence ex ante volontaire
|
||||
$rub=='77' || // Avis d'attribution
|
||||
$rub=='77' || // Avis d'attribution
|
||||
$rub=='8' || // Avis d'attribution
|
||||
$rub=='82' || // Rectificatif
|
||||
$rub=='83' || // Rectificatif
|
||||
$rub=='84' || // Avis d'attribution comportant des lots infructueux
|
||||
$rub=='82' || // Rectificatif
|
||||
$rub=='83' || // Rectificatif
|
||||
$rub=='84' || // Avis d'attribution comportant des lots infructueux
|
||||
$rub=='9' || // Résultat de marché
|
||||
$rub=='92' || // Rectificatif
|
||||
$rub=='93' || // Résultat de marché / Infructueux - Sans suite
|
||||
$rub=='94' || // Résultat de marché / Résultat de marché comportant des lots infructueux
|
||||
$rub=='96' || // Annulation - Rectificatif - Sans suite - Infructueux
|
||||
$rub=='92' || // Rectificatif
|
||||
$rub=='93' || // Résultat de marché / Infructueux - Sans suite
|
||||
$rub=='94' || // Résultat de marché / Résultat de marché comportant des lots infructueux
|
||||
$rub=='96' || // Annulation - Rectificatif - Sans suite - Infructueux
|
||||
$rub=='977' // Annulation - Rectificatif / Avis en cas de transparence ex ante volontaire
|
||||
) {
|
||||
$stmt2 = $this->conn->executeQuery("SELECT l.id, l.idAnn, l.Boamp_Code,
|
||||
@ -5850,8 +5865,7 @@ class Metier_Insee_MInsee extends Metier_Insee_Table
|
||||
l.trancheCond, l.trancheFerme, l.dateAttrib, l.intitule, l.nomenclature,
|
||||
l.objets, l.cpv, l.cpvComp, l.volume, l.execution, l.livraison,
|
||||
l.dureeJours, l.dureeMois, l.dateDeb, l.dateFin
|
||||
FROM jo.boamp_lots l
|
||||
WHERE l.idAnn=$id");
|
||||
FROM jo.boamp_lots l WHERE l.idAnn=$id");
|
||||
while ($ann2 = $stmt2->fetch(\PDO::FETCH_ASSOC)) {
|
||||
if ($ann2['nom'] != '') {
|
||||
$strMontant.= ' "'.strtoupper($ann2['nom']).'"';
|
||||
@ -5937,8 +5951,8 @@ class Metier_Insee_MInsee extends Metier_Insee_Table
|
||||
|
||||
// --- Recherche dans les avis d'attribution
|
||||
if ($type=='' || $type=='A') {
|
||||
$stmt = $this->conn->executeQuery("SELECT COUNT(l.id) AS nb FROM jo.boamp_lots l, jo.boamp b, jo.boamp_detail d
|
||||
WHERE l.siren=$siren AND l.idAnn=b.id AND l.idAnn=d.id GROUP BY b.id ORDER BY l.Boamp_Date_Parution");
|
||||
$stmt = $this->conn->executeQuery("SELECT COUNT(b.id) AS nb FROM jo.boamp_lots l, jo.boamp b, jo.boamp_detail d
|
||||
WHERE l.siren=$siren AND l.idAnn=b.id");
|
||||
if ($stmt->rowCount()) {
|
||||
$result = $stmt->fetch(\PDO::FETCH_OBJ);
|
||||
$bodaccA = $result->nb;
|
||||
@ -5948,7 +5962,7 @@ class Metier_Insee_MInsee extends Metier_Insee_Table
|
||||
// --- Recherche dans les avis de marchés
|
||||
if ($type=='' || $type=='M') {
|
||||
$stmt = $this->conn->executeQuery("SELECT COUNT(d.id) AS nb FROM jo.boamp b, jo.boamp_detail d
|
||||
WHERE d.siren=$siren AND d.id=b.id GROUP BY b.id ORDER BY d.Boamp_Date_Parution DESC");
|
||||
WHERE d.siren=$siren AND d.id=b.id");
|
||||
if ($stmt->rowCount()) {
|
||||
$result = $stmt->fetch(\PDO::FETCH_OBJ);
|
||||
$bodaccM = $result->nb;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user