调整 任务的更新逻辑

@@ -172,11 +172,6 @@ func (srv TaskService) UpdateTask(param *command.UpdateTaskCommand) (map[string]
 	defer func() {
 	defer func() {
 		_ = transactionContext.RollbackTransaction()
 		_ = transactionContext.RollbackTransaction()
 	}()
 	}()
-	// if len(param.StageList) < 3 {
-	// 	return map[string]interface{}{
-	// 		"id": param.Id,
-	// 	}, application.ThrowError(application.INTERNAL_SERVER_ERROR, "里程碑数量至少3个")
-	// }
 	if len(param.StageList) > 5 {
 	if len(param.StageList) > 5 {
 		return map[string]interface{}{
 		return map[string]interface{}{
 			"id": param.Id,
 			"id": param.Id,
@@ -277,17 +272,19 @@ func (srv TaskService) UpdateTask(param *command.UpdateTaskCommand) (map[string]
 	taskRecordRepo := factory.CreateTaskRecordRepository(map[string]interface{}{
 	taskRecordRepo := factory.CreateTaskRecordRepository(map[string]interface{}{
 		"transactionContext": transactionContext,
 		"transactionContext": transactionContext,
 	})
 	})
-	cnt, _, err := taskRecordRepo.Find(map[string]interface{}{
-		"taskId": taskData.Id,
-		"limit":  1,
-	})
-	if err != nil {
-		return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, "相关联的任务反馈信息"+err.Error())
-	}
-	if cnt > 0 {
-		for _, v := range stageList {
-			if v.DeletedAt != nil {
-				return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, "已有日评数据，不能删除里程碑")
+
+	for _, v := range stageList {
+		if v.DeletedAt != nil {
+			cnt, _, err := taskRecordRepo.Find(map[string]interface{}{
+				"taskId":         taskData.Id,
+				"taskStageCheck": fmt.Sprintf(`{"id":"%d"}`, v.Id),
+				"limit":          1,
+			})
+			if err != nil {
+				return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, "相关联的任务反馈信息"+err.Error())
+			}
+			if cnt > 0 {
+				return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, fmt.Sprintf("里程碑[%s]已有日评数据，不能删除", v.Name))
 			}
 			}
 		}
 		}
 	}
 	}
@@ -452,17 +449,13 @@ func (srv TaskService) GetTaskInfo(param *command.GetTaskCommand) (*adapter.Task
 	taskRecordRepo := factory.CreateTaskRecordRepository(map[string]interface{}{
 	taskRecordRepo := factory.CreateTaskRecordRepository(map[string]interface{}{
 		"transactionContext": transactionContext,
 		"transactionContext": transactionContext,
 	})
 	})
-	cnt, _, err := taskRecordRepo.Find(map[string]interface{}{
-		"taskId": param.TaskId,
-		"limit":  1,
-	})
-	if err != nil {
-		return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, "相关联的任务反馈信息"+err.Error())
-	}
-	if err := transactionContext.CommitTransaction(); err != nil {
-		return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
-	}
-
+	// cnt, _, err := taskRecordRepo.Find(map[string]interface{}{
+	// 	"taskId": param.TaskId,
+	// 	"limit":  1,
+	// })
+	// if err != nil {
+	// 	return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, "相关联的任务反馈信息"+err.Error())
+	// }
 	result := adapter.TaskInfoAdapter{
 	result := adapter.TaskInfoAdapter{
 		Id:       taskData.Id,
 		Id:       taskData.Id,
 		Name:     taskData.Name,
 		Name:     taskData.Name,
@@ -513,11 +506,19 @@ func (srv TaskService) GetTaskInfo(param *command.GetTaskCommand) (*adapter.Task
 			SortBy:            val.SortBy,
 			SortBy:            val.SortBy,
 			StatusDescription: val.StatusDescription(),
 			StatusDescription: val.StatusDescription(),
 		}
 		}
+		cnt, _, _ := taskRecordRepo.Find(map[string]interface{}{
+			"taskId":         taskData.Id,
+			"taskStageCheck": fmt.Sprintf(`{"id":"%d"}`, val.Id),
+			"limit":          1,
+		})
 		if cnt > 0 {
 		if cnt > 0 {
 			stage.IsRef = true
 			stage.IsRef = true
 		}
 		}
 		result.StageList = append(result.StageList, stage)
 		result.StageList = append(result.StageList, stage)
 	}
 	}
+	if err := transactionContext.CommitTransaction(); err != nil {
+		return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
+	}
 	return &result, nil
 	return &result, nil
 }
 }
 
 

@@ -158,7 +158,9 @@ func (repo *TaskRecordRepository) Find(queryOptions map[string]interface{}) (int
 	if v, ok := queryOptions["offset"].(int64); ok {
 	if v, ok := queryOptions["offset"].(int64); ok {
 		query.Offset(int(v))
 		query.Offset(int(v))
 	}
 	}
-
+	if v, ok := queryOptions["taskStageCheck"]; ok {
+		query.Where("task)_stage_check @> ?", v)
+	}
 	if v, ok := queryOptions["createdAtDay"]; ok {
 	if v, ok := queryOptions["createdAtDay"]; ok {
 		query.Where(` to_char("created_at" at time zone 'PRC' ,'YYYY-MM-DD') =? `, v)
 		query.Where(` to_char("created_at" at time zone 'PRC' ,'YYYY-MM-DD') =? `, v)
 	}
 	}