Merge branch 'feat-cjy-taskBench' into dev

bugfix: 修复查询指派任务报错
# Conflicts: # internal/dao/taskDao.go
2025-11-19 09:50:49 +08:00 · 2025-11-19 09:50:32 +08:00
1 changed files with 2 additions and 2 deletions
--- a/internal/dao/taskDao.go
+++ b/internal/dao/taskDao.go
@ -929,7 +929,7 @@ func GetEmployeeAssignedTasks(req *EmployeeTaskQueryRequest) ([]*model.TaskAssig

 	// 任务批次
 	if req.TaskBatch != "" {
-		query = query.Where("task_batch LIKE ?", "%"+req.TaskBatch+"%")
+		query = query.Where("task_assign_records.task_batch LIKE ?", "%"+req.TaskBatch+"%")
 	}

 	// 指派时间区间
@ -1854,7 +1854,7 @@ func GetTaskAssignRecordsList(req *TaskAssignRecordsQueryRequest) ([]*model.Task

 	// 任务批次
 	if req.TaskBatch != "" {
-		query = query.Where("task_batch LIKE ?", "%"+req.TaskBatch+"%")
+		query = query.Where("task_assign_records.task_batch LIKE ?", "%"+req.TaskBatch+"%")
 	}

 	// 操作时间区间
Author	SHA1	Message	Date
cjy	81a131e615	Merge branch 'feat-cjy-taskBench' into dev	2025-11-19 09:50:49 +08:00
cjy	4389bf3167	bugfix: 修复查询指派任务报错 # Conflicts: # internal/dao/taskDao.go	2025-11-19 09:50:32 +08:00