Merge branch 'feat-cjy-taskBench' into dev

internal/controller/task.go

@@ -474,8 +474,8 @@ func (b *BundleProvider) GetArtistUploadStatsList(_ context.Context, req *bundle
 			TaskAssigneeNum:           it.TaskAssigneeNum,
 			ProgressTaskCount:         int32(it.ProgressTaskCount),
 			CompleteTaskCount:         int32(it.CompleteTaskCount),
-			UploadedVideoScriptCount:  0,
-			PendingVideoScriptCount:   0,
+			UploadedVideoScriptCount:  int32(it.UploadedVideoScriptCount),
+			PendingVideoScriptCount:   int32(it.PendingVideoScriptCount),
 		})
 	}
 

internal/dao/taskDao.go

@@ -349,6 +349,10 @@ type ArtistUploadStatsItem struct {
 	TaskAssigneeNum   string `json:"taskAssigneeNum" gorm:"column:task_assignee_num"`
 	ProgressTaskCount int    `json:"progressTaskCount" gorm:"column:progress_task_count"`
 	CompleteTaskCount int    `json:"completeTaskCount" gorm:"column:complete_task_count"`
+
+	// 脚本
+	UploadedVideoScriptCount int `json:"uploadedVideoScriptCount" gorm:"column:uploaded_video_script_count"`
+	PendingVideoScriptCount  int `json:"pendingVideoScriptCount" gorm:"column:pending_video_script_count"`
 }
 
 // buildReleasedExpr 构建“截至当前时间的限制型累计释放量”SQL表达式（返回字符串供 SELECT 使用）
