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

Merge branch release/21.7.6 of zentao/zentaopms (#11724)

Browse Source
This commit is contained in:
刘刚
2025-09-29 16:45:35 +08:00
committed by Gitfox
parent 4cc703f3e4 90a9d04431
commit 6f914760fd
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/upgrade/model.php
+2 -1
View File
@@ -11211,7 +11211,7 @@ class upgradeModel extends model
*/
public function getUpgradeProjectReports(): array
{
$reports = $this->dao->select('t1.id,t1.project,t1.weekStart,t2.status as projectStatus,t2.realBegan,t2.realEnd,t2.suspendedDate')->from(TABLE_WEEKLYREPORT)->alias('t1')
$reports = $this->dao->select('t1.id,t1.project,t1.weekStart,t2.model AS projectModel,t2.status AS projectStatus,t2.realBegan,t2.realEnd,t2.suspendedDate')->from(TABLE_WEEKLYREPORT)->alias('t1')
->leftJoin(TABLE_PROJECT)->alias('t2')->on('t1.project = t2.id')
->where('t2.status')->ne('wait')
->orderBy('t1.project asc, t1.weekStart asc')
@@ -11223,6 +11223,7 @@ class upgradeModel extends model
$thisSunday = date('Y-m-d', strtotime('this Sunday'));
foreach($reports as $key => $report)
{
if(in_array($report->projectModel, array('scrum', 'agileplus', 'kanban'))) continue;
if($report->projectStatus == 'doing') $report->realBegan = !helper::isZeroDate($report->realBegan) ? $report->realBegan : $report->weekStart;
if(helper::isZeroDate($report->realBegan)) continue;