Merge branch 'sprint/221_tianshujie_62947' into 'master'

Sprint/221 tianshujie 62947 See merge request easycorp/zentaopms!4761
2022-08-03 06:52:24 +00:00
parent b8a08650b6 e8e657e6bb
commit ed719f768f
11 changed files with 107 additions and 6 deletions
@@ -949,6 +949,8 @@ class executionModel extends model
            ->setDefault('status', 'doing')
            ->setDefault('lastEditedBy', $this->app->user->account)
            ->setDefault('lastEditedDate', $now)
+            ->setDefault('closedBy', '')
+            ->setDefault('closedDate', '')
            ->stripTags($this->config->execution->editor->activate['id'], $this->config->allowedTags)
            ->remove('comment,readjustTime,readjustTask')
            ->get();
@@ -4722,4 +4724,23 @@ class executionModel extends model
            echo '</td>';
        }
    }
+
+    /*
+     * Build search form
+     *
+     * @param int     $queryID
+     * @param string  $actionURL
+     * @return void
+     * */
+    public function buildSearchFrom($queryID, $actionURL)
+    {
+        $this->config->execution->all->search['queryID']   = $queryID;
+        $this->config->execution->all->search['actionURL'] = $actionURL;
+
+        $projectPairs  = array(0 => '');
+        $projectPairs += $this->loadModel('project')->getPairsByProgram();
+        $this->config->execution->all->search['params']['project']['values'] = $projectPairs + array('all' => $this->lang->execution->allProject);
+
+        $this->loadModel('search')->setSearchParams($this->config->execution->all->search);
+    }
 }