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

* adjust for save weekly.

Browse Source
This commit is contained in:
wangyidong
2022-12-30 14:46:20 +08:00
parent 7c3958183f
commit f85db70c20
2 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/weekly/model.php
+3 -6
View File
@@ -116,13 +116,9 @@ class weeklyModel extends model
public function save($project, $date)
{
$weekStart = $this->getThisMonday($date);
$this->dao->delete()->from(TABLE_WEEKLYREPORT)
->where('project')->eq($project)
->andWhere('weekStart')->eq($weekStart)
->exec();
$report = new stdclass();
$PVEV = $this->getPVEV($project, $date);
$report = new stdclass;
$PVEV = $this->getPVEV($project, $date);
$report->pv = $PVEV['PV'];
$report->ev = $PVEV['EV'];
$report->ac = $this->getAC($project, $date);
@@ -402,6 +398,7 @@ class weeklyModel extends model
$this->loadModel('holiday');
while($task = $stmt->fetch())
{
if(empty($task->execution)) continue;
$execution = $executions[$task->execution];
if(helper::isZeroDate($task->estStarted)) $task->estStarted = $execution->begin;
if(helper::isZeroDate($task->deadline)) $task->deadline = $execution->end;