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

Merge branch 'zentaopms_256' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_256

Browse Source
This commit is contained in:
Yagami
2022-12-02 13:42:33 +08:00
parent dbc00993c6 aa96dfc3a9
commit 45169a4822
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/productplan/model.php
+10 -5
View File
@@ -403,15 +403,18 @@ class productplanModel extends model
{
$date = date('Y-m-d');
$param = strtolower($param);
$plans = $this->dao->select('*')->from(TABLE_PRODUCTPLAN)
->where('deleted')->eq(0)
->beginIF($products)->andWhere('product')->in($products)->fi()
->beginIF(strpos($param, 'unexpired') !== false)->andWhere('end')->ge($date)->fi()
->orderBy($orderBy)
$plans = $this->dao->select('*,t2.type as productType')->from(TABLE_PRODUCTPLAN)->alias('t1')
->leftJoin(TABLE_PRODUCT)->alias('t2')->on('t2.id=t1.product')
->where('t1.deleted')->eq(0)
->beginIF($products)->andWhere('t1.product')->in($products)->fi()
->beginIF(strpos($param, 'unexpired') !== false)->andWhere('t1.end')->ge($date)->fi()
->orderBy('t1.' . $orderBy)
->fetchAll('id');
if(!empty($plans) and $field == 'name') $plans = $this->reorder4Children($plans);
$plans = $this->relationBranch($plans);
$parentTitle = array();
$planGroup = array();
foreach($plans as $plan)
@@ -427,6 +430,7 @@ class productplanModel extends model
if($plan->parent > 0 and isset($plans[$plan->parent])) $plan->title = $plans[$plan->parent]->title . ' /' . $plan->title;
$planGroup[$plan->product][$branch][$plan->id] = $plan->title . " [{$plan->begin} ~ {$plan->end}]";
if($plan->begin == $this->config->productplan->future and $plan->end == $this->config->productplan->future) $planGroup[$plan->product][$branch][$plan->id] = $plan->title . ' ' . $this->lang->productplan->future;
if($plan->productType != 'normal') $planGroup[$plan->product][$branch][$plan->id] = $planGroup[$plan->product][$branch][$plan->id] . ' / ' . ($plan->branchName ? $plan->branchName : $this->lang->branch->main);
}
else
{
@@ -1128,6 +1132,7 @@ class productplanModel extends model
{
if(empty($plans)) return $plans;
$this->app->loadLang('branch');
$branchMap = $this->dao->select('id, name')->from(TABLE_BRANCH)
->where('status')->eq('active')
->andWhere('deleted')->eq('0')