From 042ec82489076d9a58e61cb196fbfd0dbefd51d9 Mon Sep 17 00:00:00 2001
From: xiaozzzi <42293085+xiaozzzi@users.noreply.github.com>
Date: Sat, 20 Jan 2024 22:29:05 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E9=98=B6=E6=AE=B5=E6=80=A7=E4=BA=8B?=
 =?UTF-8?q?=E9=A1=B9=E5=88=97=E8=A1=A8=E5=A2=9E=E5=8A=A0=E5=90=84=E9=98=B6?=
 =?UTF-8?q?=E6=AE=B5=E4=BB=BB=E5=8A=A1=E6=95=B0=E9=87=8F=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../backend/server/todo/TodoService.java      | 25 +++++++++++++----
 .../server/todo/pojo/TodoGroupRes.java        |  4 +++
 .../src/main/resources/mapper/TodoMapper.xml  | 10 +++----
 .../src/renderer/src/views/todo/TodoIndex.vue | 28 +++++++++++++------
 .../renderer/src/views/todo/scripts/types.ts  |  4 +++
 .../src/views/todo/styles/task-progress.scss  |  2 +-
 6 files changed, 53 insertions(+), 20 deletions(-)

diff --git a/blossom-backend/backend/src/main/java/com/blossom/backend/server/todo/TodoService.java b/blossom-backend/backend/src/main/java/com/blossom/backend/server/todo/TodoService.java
index 40678a3..20e3faa 100644
--- a/blossom-backend/backend/src/main/java/com/blossom/backend/server/todo/TodoService.java
+++ b/blossom-backend/backend/src/main/java/com/blossom/backend/server/todo/TodoService.java
@@ -41,19 +41,34 @@ public class TodoService extends ServiceImpl<TodoMapper, TodoEntity> {
     public TodoGroupRes listTodo() {
         List<TodoEntity> todos = baseMapper.listTodo(AuthContext.getUserId());
         TodoGroupRes res = TodoGroupRes.build();
-        for (TodoEntity todo : todos) {
-            TodoGroupRes.TodoGroup group = todo.to(TodoGroupRes.TodoGroup.class);
-            if (TodoTypeEnum.DAY.getType().equals(todo.getTodoType())) {
+
+        Map<String, List<TodoEntity>> map = todos.stream().collect(Collectors.groupingBy(TodoEntity::getTodoId));
+        map.forEach((todoId, data) -> {
+            TodoGroupRes.TodoGroup group = data.get(0).to(TodoGroupRes.TodoGroup.class);
+            Map<String, List<TodoEntity>> taskStatusMap = data.stream().collect(Collectors.groupingBy(TodoEntity::getTaskStatus));
+            int w = 0, p = 0, c = 0;
+            if (CollUtil.isNotEmpty(taskStatusMap.get(TaskStatusEnum.WAITING.name()))) {
+                w = taskStatusMap.get(TaskStatusEnum.WAITING.name()).get(0).getTaskCount();
+            }
+            if (CollUtil.isNotEmpty(taskStatusMap.get(TaskStatusEnum.PROCESSING.name()))) {
+                p = taskStatusMap.get(TaskStatusEnum.PROCESSING.name()).get(0).getTaskCount();
+            }
+            if (CollUtil.isNotEmpty(taskStatusMap.get(TaskStatusEnum.COMPLETED.name()))) {
+                c = taskStatusMap.get(TaskStatusEnum.COMPLETED.name()).get(0).getTaskCount();
+            }
+            group.setTaskCountStat(String.format("%d|%d|%d", w, p, c));
+
+            if (TodoTypeEnum.DAY.getType().equals(data.get(0).getTodoType())) {
                 res.getTodoDays().put(group.getTodoId(), group);
             } else {
                 // 未完成的阶段性事项
-                if (TodoStatusEnum.OPEN.getType().equals(todo.getTodoStatus())) {
+                if (TodoStatusEnum.OPEN.getType().equals(data.get(0).getTodoStatus())) {
                     res.getTaskPhased().add(group);
                 } else {
                     res.getTaskPhasedClose().add(group);
                 }
             }
-        }
+        });
         return res;
     }
 
diff --git a/blossom-backend/backend/src/main/java/com/blossom/backend/server/todo/pojo/TodoGroupRes.java b/blossom-backend/backend/src/main/java/com/blossom/backend/server/todo/pojo/TodoGroupRes.java
index 05684c5..1f3bde1 100644
--- a/blossom-backend/backend/src/main/java/com/blossom/backend/server/todo/pojo/TodoGroupRes.java
+++ b/blossom-backend/backend/src/main/java/com/blossom/backend/server/todo/pojo/TodoGroupRes.java
@@ -55,6 +55,10 @@ public class TodoGroupRes {
          * 任务数量
          */
         private Integer taskCount;
+        /**
+         * 任务数量说明
+         */
+        private String taskCountStat;
         /**
          * 事项状态 1:完成 | 2:未完成
          */
diff --git a/blossom-backend/backend/src/main/resources/mapper/TodoMapper.xml b/blossom-backend/backend/src/main/resources/mapper/TodoMapper.xml
index bd1c30d..f58ca93 100644
--- a/blossom-backend/backend/src/main/resources/mapper/TodoMapper.xml
+++ b/blossom-backend/backend/src/main/resources/mapper/TodoMapper.xml
@@ -47,12 +47,12 @@
     </select>
 
     <select id="listTodo" resultType="com.blossom.backend.server.todo.pojo.TodoEntity">
-        select min(id) as id,todo_id,todo_name,todo_type,todo_status,
+        select min(id) as id,todo_id,todo_name,todo_type,todo_status,task_status,
                count(*) as taskCount
-        from blossom_todo
-        where user_id = #{userId}
-        group by todo_id,todo_name,todo_type,todo_status
-        order by id desc
+          from blossom_todo
+         where user_id = #{userId}
+         group by todo_id,todo_name,todo_type,todo_status,task_status
+         order by id desc
     </select>
 
     <select id="selectByTodoId" resultType="com.blossom.backend.server.todo.pojo.TodoEntity">
diff --git a/blossom-editor/src/renderer/src/views/todo/TodoIndex.vue b/blossom-editor/src/renderer/src/views/todo/TodoIndex.vue
index 9e76447..1cf989b 100644
--- a/blossom-editor/src/renderer/src/views/todo/TodoIndex.vue
+++ b/blossom-editor/src/renderer/src/views/todo/TodoIndex.vue
@@ -7,7 +7,7 @@
       <div class="task-collapse">
         <el-collapse v-model="activeName" accordion>
           <el-collapse-item title="每日待办事项" name="1" class="collapse-item">
-            <el-calendar ref="CalendarRef" class="task-day-calendar" v-model="selectDay">
+            <el-calendar ref="CalendarRef" class="task-day-calendar">
               <template #header="{ date }">
                 <bl-row just="space-between" class="header" style="margin: 8px 10px">
                   <div class="month">{{ date.split(' ')[2] }}{{ date.split(' ')[3] }}</div>
@@ -21,7 +21,7 @@
               <template #date-cell="{ data }">
                 <div class="cell-wrapper" @click="toTask(data.day, data.day, 10)">
                   <div class="day">{{ data.day.split('-')[2] }}</div>
-                  <div v-if="getCount(data.day) > 0">
+                  <div v-if="getCount(data.day) != 0">
                     <bl-tag>{{ getCount(data.day) }}</bl-tag>
                   </div>
                 </div>
@@ -35,13 +35,13 @@
               <!-- update name -->
               <el-input
                 v-if="phased.updTodoName"
-                :id="'phased-name-input-' + phased.todoId"
                 v-model="phased.todoName"
                 type="textarea"
+                :id="'phased-name-input-' + phased.todoId"
                 :rows="3"
                 @blur="blurPhasedUpdHandle(phased.todoId!)"></el-input>
               <div v-else @dblclick="showPhasedUpdHandle(phased.todoId!)">{{ phased.todoName }}</div>
-              <bl-tag v-if="phased.taskCount > 0">{{ phased.taskCount }}</bl-tag>
+              <bl-tag>{{ phased.taskCountStat }}</bl-tag>
             </div>
 
             <!-- add phased -->
@@ -49,6 +49,7 @@
               v-if="showPhasedAdd"
               ref="phasedAddInputRef"
               v-model="phasedAddName"
+              @keyup.enter="blurPhasedAddHandle"
               @blur="blurPhasedAddHandle"
               style="margin-top: 10px"></el-input>
             <div v-else class="task-phased-add" @click="showPhasedAddHandle">新增计划</div>
@@ -58,7 +59,7 @@
           <el-collapse-item title="阶段性事项 已完成" name="3">
             <div v-for="phased in todoPhasedClose" class="task-phased" @click="toTask(phased.todoId, phased.todoName, phased.todoType)">
               {{ phased.todoName }}
-              <bl-tag v-if="phased.taskCount > 0">{{ phased.taskCount }}</bl-tag>
+              <bl-tag>{{ phased.taskCountStat }}</bl-tag>
             </div>
           </el-collapse-item>
         </el-collapse>
@@ -101,8 +102,6 @@ useLifecycle(
 )
 
 //#region ----------------------------------------< 日历 >--------------------------------------
-
-const selectDay = ref()
 const CalendarRef = ref<CalendarInstance>()
 const selectDate = (val: CalendarDateType) => {
   if (!CalendarRef.value) return
@@ -128,6 +127,7 @@ const getTodos = () => {
         todoType: 10,
         today: false,
         taskCount: todo.taskCount > 0 ? todo.taskCount : 0,
+        taskCountStat: '0|0|0',
         updTodoName: false
       })
     }
@@ -136,9 +136,17 @@ const getTodos = () => {
   })
 }
 
+/**
+ * @todo 日历每一项点击时由于内部数据变更, 都会触发查询
+ * @param day
+ */
 const getCount = (day: string): number => {
-  if (!todoDayMaps.value) return 0
-  if (!todoDayMaps.value.get(day)) return 0
+  if (!todoDayMaps.value) {
+    return 0
+  }
+  if (!todoDayMaps.value.has(day)) {
+    return 0
+  }
   return todoDayMaps.value.get(day)!.taskCount
 }
 
@@ -316,6 +324,7 @@ const blurPhasedUpdHandle = (todoId: string) => {
     .task-phased {
       @include flex(row, flex-start, center);
       @include font(13px, 300);
+      flex-wrap: wrap;
       padding: 1px 3px;
       border-radius: 4px;
       color: var(--bl-text-color);
@@ -327,6 +336,7 @@ const blurPhasedUpdHandle = (todoId: string) => {
 
       &:first-child {
         margin-top: 5px;
+        word-break: break-all;
       }
 
       &:last-child {
diff --git a/blossom-editor/src/renderer/src/views/todo/scripts/types.ts b/blossom-editor/src/renderer/src/views/todo/scripts/types.ts
index 952881d..efa374d 100644
--- a/blossom-editor/src/renderer/src/views/todo/scripts/types.ts
+++ b/blossom-editor/src/renderer/src/views/todo/scripts/types.ts
@@ -54,6 +54,10 @@ export interface TodoList {
    * 任务数量
    */
   taskCount: number
+  /**
+   * 任务数量统计
+   */
+  taskCountStat: string
 }
 
 /**
diff --git a/blossom-editor/src/renderer/src/views/todo/styles/task-progress.scss b/blossom-editor/src/renderer/src/views/todo/styles/task-progress.scss
index 88e53e3..37dec86 100644
--- a/blossom-editor/src/renderer/src/views/todo/styles/task-progress.scss
+++ b/blossom-editor/src/renderer/src/views/todo/styles/task-progress.scss
@@ -169,10 +169,10 @@
         border: 3px solid var(--el-color-primary);
 
         .iconbl {
+          @include themeColor(#e4e4e4, #2c2c2c);
           display: inherit;
           margin-top: 40px;
           font-size: 90px;
-          color: #e4e4e4;
         }
       }
     }