@@ -422,30 +426,32 @@ func GetArtistUploadStatsList(req *TaskQueryRequest) ([]*ArtistUploadStatsItem,
         rn.name as user_name,
         u.tel_num as user_phone_number,
         bor.customer_num,
-        (SELECT COUNT(1) FROM cast_work cw WHERE cw.artist_phone = u.tel_num AND cw.deleted_at = 0 AND cw.work_category = 2) AS uploaded_video_count,
-        (SELECT COUNT(1) FROM cast_work cw WHERE cw.artist_phone = u.tel_num AND cw.deleted_at = 0 AND cw.work_category = 1) AS uploaded_post_count,
-        (SELECT COUNT(1) FROM cast_work_analysis cwa WHERE cwa.artist_phone = u.tel_num AND cwa.deleted_at = 0) AS uploaded_data_count,
+        (SELECT COUNT(1) FROM cast_work cw WHERE cw.artist_phone = u.tel_num AND cw.deleted_at = 0 AND cw.work_category = 2 AND cw.submit_time >= bb.start_at AND cw.submit_time <= bb.expired_at) AS uploaded_video_count,
+        (SELECT COUNT(1) FROM cast_video_script cvs WHERE CAST(bb.user_id AS CHAR) COLLATE utf8mb4_general_ci = cvs.artist_uuid COLLATE utf8mb4_general_ci AND cvs.deleted_at = 0 AND FROM_UNIXTIME(cvs.created_at) >= bb.start_at AND FROM_UNIXTIME(cvs.created_at) <= bb.expired_at) AS uploaded_video_script_count,
+        (SELECT COUNT(1) FROM cast_work cw WHERE cw.artist_phone = u.tel_num AND cw.deleted_at = 0 AND cw.work_category = 1 AND cw.submit_time >= bb.start_at AND cw.submit_time <= bb.expired_at) AS uploaded_post_count,
+        (SELECT COUNT(1) FROM cast_work_analysis cwa WHERE cwa.artist_phone = u.tel_num AND cwa.deleted_at = 0 AND cwa.submit_time >= bb.start_at AND cwa.submit_time <= bb.expired_at) AS uploaded_data_count,
 
         (bb.bundle_video_number + bb.bundle_limit_video_number + bb.bundle_limit_video_expired_number) AS bundle_video_total,
         %s AS increase_video_total,
         %s AS released_video_total,
-        GREATEST(%s - (SELECT COUNT(1) FROM cast_work cw WHERE cw.artist_phone = u.tel_num AND cw.deleted_at = 0 AND cw.work_category = 2), 0) AS pending_video_count,
+        GREATEST(%s - (SELECT COUNT(1) FROM cast_work cw WHERE cw.artist_phone = u.tel_num AND cw.deleted_at = 0 AND cw.work_category = 2 AND cw.submit_time >= bb.start_at AND cw.submit_time <= bb.expired_at), 0) AS pending_video_count,
+        GREATEST(%s - (SELECT COUNT(1) FROM cast_video_script cvs WHERE CAST(bb.user_id AS CHAR) COLLATE utf8mb4_general_ci = cvs.artist_uuid COLLATE utf8mb4_general_ci AND cvs.deleted_at = 0 AND cvs.created_at >= bb.start_at AND cvs.created_at <= bb.expired_at), 0) AS pending_video_script_count,
 
         (bb.bundle_image_number + bb.bundle_limit_image_number + bb.bundle_limit_image_expired_number) AS bundle_post_total,
         %s AS increase_post_total,
         %s AS released_post_total,
-        GREATEST(%s - (SELECT COUNT(1) FROM cast_work cw WHERE cw.artist_phone = u.tel_num AND cw.deleted_at = 0 AND cw.work_category = 1), 0) AS pending_post_count,
+        GREATEST(%s - (SELECT COUNT(1) FROM cast_work cw WHERE cw.artist_phone = u.tel_num AND cw.deleted_at = 0 AND cw.work_category = 1 AND cw.submit_time >= bb.start_at AND cw.submit_time <= bb.expired_at), 0) AS pending_post_count,
 
         (bb.bundle_data_analysis_number + bb.bundle_limit_data_analysis_number + bb.bundle_limit_data_analysis_expired_number) AS bundle_data_total,
         %s AS increase_data_total,
         %s AS released_data_total,
-        GREATEST(%s - (SELECT COUNT(1) FROM cast_work_analysis cwa WHERE cwa.artist_phone = u.tel_num AND cwa.deleted_at = 0), 0) AS pending_data_count,
+        GREATEST(%s - (SELECT COUNT(1) FROM cast_work_analysis cwa WHERE cwa.artist_phone = u.tel_num AND cwa.deleted_at = 0 AND FROM_UNIXTIME(cwa.submit_time) >= bb.start_at AND FROM_UNIXTIME(cwa.submit_time) <= bb.expired_at), 0) AS pending_data_count,
 
         tm.last_task_assignee,
         tm.task_assignee_num,
         tm.progress_count AS progress_task_count,
         tm.complete_count AS complete_task_count
-    `, increaseVideoTotal, releasedVideoTotal, releasedVideoTotal, increaseImageTotal, releasedImageTotal, releasedImageTotal, increaseDataTotal, releasedDataTotal, releasedDataTotal)
+    `, increaseVideoTotal, releasedVideoTotal, releasedVideoTotal, releasedVideoTotal, increaseImageTotal, releasedImageTotal, releasedImageTotal, increaseDataTotal, releasedDataTotal, releasedDataTotal)
 
 	// 构建基础查询（用于列表与总数）
 	base := app.ModuleClients.BundleDB.Table("`micro-account`.`user` AS u").Unscoped().
