From fbf7a7f073868c27f8acd9dbd7349b8d05a04c31 Mon Sep 17 00:00:00 2001
From: jinianlan <jinianlan@qq.com>
Date: Tue, 23 Jul 2019 09:46:54 +0800
Subject: [PATCH] * finish task #2651,#2642

---
 module/task/model.php | 8 ++++----
 module/todo/model.php | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/module/task/model.php b/module/task/model.php
index 390ff479f0..73b8fb7ec0 100644
--- a/module/task/model.php
+++ b/module/task/model.php
@@ -2420,10 +2420,11 @@ class taskModel extends model
         $tasks = $this->dao->select('id, DATE_FORMAT(finishedDate, "%Y-%m-%d") AS date')->from(TABLE_TASK)->alias('t1')
             ->where($this->reportCondition())
             ->having('date != "0000-00-00"')
+            ->orderBy('date asc')
             ->fetchAll('id');
         if(!$tasks) return array();
 
-        $children = $this->dao->select('id,parent,DATE_FORMAT(finishedDate, "%Y-%m-%d") AS date')->from(TABLE_TASK)->where('parent')->in(array_keys($tasks))->having('date != "0000-00-00"')->fetchAll('id');
+        $children = $this->dao->select('id,parent,DATE_FORMAT(finishedDate, "%Y-%m-%d") AS date')->from(TABLE_TASK)->where('parent')->in(array_keys($tasks))->having('date != "0000-00-00"')->orderBy('date asc')->fetchAll('id');
         $datas    = $this->processData4Report($tasks, $children, 'date');
         return $datas;
     }
@@ -2472,8 +2473,7 @@ class taskModel extends model
             if(!isset($fields[$task->$field])) $fields[$task->$field] = 0;
             $fields[$task->$field] ++;
         }
-
-        arsort($fields);
+        asort($fields);
         foreach($fields as $field => $count)
         {
             $data = new stdclass();
@@ -2611,7 +2611,7 @@ class taskModel extends model
                 break;
             case 'pri':
                 echo "<span class='label-pri label-pri-" . $task->pri . "' title='" . zget($this->lang->task->priList, $task->pri, $task->pri) . "'>";
-                echo zget($this->lang->task->priList, $task->pri, $task->pri);
+  周期待办测试2周期待办测试2              echo zget($this->lang->task->priList, $task->pri, $task->pri);
                 echo "</span>";
                 break;
             case 'name':
diff --git a/module/todo/model.php b/module/todo/model.php
index 4b98bc96e5..625f55ec43 100644
--- a/module/todo/model.php
+++ b/module/todo/model.php
@@ -535,7 +535,7 @@ class todoModel extends model
 
                 $this->dao->insert(TABLE_TODO)->data($newTodo)->exec();
                 $this->action->create('todo', $this->dao->lastInsertID(), 'opened', '', '', $newTodo->account);
-
+                if($today>$begin) continue;
                 $lastCycleList[$todoID] = $newTodo;
             }
         }