From 40f27795e17255317b7f9a9bb53f0b070f6a32c8 Mon Sep 17 00:00:00 2001
From: zhouxin <zhouxin@easycorp.ltd>
Date: Mon, 13 Dec 2021 08:45:37 +0000
Subject: [PATCH] change if...else to switch...case,change now to today.

---
 module/project/model.php |  5 ++---
 module/weekly/model.php  | 20 ++++++++++----------
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/module/project/model.php b/module/project/model.php
index d88648d13f..1d389119c4 100644
--- a/module/project/model.php
+++ b/module/project/model.php
@@ -1240,12 +1240,11 @@ class projectModel extends model
     public function suspend($projectID)
     {
         $oldProject = $this->getById($projectID);
-        $now        = helper::now();
         $project = fixer::input('post')
             ->setDefault('status', 'suspended')
             ->setDefault('lastEditedBy', $this->app->user->account)
-            ->setDefault('lastEditedDate', $now)
-            ->setDefault('suspendedDate', $now)
+            ->setDefault('lastEditedDate', helper::now())
+            ->setDefault('suspendedDate', helper::today())
             ->remove('comment')->get();
 
         $this->dao->update(TABLE_PROJECT)->data($project)
diff --git a/module/weekly/model.php b/module/weekly/model.php
index 8a434d85c8..a226fd041b 100644
--- a/module/weekly/model.php
+++ b/module/weekly/model.php
@@ -22,26 +22,26 @@ class weeklyModel extends model
     public function getPageNav($project, $date)
     {
         $date  = date('Ymd', strtotime($this->getThisMonday($date)));
-        if($project->status == 'wait')
+        switch($project->status)
         {
+        case 'wait':
             $begin = helper::now();
             $end = $begin;
-        }
-        if($project->status == 'doing')
-        {
+            break;
+        case 'doing':
             $begin = $project->realBegan != '0000-00-00' ? $project->realBegan : $date;
             $end = $date;
-        }
-        if($project->status == 'suspended')
-        {
+            break;
+        case 'suspended':
             $begin = $project->realBegan != '0000-00-00' ? $project->realBegan : $project->suspendedDate;
             $end = $project->suspendedDate;
-        }
-        if($project->status == 'closed')
-        {
+            break;
+        case 'closed':
             $begin = $project->realBegan != '0000-00-00' ? $project->realBegan : $project->realEnd;
             $end = $project->realEnd;
+            break;
         }
+
         $weeks = $this->getWeekPairs($begin, $end);
         $current = zget($weeks, $date, current($weeks));
         $selectHtml  = "<div class='btn-group angle-btn'>";