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

Merge branch '230' into sprint/zentaopms230

Browse Source
This commit is contained in:
sunguangming
2022-08-25 09:59:07 +08:00
parent 1ac7743874 01172dd284
commit f49d83f024
7 changed files with 57 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/execution/model.php
+4 -2
View File
@@ -2146,7 +2146,8 @@ class executionModel extends model
{
$this->loadModel('task');
$tasks = $this->dao->select('id,execution,assignedTo,story,consumed,status')->from(TABLE_TASK)->where('id')->in($this->post->tasks)->fetchAll('id');
$execution = $this->getByID($executionID);
$tasks = $this->dao->select('id,execution,assignedTo,story,consumed,status')->from(TABLE_TASK)->where('id')->in($this->post->tasks)->fetchAll('id');
foreach($tasks as $task)
{
/* Save the assignedToes and stories, should linked to execution. */
@@ -2154,8 +2155,9 @@ class executionModel extends model
$stories[$task->story] = $task->story;
$data = new stdclass();
$data->project = $execution->project;
$data->execution = $executionID;
$data->status = $task->consumed > 0 ? 'doing' : 'wait';
$data->status = $task->consumed > 0 ? 'doing' : 'wait';
if($task->status == 'cancel')
{