Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* [task#127513,doing,1h] Compitagle history data.

Browse Source
This commit is contained in:
daitingting
2024-09-05 17:28:24 +08:00
committed by 綦新志
parent 1afb285b2a
commit b18609dc9a
2 changed files with 24 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/chart/model.php
+15 -4
View File
@@ -757,13 +757,24 @@ class chartModel extends model
if(!isset($filter['default'])) continue;
if(isset($filter['from']) and $filter['from'] == 'query')
{
$default = $filter['default'];
$relatedField = $filter['relatedField'];
$sql = str_replace('$' . $filter['field'] . 'Condition', "{$relatedField}='{$default}'", $sql);
$default = $filter['default'];
if(strpos($sql, $filter['field'] . 'Condition') === false)
{
$sql = str_replace('$' . $filter['field'], "'{$default}'", $sql);
}
else
{
$relatedField = $filter['relatedField'];
$sql = str_replace('$' . $filter['field'] . 'Condition', "{$relatedField}='{$default}'", $sql);
}
}
}
}
if(preg_match_all("/[\$]+[a-zA-Z0-9]+_[0-9]+Condition/", $sql, $out))
$matchRule = "[\$]+[a-zA-Z0-9]+_[0-9]";
if(strpos($sql, 'Condition') !== false && strpos($sql, 'Variale_') !== false) $matchRule .= "+Condition";
if(preg_match_all("/{$matchRule}/", $sql, $out))
{
foreach($out[0] as $match) $sql = str_replace($match, "''", $sql);
}
module/pivot/model.php
+9 -1
View File
@@ -699,7 +699,15 @@ class pivotModel extends model
if(isset($filter['from']) && $filter['from'] == 'query')
{
$queryDefault = isset($filter['default']) ? $this->processDateVar($filter['default']) : '';
$sql = str_replace('$' . $filter['field'] . 'Condition', "{$filter['relatedField']}='{$queryDefault}'", $sql);
if(strpos($sql, $filter['field'] . 'Condition') === false)
{
$sql = str_replace('$' . $filter['field'], "'{$queryDefault}'", $sql);
}
else
{
$sql = str_replace('$' . $filter['field'] . 'Condition', "{$filter['relatedField']}='{$queryDefault}'", $sql);
}
}
else
{