From aed2c5e2a28033eee7cb6ca60f3d47e1fdf10292 Mon Sep 17 00:00:00 2001
From: wangyidong <wangyidong@cnezsoft.com>
Date: Tue, 27 Dec 2022 11:01:08 +0800
Subject: [PATCH]  * code for task #81417.

---
 module/weekly/model.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/module/weekly/model.php b/module/weekly/model.php
index 0f2b52eee1..6b258a84d0 100755
--- a/module/weekly/model.php
+++ b/module/weekly/model.php
@@ -447,9 +447,14 @@ class weeklyModel extends model
         $report = $this->getFromDB($project, $date);
         if(!empty($report)) return $report->ac;
 
+        if(!$date) $date = date('Y-m-d');
+        $lastDay = $this->getLastDay($date);
+        if(empty($lastDay)) $lastDay = $this->getThisMonday($date);
+
         $AC = $this->dao->select('sum(consumed) as consumed')
             ->from(TABLE_EFFORT)
             ->where('project')->eq($project)
+            ->andWhere('date')->le($lastDay)
             ->andWhere('deleted')->eq(0)
             ->fetch('consumed');