Просмотр исходного кода

chore: auto bump version and changelog [skip ci]

iwt 3 недель назад
Родитель
Сommit
9e1292ac23

+ 10 - 3
cfc-backend/src/main/java/com/etotem/cfc/service/TaskService.java

@@ -403,11 +403,18 @@ public List<Task> getTodayTasks(Long memberId, String dimensionCode) {
         calendar.add(Calendar.DAY_OF_MONTH, 1);
         Date endOfDay = calendar.getTime();
 
+        // 对齐 getTodayTasks 口径:包含 in_progress 状态 + isDailyProgress 任务
         List<Task> all = taskMapper.selectList(new LambdaQueryWrapper<Task>()
                 .eq(Task::getFamilyId, familyId)
-                .ge(Task::getDeadline, startOfDay)
-                .lt(Task::getDeadline, endOfDay)
-                .in(Task::getStatus, Arrays.asList("pending", "completed", "locked", "pending_review"))
+                .in(Task::getStatus, Arrays.asList("pending", "completed", "locked", "pending_review", "in_progress"))
+                .and(w -> w
+                        .and(w2 -> w2.isNotNull(Task::getDeadline)
+                                .ge(Task::getDeadline, startOfDay)
+                                .lt(Task::getDeadline, endOfDay))
+                        .or(w3 -> w3.eq(Task::getIsDailyProgress, 1)
+                                .ge(Task::getCreatedAt, startOfDay)
+                                .lt(Task::getCreatedAt, endOfDay)))
+                )
                 .orderByAsc(Task::getDeadline)
                 .orderByAsc(Task::getId));
         return filterLockedChildren(all);

+ 1 - 1
cfc-web/.last_build_commit

@@ -1 +1 @@
-f3dbb37ecdca920e7aaa0c2469ae263fefaa94ff
+d8f0a9c1ea2deecceaa35b4428cfa8912738dffd

+ 2 - 2
cfc-web/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "cfc-web",
-  "version": "1.0.1762",
+  "version": "1.0.1763",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "cfc-web",
-      "version": "1.0.1762",
+      "version": "1.0.1763",
       "dependencies": {
         "@wangeditor/editor": "^5.1.23",
         "@wangeditor/editor-for-vue": "^1.0.2",

+ 1 - 1
cfc-web/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cfc-web",
-  "version": "1.0.1763",
+  "version": "1.0.1764",
   "private": true,
   "scripts": {
     "dev": "vue-cli-service serve",

+ 6 - 0
cfc-web/public/CHANGELOG-v1.0.md

@@ -4,6 +4,12 @@
 
 ---
 
+## v1.0.1764 (2026-10-22)
+
+### 新功能
+- 应用名统一压缩至 ≤3 汉字;默认快捷 6 项把任务替换为饮食
+
+
 ## v1.0.1763 (2026-10-22)
 
 ### 新功能

+ 7 - 1
cfc-web/public/CHANGELOG.md

@@ -1,6 +1,6 @@
 # 更新日志
 
-> 当前版本: v1.0.1763
+> 当前版本: v1.0.1764
 
 ## 历史版本
 
@@ -8,6 +8,12 @@
 
 ---
 
+## v1.0.1764 (2026-10-22)
+
+### 新功能
+- 应用名统一压缩至 ≤3 汉字;默认快捷 6 项把任务替换为饮食
+
+
 ## v1.0.1763 (2026-10-22)
 
 ### 新功能