Merge branch 'feature-scriptApproval-daiyb' into dev

api/cast/cast.pb.go

@@ -5892,6 +5892,7 @@ type UpdateScriptStatusReq struct {
 	Uuid          string                 `protobuf:"bytes,2,opt,name=uuid,proto3" json:"uuid"`
 	ApprovalID    string                 `protobuf:"bytes,3,opt,name=approvalID,proto3" json:"approvalID"`
 	ApprovalReply string                 `protobuf:"bytes,4,opt,name=approvalReply,proto3" json:"approvalReply"`
+	ApprovalTime  string                 `protobuf:"bytes,5,opt,name=approvalTime,proto3" json:"approvalTime"`
 	unknownFields protoimpl.UnknownFields
 	sizeCache     protoimpl.SizeCache
 }
@@ -5954,6 +5955,13 @@ func (x *UpdateScriptStatusReq) GetApprovalReply() string {
 	return ""
 }
 
+func (x *UpdateScriptStatusReq) GetApprovalTime() string {
+	if x != nil {
+		return x.ApprovalTime
+	}
+	return ""
+}
+
 type SetLayoutReq struct {
 	state         protoimpl.MessageState `protogen:"open.v1"`
 	UserID        string                 `protobuf:"bytes,1,opt,name=userID,proto3" json:"userID"`
@@ -18484,7 +18492,7 @@ const file_pb_fiee_cast_proto_rawDesc = "" +
 	"\x1aUpdateVideoScriptBatchResp\x12)\n" +
 	"\x04data\x18\x01 \x03(\v2\x15.Cast.VideoScriptInfoR\x04data\x12\"\n" +
 	"\fsuccessCount\x18\x02 \x01(\x05R\fsuccessCount\x12\x1c\n" +
-	"\tfailCount\x18\x03 \x01(\x05R\tfailCount\"\xa7\x01\n" +
+	"\tfailCount\x18\x03 \x01(\x05R\tfailCount\"\xcb\x01\n" +
 	"\x15UpdateScriptStatusReq\x124\n" +
 	"\n" +
 	"workAction\x18\x01 \x01(\x0e2\x14.Cast.WorkActionENUMR\n" +
@@ -18493,7 +18501,8 @@ const file_pb_fiee_cast_proto_rawDesc = "" +
 	"\n" +
 	"approvalID\x18\x03 \x01(\tR\n" +
 	"approvalID\x12$\n" +
-	"\rapprovalReply\x18\x04 \x01(\tR\rapprovalReply\"V\n" +
+	"\rapprovalReply\x18\x04 \x01(\tR\rapprovalReply\x12\"\n" +
+	"\fapprovalTime\x18\x05 \x01(\tR\fapprovalTime\"V\n" +
 	"\fSetLayoutReq\x12\x16\n" +
 	"\x06userID\x18\x01 \x01(\tR\x06userID\x12\x12\n" +
 	"\x04data\x18\x02 \x01(\tR\x04data\x12\x1a\n" +

api/cast/cast.pb.validate.go

@@ -8923,6 +8923,8 @@ func (m *UpdateScriptStatusReq) validate(all bool) error {
 
 	// no validation rules for ApprovalReply
 
+	// no validation rules for ApprovalTime
+
 	if len(errors) > 0 {
 		return UpdateScriptStatusReqMultiError(errors)
 	}

pkg/cron/task.go

@@ -120,6 +120,7 @@ func RefreshScriptApprovalStatusTask() {
 			scriptReq.WorkAction = cast.WorkActionENUM_APPROVAL_REJECT
 		}
 		scriptReq.ApprovalReply = v.Reply
+		scriptReq.ApprovalTime = v.UpdatedAt
 		_, _ = service.CastProvider.UpdateScriptStatus(context.Background(), &scriptReq)
 	}
 }