@@ -491,28 +497,30 @@ func GetArtistUploadStatsList(req *TaskQueryRequest) ([]*ArtistUploadStatsItem,
 			sortType = "DESC"
 		}
 		allowed := map[string]bool{
-			"user_name":            true,
-			"user_phone_number":    true,
-			"customer_num":         true,
-			"uploaded_video_count": true,
-			"uploaded_post_count":  true,
-			"uploaded_data_count":  true,
-			"bundle_video_total":   true,
-			"increase_video_total": true,
-			"released_video_total": true,
-			"pending_video_count":  true,
-			"bundle_post_total":    true,
-			"increase_post_total":  true,
-			"released_post_total":  true,
-			"pending_post_count":   true,
-			"bundle_data_total":    true,
-			"increase_data_total":  true,
-			"released_data_total":  true,
-			"pending_data_count":   true,
-			"last_task_assignee":   true,
-			"task_assignee_num":    true,
-			"progress_task_count":  true,
-			"complete_task_count":  true,
+			"user_name":                   true,
+			"user_phone_number":           true,
+			"customer_num":                true,
+			"uploaded_video_count":        true,
+			"uploaded_video_script_count": true,
+			"uploaded_post_count":         true,
+			"uploaded_data_count":         true,
+			"bundle_video_total":          true,
+			"increase_video_total":        true,
+			"released_video_total":        true,
+			"pending_video_count":         true,
+			"pending_video_script_count":  true,
+			"bundle_post_total":           true,
+			"increase_post_total":         true,
+			"released_post_total":         true,
+			"pending_post_count":          true,
+			"bundle_data_total":           true,
+			"increase_data_total":         true,
+			"released_data_total":         true,
+			"pending_data_count":          true,
+			"last_task_assignee":          true,
+			"task_assignee_num":           true,
+			"progress_task_count":         true,
+			"complete_task_count":         true,
 		}
 		if allowed[req.SortBy] {
 			orderClause = fmt.Sprintf("%s %s", req.SortBy, sortType)

internal/model/cast.go

@@ -212,3 +212,27 @@ type CastWorkAnalysis struct {
 func (CastWorkAnalysis) TableName() string {
 	return "cast_work_analysis"
 }
+
+// VideoScript 视频脚本表
+type VideoScript struct {
+	Uuid          string `gorm:"column:uuid;type:varchar(50);NOT NULL;primary_key;comment:脚本UUID" json:"uuid"`
+	Title         string `gorm:"column:title;type:varchar(200);NOT NULL;default:'';comment:脚本标题" json:"title"`
+	Content       string `gorm:"column:content;type:varchar(1000);NOT NULL;default:'';comment:脚本内容" json:"content"`
+	ArtistUuid    string `gorm:"column:artist_uuid;type:varchar(50);NOT NULL;default:'';comment:艺人UUID" json:"artistUuid"`
+	ArtistName    string `gorm:"column:artist_name;type:varchar(50);NOT NULL;default:'';comment:艺人名称" json:"artistName"`
+	ArtistNum     string `gorm:"column:artist_num;type:varchar(50);NOT NULL;default:'';comment:艺人编号" json:"artistNum"`
+	ArtistPhone   string `gorm:"column:artist_phone;type:varchar(50);NOT NULL;default:'';comment:艺人手机号" json:"artistPhone"`
+	CreatorUuid   string `gorm:"column:creator_uuid;type:varchar(50);NOT NULL;default:'';comment:创建人UUID" json:"creatorUuid"`
+	CreatorName   string `gorm:"column:creator_name;type:varchar(50);NOT NULL;default:'';comment:创建人名称" json:"creatorName"`
+	ApprovalID    string `gorm:"column:approval_id;type:varchar(50);NOT NULL;default:'';comment:审批ID" json:"approvalId"`
+	ApprovalReply string `gorm:"column:approval_reply;type:varchar(500);NOT NULL;default:'';comment:审批回复" json:"approvalReply"`
+	Status        uint8  `gorm:"column:status;type:tinyint(1);NOT NULL;default:1;comment:状态 1:草稿 2:审核中 3:审核通过 4:审核不通过" json:"status"`
+	Remark        string `gorm:"column:remark;type:varchar(500);NOT NULL;default:'';comment:备注" json:"remark"`
+	CreatedAt     int    `gorm:"column:created_at;type:int(11);autoCreateTime" json:"createdAt"`
+	UpdatedAt     int    `gorm:"column:updated_at;type:int(11);autoUpdateTime" json:"updatedAt"`
+	DeletedAt     soft_delete.DeletedAt
+}
+
+func (VideoScript) TableName() string {
+	return "cast_video_script"
+}