internal/dao/taskDao.go

@@ -471,20 +471,18 @@ func GetEmployeeAssignedTasks(req *EmployeeTaskQueryRequest) ([]*model.TaskAssig
 	}
 
 	// 指派时间区间
-	if req.StartTime != "" && req.EndTime != "" {
-		query = query.Where("operator_time BETWEEN ? AND ?", req.StartTime, req.EndTime)
-	} else if req.StartTime != "" {
+	if req.StartTime != "" {
 		query = query.Where("operator_time >= ?", req.StartTime)
-	} else if req.EndTime != "" {
+	}
+	if req.EndTime != "" {
 		query = query.Where("operator_time <= ?", req.EndTime)
 	}
 
 	// 完成时间区间
-	if req.StartCompleteTime != "" && req.EndCompleteTime != "" {
-		query = query.Where("complete_time BETWEEN ? AND ?", req.StartCompleteTime, req.EndCompleteTime)
-	} else if req.StartCompleteTime != "" {
+	if req.StartCompleteTime != "" {
 		query = query.Where("complete_time >= ?", req.StartCompleteTime)
-	} else if req.EndCompleteTime != "" {
+	}
+	if req.EndCompleteTime != "" {
 		query = query.Where("complete_time <= ?", req.EndCompleteTime)
 	}
 
@@ -700,11 +698,10 @@ func GetTaskAssignRecordsList(req *TaskAssignRecordsQueryRequest) ([]*model.Task
 	}
 
 	// 操作时间区间
-	if req.StartTime != "" && req.EndTime != "" {
-		query = query.Where("operator_time BETWEEN ? AND ?", req.StartTime, req.EndTime)
-	} else if req.StartTime != "" {
+	if req.StartTime != "" {
 		query = query.Where("operator_time >= ?", req.StartTime)
-	} else if req.EndTime != "" {
+	}
+	if req.EndTime != "" {
 		query = query.Where("operator_time <= ?", req.EndTime)
 	}