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

* adjust for api.

Browse Source
This commit is contained in:
王怡栋
2021-11-15 11:31:12 +08:00
parent 93794998a9
commit d6cd8a284e
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/v1/entries/products.php
View File

@@ -103,9 +103,11 @@ class productsEntry extends entry
$line->children[$product->id] = $product;
if($product->status != 'closed') $unclosedTotal += 1;
}
if(isset($line->children)) $line->children = array_values($line->children);
$programs[$programID]->children[$lineID] = $line;
}
if(isset($programs[$programID]->children)) $programs[$programID]->children = array_values($programs[$programID]->children);
$programs[$programID]->unclosedTotal = $unclosedTotal;
}
}

9
api/v1/entries/programs.php
View File

@@ -9,7 +9,7 @@
* @version 1
* @link http://www.zentao.net
*/
class ProgramsEntry extends Entry
class programsEntry extends Entry
{
/**
* GET method.
@@ -19,17 +19,20 @@ class ProgramsEntry extends Entry
*/
public function get()
{
$mergeChildren = $this->param('mergeChildren', '');
$program = $this->loadController('program', 'browse');
$program->browse($this->param('status', 'all'), $this->param('order', 'order_asc'));
$data = $this->getData();
if(isset($data->status) and $data->status == 'success')
{
$programs = $data->data->programs;
$programs = (array)$data->data->programs;
$users = $data->data->users;
$result = array();
foreach($programs as $program)
{
$program->progress = zget($progressList, $program->id, 0);
$program->progress = zget($data->data->progressList, $program->id, 0);
$param = $this->format($program, 'begin:date,end:date,realBegan:date,realEnd:date,openedDate:time,lastEditedDate:time,closedDate:time,canceledDate:time,deleted:bool');
if($mergeChildren)