internal/controller/task.go

@@ -243,7 +243,7 @@ func (b *BundleProvider) GetTaskAssignRecordsList(_ context.Context, req *bundle
 // convertToTaskAssignRecordInfo 转换TaskAssignRecords模型为proto消息
 func convertToTaskAssignRecordInfo(record *dao.TaskAssignRecordsResponse) *bundle.TaskAssignRecordInfo {
 	var completeTime string
-	if record.CompleteTime != nil {
+	if !record.CompleteTime.IsZero() {
 		completeTime = record.CompleteTime.Format("2006-01-02 15:04:05")
 	}
 

internal/dao/taskDao.go

@@ -471,20 +471,18 @@ func GetEmployeeAssignedTasks(req *EmployeeTaskQueryRequest) ([]*model.TaskAssig
 	}
 
 	// 指派时间区间
-	if req.StartTime != "" && req.EndTime != "" {
+	if req.StartTime != "" {
-		query = query.Where("operator_time BETWEEN ? AND ?", req.StartTime, req.EndTime)
-	} else 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 != "" {
+	if req.StartCompleteTime != "" {
-		query = query.Where("complete_time BETWEEN ? AND ?", req.StartCompleteTime, req.EndCompleteTime)
-	} else 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 != "" {
+	if req.StartTime != "" {
-		query = query.Where("operator_time BETWEEN ? AND ?", req.StartTime, req.EndTime)
-	} else if req.StartTime != "" {
 		query = query.Where("operator_time >= ?", req.StartTime)
-	} else if req.EndTime != "" {
+	}
+	if req.EndTime != "" {
 		query = query.Where("operator_time <= ?", req.EndTime)
 	}