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

* Fromfeedback and fromticket convert to opened.

Browse Source
This commit is contained in:
宋辰轩
2022-12-27 15:39:20 +08:00
parent 3141fb89f3
commit 5d5bec97db
3 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/report/model.php
+3 -1
View File
@@ -946,7 +946,7 @@ class reportModel extends model
->where('t1.objectType')->eq($objectType)
->andWhere('t2.deleted')->eq(0)
->andWhere('LEFT(t1.date, 4)')->eq($year)
->andWhere('t1.action')->in(array_keys($this->config->report->annualData['month'][$objectType]))
->andWhere('t1.action')->in($this->config->report->annualData['monthAction'][$objectType])
->beginIF($accounts)->andWhere('t1.actor')->in($accounts)->fi()
->query();
@@ -958,6 +958,8 @@ class reportModel extends model
$statuses[$action->objectID] = $action->status;
$lowerAction = strtolower($action->action);
/* Story,bug can from feedback and ticket, task can from feedback, boil this action down to opened. */
if(in_array($lowerAction, array('fromfeedback', 'fromticket'))) $lowerAction = 'opened';
if(!isset($actionStat[$lowerAction]))
{
foreach($months as $month) $actionStat[$lowerAction][$month] = 0;