[20250420]通过列表

db/locallife_task.go

@@ -771,7 +771,14 @@ func GetLocalSketchList(ctx context.Context, request http_model.LocalTasksketchl
 		return &http_model.GetsketchlocaltaskListData{}, err
 	}
 	var projecrtaskinfo []gorm_model.YoungeeLocalTaskInfo
-	query := db.Model(&gorm_model.YoungeeLocalTaskInfo{}).Where("local_id = ? AND task_stage = ?", request.ProjectId, request.ScriptStatus)
+	query := db.Model(&gorm_model.YoungeeLocalTaskInfo{}).Where("local_id = ? ", request.ProjectId)
+	switch request.ScriptStatus {
+	case 10:
+		query = query.Where("task_stage = 10")
+	case 11:
+
+		query = query.Where(" task_stage >= 11")
+	}
 
 	if request.Others != "" {
 		query = query.Where("talent_name LIKE ? OR s_operate_name LIKE ?", "%"+request.Others+"%", "%"+request.Others+"%")
@@ -1005,7 +1012,14 @@ func GetLocalLinkList(ctx context.Context, request http_model.LocalTaskLinklistR
 		return &http_model.GetLocalTaskLinkListData{}, err
 	}
 	var projecrtaskinfo []gorm_model.YoungeeLocalTaskInfo
-	query := db.Model(&gorm_model.YoungeeLocalTaskInfo{}).Where("local_id = ? AND task_stage = ?", request.ProjectId, request.LinkStatus)
+	query := db.Model(&gorm_model.YoungeeLocalTaskInfo{}).Where("local_id = ? ", request.ProjectId)
+	switch request.LinkStatus {
+	case "12":
+		query = query.Where("task_stage = 12")
+	case "13":
+
+		query = query.Where(" task_stage >= 13")
+	}
 
 	if request.Others != "" {
 		query = query.Where("talent_name LIKE ? OR s_operate_name LIKE ?", "%"+request.Others+"%", "%"+request.Others+"%")
@@ -1330,12 +1344,12 @@ func GetLocalDataList(ctx context.Context, request http_model.LocalTaskDatalistR
 		}
 		var datainfo gorm_model.YounggeeDataInfo
 		switch request.DataStatus {
-		case "12":
+		case "14":
 			err := db.Model(&gorm_model.YounggeeDataInfo{}).Where("task_id = ? and is_review = 0 ", task.TaskId).First(&datainfo).Error
 			if err != nil {
 				return nil, err
 			}
-		case "13":
+		case "15":
 			err := db.Model(&gorm_model.YounggeeDataInfo{}).Where("task_id = ? and is_ok = 1", task.TaskId).First(&datainfo).Error
 			if err != nil {
 				return nil, err

db/project_task.go

@@ -712,7 +712,14 @@ func GetPreSketchList(ctx context.Context, request http_model.PreSketchListReque
 func GetSketchList(ctx context.Context, request http_model.TasksketchlistRequest) (*http_model.GetsketchtaskListData, error) {
 	db := GetReadDB(ctx)
 	var projecrtaskinfo []gorm_model.YoungeeTaskInfo
-	query := db.Model(&gorm_model.YoungeeTaskInfo{}).Where("project_id = ? AND task_stage = ?", request.ProjectId, request.ScriptStatus)
+	query := db.Model(&gorm_model.YoungeeTaskInfo{}).Where("project_id = ? ", request.ProjectId)
+	switch request.ScriptStatus {
+	case 10:
+		query = query.Where("task_stage = 10")
+	case 11:
+
+		query = query.Where(" task_stage >= 11")
+	}
 	var projectinfo gorm_model.ProjectInfo
 	err := db.Model(&gorm_model.ProjectInfo{}).Where("project_id = ?", request.ProjectId).First(&projectinfo).Error
 	if err != nil {
@@ -946,7 +953,14 @@ func GetPreLinkList(ctx context.Context, request http_model.PreLinkListRequest)
 func GetLinkList(ctx context.Context, request http_model.TaskLinklistRequest) (*http_model.GettasklinkListData, error) {
 	db := GetReadDB(ctx)
 	var projecrtaskinfo []gorm_model.YoungeeTaskInfo
-	query := db.Model(&gorm_model.YoungeeTaskInfo{}).Where("project_id = ? AND task_stage = ?", request.ProjectId, request.LinkStatus)
+	query := db.Model(&gorm_model.YoungeeTaskInfo{}).Where("project_id = ? ", request.ProjectId)
+	switch request.LinkStatus {
+	case "12":
+		query = query.Where("task_stage = 12")
+	case "13":
+
+		query = query.Where(" task_stage >= 13")
+	}
 	var projectinfo gorm_model.ProjectInfo
 	err := db.Model(&gorm_model.ProjectInfo{}).Where("project_id = ?", request.ProjectId).First(&projectinfo).Error
 	if err != nil {
@@ -1274,12 +1288,12 @@ func GetDataList(ctx context.Context, request http_model.TaskDatalistRequest) (*
 		}
 		var datainfo gorm_model.YounggeeDataInfo
 		switch request.DataStatus {
-		case "12":
+		case "14":
 			err := db.Model(&gorm_model.YounggeeDataInfo{}).Where("task_id = ? and is_review = 0 ", task.TaskID).First(&datainfo).Error
 			if err != nil {
 				return nil, err
 			}
-		case "13":
+		case "15":
 			err := db.Model(&gorm_model.YounggeeDataInfo{}).Where("task_id = ? and is_ok = 1", task.TaskID).First(&datainfo).Error
 			if err != nil {
 				return nil, err

db/task.go

@@ -267,7 +267,7 @@ func SetLocalTaskFinish(ctx context.Context, TaskIDs []string) error {
 		}
 		//查询project_info
 		projectInfo := gorm_model.YounggeeLocalLifeInfo{}
-		err1 = db.Model(gorm_model.YounggeeLocalLifeInfo{}).Where("project_id = ?", taskInfo.LocalId).Scan(&projectInfo).Error
+		err1 = db.Model(gorm_model.YounggeeLocalLifeInfo{}).Where("local_id = ?", taskInfo.LocalId).Scan(&projectInfo).Error
 		if err1 != nil {
 			logrus.WithContext(ctx).Errorf("[Task db] Find ProjectInfo error,err:%+v", err)
 			return err1