scores/webservice
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'develop'

Browse Source
This commit is contained in:
Michael RICOIS 2016-11-28 14:36:52 +01:00
commit 09160ef110
2 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
library/Metier/Insee/MInsee.php
View File

@ -5827,9 +5827,10 @@ class Metier_Insee_MInsee extends Metier_Insee_Table
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
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");
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());
}
@ -5864,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']).'"';
@ -5951,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 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;
@ -5962,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;

16
library/WsScore/Entreprise/v0.8/Service.php
View File

@ -2024,7 +2024,7 @@ class Entreprise extends Scores_Ws_Server
//Valeur max
if($nbRep > 200) { $nbRep = 200; }
$type = array('A', 'M');
$type = 'A';
if (is_array($filtre->item) && count($filtre->item)>0) {
foreach($filtre->item as $item) {
@ -2043,7 +2043,7 @@ class Entreprise extends Scores_Ws_Server
}
$iInsee = new Metier_Insee_MInsee();
if ( empty($idAnn) ) {
if (empty($idAnn)) {
$nbReponses = $iInsee->getAnnoncesBoampCount($siren, $type);
$anns = $iInsee->getAnnoncesBoamp($siren, $idAnn, $type, $position, $nbRep);
} else {
@ -2052,7 +2052,7 @@ class Entreprise extends Scores_Ws_Server
}
$liste = array();
if (is_array($anns) && count($anns)>0) {
if (is_array($anns) && count($anns) > 0) {
foreach ($anns as $nb=>$ann) {
$entites = array();
@ -2070,13 +2070,11 @@ class Entreprise extends Scores_Ws_Server
//Search titulaire
$boamplotsM = new Application_Model_JoBoampLots();
$sql = $boamplotsM->select()->from($boamplotsM, array(
'LPAD(siren, 9, 000000000) AS siren',
'LPAD(nic, 5, 00000) AS nic', 'nom','adresse','cp', 'ville', 'pays')
)->where('idAnn=?', substr($ann['id'],2));
'LPAD(siren, 9, 000000000) AS siren',
'LPAD(nic, 5, 00000) AS nic', 'nom','adresse','cp', 'ville', 'pays')
)->where('idAnn=?', substr($ann['id'],2));
$result = $boamplotsM->fetchAll($sql);
if (count($result)>0) {
if (count($result) > 0) {
foreach ($result as $entity) {
$entite = new AnnonceEntite();
$entite->siret = $entity->siren.$entity->nic;