150,7 → 150,7 |
if ($this->annee != null) { |
$requete .= ' YEAR(date_transmission) = ' . $this->annee . " AND"; |
} |
$requete .= " (mots_cles_texte LIKE '%determiner%' OR nom_sel_nn = '' OR nom_sel_nn IS NULL OR certitude IN ('à déterminer','douteux'))"; |
$requete .= " (mots_cles_texte LIKE '%determiner%' OR nom_sel_nn = '' OR nom_sel_nn IS NULL OR certitude IN ('aDeterminer','douteux'))"; |
if ($mpm) { |
$requete = $this->encapsulerMPM($requete, 'date_transmission'); |
} |
182,7 → 182,7 |
if ($this->annee != null) { |
$requete .= ' YEAR(date_transmission) = ' . $this->annee . " AND"; |
} |
$requete .= " (mots_cles_texte LIKE '%determiner%' OR certitude IN ('à déterminer','douteux'))"; |
$requete .= " (mots_cles_texte LIKE '%determiner%' OR certitude IN ('aDeterminer','douteux'))"; |
if ($mpm) { |
$requete = $this->encapsulerMPM($requete, 'date_transmission'); |
} |
198,7 → 198,7 |
if ($this->annee != null) { |
$requete .= ' YEAR(date_transmission) = ' . $this->annee . " AND"; |
} |
$requete .= " (certitude IN ('à déterminer','douteux')))"; |
$requete .= " (certitude IN ('aDeterminer','douteux')))"; |
if ($mpm) { |
// @TODO vérifier que grouper sur "date" est pertinent |
// date_transmission n'est pas dispo pour grouper ici :-/ |
216,7 → 216,7 |
if ($this->annee != null) { |
$requete .= ' YEAR(date_transmission) = ' . $this->annee . " AND"; |
} |
$requete .= " (mots_cles_texte LIKE '%determiner%' OR certitude IN ('à déterminer','douteux')) AND id_observation IN" |
$requete .= " (mots_cles_texte LIKE '%determiner%' OR certitude IN ('aDeterminer','douteux')) AND id_observation IN" |
. " (SELECT ce_observation FROM del_commentaire WHERE proposition_initiale = 1" |
. " AND nom_sel_nn != 0" |
. " AND nom_sel_nn IS NOT NULL" |
245,7 → 245,7 |
if ($this->annee != null) { |
$requete .= ' YEAR(date_transmission) = ' . $this->annee . " AND"; |
} |
$requete .= " (mots_cles_texte LIKE '%determiner%' OR certitude IN ('à déterminer','douteux')) AND id_observation IN" |
$requete .= " (mots_cles_texte LIKE '%determiner%' OR certitude IN ('aDeterminer','douteux')) AND id_observation IN" |
. " (SELECT ce_observation FROM del_commentaire WHERE proposition_initiale = 1 AND proposition_retenue = 0" |
. " AND nom_sel_nn != 0" |
. " AND nom_sel_nn IS NOT NULL" |