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

* Finish task #92306.

Browse Source
This commit is contained in:
Yagami
2023-05-12 13:54:11 +08:00
parent 3c40bfe469
commit 2b42d7278b
6 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/programplan/model.php
+5 -3
View File
@@ -368,7 +368,7 @@ class programplanModel extends model
if($project->model == 'ipd' and $datas)
{
$this->loadModel('review');
$reviewPoints = $this->dao->select('t1.*, t2.status')->from(TABLE_OBJECT)->alias('t1')
$reviewPoints = $this->dao->select('t1.*, t2.status, t2.lastReviewedDate')->from(TABLE_OBJECT)->alias('t1')
->leftJoin(TABLE_REVIEW)->alias('t2')->on('t1.id = t2.object')
->where('t1.deleted')->eq('0')
->andWhere('t1.project')->eq($projectID)
@@ -419,11 +419,13 @@ class programplanModel extends model
$data->attribute = '';
$data->milestone = '';
$data->owner_id = '';
$data->status = $point->status ? zget($this->lang->review->statusList, $point->status) : $this->lang->review->wait;
$data->rawStatus = $point->status;
$data->status = $point->status ? zget($this->lang->review->statusList, $point->status) : $this->lang->programplan->wait;
$data->status = "<span class='status-{$point->status}'>" . $data->status . '</span>';
$data->begin = $end;
$data->deadline = $end;
$data->realBegan = $point->createdDate;
$data->realEnd = '';;
$data->realEnd = $point->lastReviewedDate;;
$data->parent = $plan->id;
$data->open = true;
$data->start_date = $end;