Merge branch dev/task-147288 of zentao/zentaopms (#10672)

2025-07-30 15:01:08 +08:00
parent 8cec0b35ae 9714e06a08
commit 136c267107
1 changed files with 2 additions and 1 deletions
@@ -150,9 +150,10 @@ class commonModel extends model
        $today = helper::today();
        if($project->status == 'wait')
        {
+            $realBegan = helper::isZeroDate($project->realBegan) ? $this->dao->select('realBegan')->from(TABLE_PROJECT)->where('id')->eq($execution->id)->fetch('realBegan') : $project->realBegan;
            $this->dao->update(TABLE_PROJECT)
                 ->set('status')->eq('doing')
-                 ->beginIf(helper::isZeroDate($project->realBegan))->set('realBegan')->eq($today)->fi()
+                 ->set('realBegan')->eq($realBegan)
                 ->where('id')->eq($projectID)
                 ->exec();