|
|
670a2b68d9
|
Merge branch 'feat-cjy-taskBench' into dev
|
2025-10-23 15:39:20 +08:00 |
|
|
|
3f9b89ddac
|
bugfix: 修改查询进行中和已完成任务数量的方式
|
2025-10-23 15:39:08 +08:00 |
|
|
|
23419fd40c
|
Merge branch 'feat-cjy-taskBench' into dev
|
2025-10-23 14:53:36 +08:00 |
|
|
|
be78b69db4
|
bugfix： 更新待发任务时，同时修改最后一次指派人和进行中的任务数量和已完成任务数量。
员工手动点击完成任务，同时更新任务管理表中进行中的任务和代办任务数量。如果当前登录人查询自己已完成任务，就返回当初指派时的数量，而不是待完成任务。
|
2025-10-23 14:53:15 +08:00 |
|
|
|
2dbfe94c14
|
Merge branch 'feat-cjy-taskBench' into dev
|
2025-10-23 11:51:35 +08:00 |
|
|
|
5cdcf7376d
|
bugfix: 在没有任务 uuid 的情况下，如果找不到任务记录不报错，影响流程
|
2025-10-23 11:51:17 +08:00 |
|
|
|
1838187a64
|
Merge branch 'feat-cjy-taskBench' into dev
|
2025-10-23 10:57:30 +08:00 |
|
|
|
edef65a3e1
|
bugfix: 修复待完成任务数量校验，避免负数。
|
2025-10-23 10:57:15 +08:00 |
|
|
|
aea3db29bc
|
Merge branch 'feat-cjy-taskBench' into dev
|
2025-10-22 19:40:43 +08:00 |
|
|
|
441f2e4fc0
|
bugfix: 把手动扩展任务数量也计算如到增值任务余额。修改扣减任务数量的顺序
|
2025-10-22 19:40:09 +08:00 |
|
|
|
29a1c61fa5
|
Merge branch 'feat-cjy-taskBench' into dev
|
2025-10-22 18:39:04 +08:00 |
|
|
|
952e6e930c
|
bugfix: 修复查询指派操作人查询错误
|
2025-10-22 18:38:50 +08:00 |
|
|
|
cc63ba31a0
|
Merge branch 'feat-cjy-taskBench' into dev
|
2025-10-22 18:13:03 +08:00 |
|
|
|
ada27d67ba
|
bugfix: 修复指派时，没有指定指派的数量。修复完成任务时，更新待发任务数量
|
2025-10-22 18:12:46 +08:00 |
|
|
|
dc7fdc3300
|
Merge branch 'dev-lzh-0905' into dev
|
2025-10-22 16:13:44 +08:00 |
|
|
|
ab0bf36953
|
修改使用记录类型
|
2025-10-22 16:13:36 +08:00 |
|
|
|
4ef0cdd7c9
|
Merge branch 'feat-cjy-taskBench' into dev
|
2025-10-22 16:04:20 +08:00 |
|
|
|
a671df3c25
|
bugfix : 修改报错提示语
|
2025-10-22 16:04:05 +08:00 |
|
|
|
a88cc56f24
|
Merge branch 'feat-cjy-taskBench' into dev
|
2025-10-22 15:54:15 +08:00 |
|
|
|
6decfdca6f
|
bugfix: 套餐过期后，不能完成过期艺人的任务
|
2025-10-22 15:54:03 +08:00 |
|
|
|
4687a172f2
|
Merge branch 'dev-lzh-0905' into dev
|
2025-10-22 15:23:06 +08:00 |
|
|
|
cc6f1577a1
|
手动扩展类型算作增值类型
|
2025-10-22 15:22:54 +08:00 |
|
|
|
40badd2edf
|
Merge branch 'feat-cjy-taskBench' into dev
|
2025-10-22 15:20:51 +08:00 |
|
|
|
3930d1fb5b
|
bugfix: 如果是查询已完成，就按照完成时间降序返回
|
2025-10-22 15:20:30 +08:00 |
|
|
|
cbdeedc1c5
|
Merge branch 'dev-lzh-0905' into dev
|
2025-10-22 14:34:31 +08:00 |
|
|
|
66ee049376
|
固定初始字段顺序
|
2025-10-22 14:34:22 +08:00 |
|
|
|
509ebb61a6
|
Merge branch 'feat-cjy-taskBench' into dev
|
2025-10-22 14:08:09 +08:00 |
|
|
|
9ffca3094b
|
bugfix: 修改指派扣减逻辑
|
2025-10-22 14:07:49 +08:00 |
|
|
|
483314d2c4
|
Merge branch 'feat-cjy-taskBench' into dev
|
2025-10-22 13:06:10 +08:00 |
|
|
|
3638845d6e
|
bugfix: 完成数量超过限制不报错
|
2025-10-22 13:05:50 +08:00 |
|
|
|
947651ea3f
|
Merge branch 'feat-cjy-taskBench' into dev
|
2025-10-22 12:46:45 +08:00 |
|
|
|
0e284a8d6f
|
bugfix： 修复查询待发数量、修复初次启动时数据同步的问题
|
2025-10-22 12:45:54 +08:00 |
|
|
|
2b60f44b85
|
Merge branch 'feat-cjy-taskBench' into dev
|
2025-10-22 10:24:06 +08:00 |
|
|
|
854cb61551
|
bugfix: 修复初次同步
|
2025-10-22 10:23:44 +08:00 |
|
|
|
58e429ad0c
|
Merge branch 'dev-lzh-0905' into dev
|
2025-10-22 10:17:39 +08:00 |
|
|
|
16cb0245cf
|
修复时间类型扩展
|
2025-10-22 10:17:28 +08:00 |
|
|
|
7fe2038dcb
|
Reapply "feat: 购买套餐和扩展套餐余额时同步任务余额"
This reverts commit aa7de9e4f6.
|
2025-10-22 10:07:37 +08:00 |
|
|
|
aa7de9e4f6
|
Revert "feat: 购买套餐和扩展套餐余额时同步任务余额"
This reverts commit 48039127e1.
|
2025-10-22 09:08:19 +08:00 |
|
|
|
48039127e1
|
feat: 购买套餐和扩展套餐余额时同步任务余额
|
2025-10-22 08:56:50 +08:00 |
|
|
|
b6d7271420
|
Merge branch 'feat-cjy-taskBench' into dev
# Conflicts:
# pb/bundle/bundle.pb.go
# pkg/cron/cron.go
|
2025-10-21 20:29:28 +08:00 |
|
|
|
7748878608
|
bugfix: 实现和余额表同步以及把修改待发数据的接口与申诉合并
|
2025-10-21 20:09:01 +08:00 |
|
|
|
387df055ee
|
Merge branch 'feat-cjy-taskBench' into dev
|
2025-10-21 17:50:25 +08:00 |
|
|
|
142bf642dd
|
bugfix:去掉任务管理表中任务字段
|
2025-10-21 17:50:04 +08:00 |
|
|
|
a1ccdeb58b
|
过滤软删除类型
|
2025-10-21 17:20:32 +08:00 |
|
|
|
18ba745611
|
Merge branch 'dev-lzh-0905' into dev
|
2025-10-21 17:08:17 +08:00 |
|
|
|
404ddc9cf8
|
扩展时间修改
|
2025-10-21 17:08:03 +08:00 |
|
|
|
c67ea8668b
|
Merge branch 'dev-lzh-0905' into dev
|
2025-10-21 17:03:34 +08:00 |
|
|
|
f774a5ad06
|
修改手动扩展
|
2025-10-21 17:03:28 +08:00 |
|
|
|
9d5cc117b9
|
Merge branch 'dev-lzh-0905' into dev
|
2025-10-21 16:40:00 +08:00 |
|
|
|
ef1a9ab5de
|
使用余量修改
|
2025-10-21 16:39:51 +08:00 |
|
