From 5bb80b5f50adec1a1bf1a926cca4331d2fa32eb6 Mon Sep 17 00:00:00 2001
From: kuaifan <aipaw@live.cn>
Date: Mon, 27 Jun 2022 10:36:15 +0800
Subject: [PATCH] no message

---
 app/Models/ProjectTask.php | 49 ++++++++++++++++++++++++++++++++++++--
 1 file changed, 47 insertions(+), 2 deletions(-)

diff --git a/app/Models/ProjectTask.php b/app/Models/ProjectTask.php
index a93936c16..7320aaac0 100644
--- a/app/Models/ProjectTask.php
+++ b/app/Models/ProjectTask.php
@@ -771,6 +771,7 @@ class ProjectTask extends AbstractModel
             if ($this->parent_id === 0) {
                 // 重复周期
                 $loopAt = $this->loop_at;
+                $loopDesc = $this->loopDesc();
                 if (Arr::exists($data, 'loop')) {
                     $this->loop = $data['loop'];
                     if (!$this->refreshLoop()) {
@@ -780,9 +781,19 @@ class ProjectTask extends AbstractModel
                     // 更新任务时间也要更新重复周期
                     $this->refreshLoop();
                 }
-                if ($loopAt !== $this->loop_at) {
+                $oldLoop = Carbon::parse($loopAt);
+                $newLoop = Carbon::parse($this->loop_at);
+                if ($oldLoop->ne($newLoop)) {
+                    $this->addLog("修改{任务}下一个周期", [
+                        'change' => [
+                            $loopAt ? $oldLoop->toDateTimeString() : null,
+                            $this->loop_at ? $newLoop->toDateTimeString() : null,
+                        ]
+                    ]);
+                }
+                if ($loopDesc != $this->loopDesc()) {
                     $this->addLog("修改{任务}重复周期", [
-                        'change' => [$loopAt, $this->loop_at]
+                        'change' => [$loopDesc, $this->loopDesc()]
                     ]);
                 }
                 // 协助人员
@@ -933,6 +944,40 @@ class ProjectTask extends AbstractModel
         return $success;
     }
 
+    /**
+     * 获取周期描述
+     * @return string
+     */
+    public function loopDesc() {
+        $loopDesc = "从不";
+        switch ($this->loop) {
+            case "day":
+                $loopDesc = "每天";
+                break;
+            case "weekdays":
+                $loopDesc = "每个工作日";
+                break;
+            case "week":
+                $loopDesc = "每周";
+                break;
+            case "twoweeks":
+                $loopDesc = "每两周";
+                break;
+            case "month":
+                $loopDesc = "每月";
+                break;
+            case "year":
+                $loopDesc = "每年";
+                break;
+            default:
+                if (Base::isNumber($this->loop)) {
+                    $loopDesc = "每{$this->loop}天";
+                }
+                break;
+        }
+        return $loopDesc;
+    }
+
     /**
      * 复制任务
      * @return self