From c18f4162ffa55b81e88ac41c2462165fd13181a9 Mon Sep 17 00:00:00 2001 From: cjy Date: Thu, 4 Sep 2025 19:01:15 +0800 Subject: [PATCH] =?UTF-8?q?bugfix:=E4=BF=AE=E6=94=B9=E5=85=B3=E4=BA=8E?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E5=8C=BA=E9=97=B4=E7=9A=84=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- internal/dao/taskDao.go | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/internal/dao/taskDao.go b/internal/dao/taskDao.go index f5a31a5..827be1b 100644 --- a/internal/dao/taskDao.go +++ b/internal/dao/taskDao.go @@ -471,18 +471,20 @@ func GetEmployeeAssignedTasks(req *EmployeeTaskQueryRequest) ([]*model.TaskAssig } // 指派时间区间 - if req.StartTime != "" { + if req.StartTime != "" && req.EndTime != "" { + query = query.Where("operator_time BETWEEN ? AND ?", req.StartTime, req.EndTime) + } else if req.StartTime != "" { query = query.Where("operator_time >= ?", req.StartTime) - } - if req.EndTime != "" { + } else if req.EndTime != "" { query = query.Where("operator_time <= ?", req.EndTime) } // 完成时间区间 - if req.StartCompleteTime != "" { + if req.StartCompleteTime != "" && req.EndCompleteTime != "" { + query = query.Where("complete_time BETWEEN ? AND ?", req.StartCompleteTime, req.EndCompleteTime) + } else if req.StartCompleteTime != "" { query = query.Where("complete_time >= ?", req.StartCompleteTime) - } - if req.EndCompleteTime != "" { + } else if req.EndCompleteTime != "" { query = query.Where("complete_time <= ?", req.EndCompleteTime) } @@ -698,10 +700,11 @@ func GetTaskAssignRecordsList(req *TaskAssignRecordsQueryRequest) ([]*model.Task } // 操作时间区间 - if req.StartTime != "" { + if req.StartTime != "" && req.EndTime != "" { + query = query.Where("operator_time BETWEEN ? AND ?", req.StartTime, req.EndTime) + } else if req.StartTime != "" { query = query.Where("operator_time >= ?", req.StartTime) - } - if req.EndTime != "" { + } else if req.EndTime != "" { query = query.Where("operator_time <= ?", req.EndTime) }