Merge branch ztflow-caoyanyi-feature/task-report#caoyanyi of zentao/zentaopms (#9293)

2025-06-09 16:41:07 +08:00
parent c8469d0cde fdd2115e71
commit 4b54da199c
1 changed files with 58 additions and 0 deletions
@@ -2021,4 +2021,62 @@ class storyZen extends story
        }
        return $storyIdList;
    }
+
+    /**
+     * 处理过滤条件显示内容。
+     * Process filter title.
+     *
+     * @param  string $browseType
+     * @param  int    $param
+     * @access public
+     * @return string
+     */
+    protected function processFilterTitle(string $browseType, int $param): string
+    {
+        if($browseType != 'bysearch' && $browseType != 'bymodule')
+        {
+            $statusName = zget($this->lang->execution->featureBar['story'], $browseType, '');
+            return sprintf($this->lang->story->report->tpl->feature, $statusName);
+        }
+
+        $fieldParams  = array();
+        $searchConfig = $this->session->executionStorysearchParams;
+        if($searchConfig) $fieldParams = json_decode($searchConfig['fieldParams'], true);
+        if($browseType == 'bymodule') return sprintf($this->lang->story->report->tpl->search, $this->config->execution->search['fields']['module'], '=', zget($fieldParams, $param));
+
+        $leftConditions  = array();
+        $rightConditions = array();
+        $searchFields    = $this->session->executionStoryForm;
+        $fieldNames      = json_decode($searchConfig['searchFields']);
+        if(!$searchFields) return '';
+
+        $this->app->loadLang('search');
+        $groupAndOr = 'and';
+        $users      = $this->loadModel('user')->getPairs('noletter');
+        foreach($searchFields as $index => $field)
+        {
+            if($index == 6) $groupAndOr = $field['groupAndOr'];
+            if(!isset($field['field'])) continue;
+
+            if(isset($field['value']) && $field['value'] === '') continue;
+            if(!empty($fieldParams[$field['field']]['values']))
+            {
+                if($fieldParams[$field['field']]['values'] == 'users') $fieldParams[$field['field']]['values'] = $users;
+                $field['value'] = zget($fieldParams[$field['field']]['values'], $field['value']);
+            }
+
+            $fieldName = zget($fieldNames, $field['field']);
+            $operator  = zget($this->lang->search->operators, $field['operator']);
+
+            if($index == 0 || $index == 3) $field['andOr'] = '';
+            if($index < 3)     $leftConditions[]  = zget($this->lang->search->andor, $field['andOr']) . sprintf($this->lang->story->report->tpl->search, $fieldName, $operator, $field['value']);
+            elseif($index < 6) $rightConditions[] = zget($this->lang->search->andor, $field['andOr']) . sprintf($this->lang->story->report->tpl->search, $fieldName, $operator, $field['value']);
+        }
+
+        if(empty($leftConditions) && empty($rightConditions)) return '';
+        if(empty($leftConditions))  return implode('', $rightConditions);
+        if(empty($rightConditions)) return implode('', $leftConditions);
+
+        return sprintf($this->lang->story->report->tpl->multi, implode('', $leftConditions), zget($this->lang->search->andor, $groupAndOr), implode('', $rightConditions));
+    }
 }