1
This commit is contained in:
parent
e663606c78
commit
42522327a5
@ -2236,6 +2236,7 @@ type WorkListResp_Info struct {
|
|||||||
MediaAccountNames []string `protobuf:"bytes,10,rep,name=mediaAccountNames,proto3" json:"mediaAccountNames"`
|
MediaAccountNames []string `protobuf:"bytes,10,rep,name=mediaAccountNames,proto3" json:"mediaAccountNames"`
|
||||||
ManagerUserNames []string `protobuf:"bytes,11,rep,name=managerUserNames,proto3" json:"managerUserNames"`
|
ManagerUserNames []string `protobuf:"bytes,11,rep,name=managerUserNames,proto3" json:"managerUserNames"`
|
||||||
ManagerUuids []string `protobuf:"bytes,12,rep,name=managerUuids,proto3" json:"managerUuids"`
|
ManagerUuids []string `protobuf:"bytes,12,rep,name=managerUuids,proto3" json:"managerUuids"`
|
||||||
|
ApprovalID string `protobuf:"bytes,13,opt,name=approvalID,proto3" json:"approvalID"`
|
||||||
}
|
}
|
||||||
|
|
||||||
func (x *WorkListResp_Info) Reset() {
|
func (x *WorkListResp_Info) Reset() {
|
||||||
@ -2352,6 +2353,13 @@ func (x *WorkListResp_Info) GetManagerUuids() []string {
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (x *WorkListResp_Info) GetApprovalID() string {
|
||||||
|
if x != nil {
|
||||||
|
return x.ApprovalID
|
||||||
|
}
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
|
||||||
type MediaAccountsResp_Info struct {
|
type MediaAccountsResp_Info struct {
|
||||||
state protoimpl.MessageState
|
state protoimpl.MessageState
|
||||||
sizeCache protoimpl.SizeCache
|
sizeCache protoimpl.SizeCache
|
||||||
@ -2768,12 +2776,12 @@ var file_pb_fiee_cast_proto_rawDesc = []byte{
|
|||||||
0x55, 0x75, 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x70, 0x61, 0x67, 0x65, 0x18, 0x0b, 0x20, 0x01,
|
0x55, 0x75, 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x70, 0x61, 0x67, 0x65, 0x18, 0x0b, 0x20, 0x01,
|
||||||
0x28, 0x05, 0x52, 0x04, 0x70, 0x61, 0x67, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x70, 0x61, 0x67, 0x65,
|
0x28, 0x05, 0x52, 0x04, 0x70, 0x61, 0x67, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x70, 0x61, 0x67, 0x65,
|
||||||
0x53, 0x69, 0x7a, 0x65, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x70, 0x61, 0x67, 0x65,
|
0x53, 0x69, 0x7a, 0x65, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x70, 0x61, 0x67, 0x65,
|
||||||
0x53, 0x69, 0x7a, 0x65, 0x22, 0xfe, 0x03, 0x0a, 0x0c, 0x57, 0x6f, 0x72, 0x6b, 0x4c, 0x69, 0x73,
|
0x53, 0x69, 0x7a, 0x65, 0x22, 0x9e, 0x04, 0x0a, 0x0c, 0x57, 0x6f, 0x72, 0x6b, 0x4c, 0x69, 0x73,
|
||||||
0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x2b, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20,
|
0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x2b, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20,
|
||||||
0x03, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x43, 0x61, 0x73, 0x74, 0x2e, 0x57, 0x6f, 0x72, 0x6b, 0x4c,
|
0x03, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x43, 0x61, 0x73, 0x74, 0x2e, 0x57, 0x6f, 0x72, 0x6b, 0x4c,
|
||||||
0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x2e, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04, 0x64, 0x61,
|
0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x2e, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04, 0x64, 0x61,
|
||||||
0x74, 0x61, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28,
|
0x74, 0x61, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28,
|
||||||
0x03, 0x52, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x1a, 0xaa, 0x03, 0x0a, 0x04, 0x49, 0x6e, 0x66,
|
0x03, 0x52, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x1a, 0xca, 0x03, 0x0a, 0x04, 0x49, 0x6e, 0x66,
|
||||||
0x6f, 0x12, 0x1a, 0x0a, 0x08, 0x77, 0x6f, 0x72, 0x6b, 0x55, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20,
|
0x6f, 0x12, 0x1a, 0x0a, 0x08, 0x77, 0x6f, 0x72, 0x6b, 0x55, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20,
|
||||||
0x01, 0x28, 0x09, 0x52, 0x08, 0x77, 0x6f, 0x72, 0x6b, 0x55, 0x75, 0x69, 0x64, 0x12, 0x1e, 0x0a,
|
0x01, 0x28, 0x09, 0x52, 0x08, 0x77, 0x6f, 0x72, 0x6b, 0x55, 0x75, 0x69, 0x64, 0x12, 0x1e, 0x0a,
|
||||||
0x0a, 0x61, 0x72, 0x74, 0x69, 0x73, 0x74, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28,
|
0x0a, 0x61, 0x72, 0x74, 0x69, 0x73, 0x74, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28,
|
||||||
@ -2800,7 +2808,9 @@ var file_pb_fiee_cast_proto_rawDesc = []byte{
|
|||||||
0x10, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x55, 0x73, 0x65, 0x72, 0x4e, 0x61, 0x6d, 0x65,
|
0x10, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x55, 0x73, 0x65, 0x72, 0x4e, 0x61, 0x6d, 0x65,
|
||||||
0x73, 0x12, 0x22, 0x0a, 0x0c, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x55, 0x75, 0x69, 0x64,
|
0x73, 0x12, 0x22, 0x0a, 0x0c, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x55, 0x75, 0x69, 0x64,
|
||||||
0x73, 0x18, 0x0c, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0c, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72,
|
0x73, 0x18, 0x0c, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0c, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72,
|
||||||
0x55, 0x75, 0x69, 0x64, 0x73, 0x22, 0x2b, 0x0a, 0x0d, 0x57, 0x6f, 0x72, 0x6b, 0x44, 0x65, 0x74,
|
0x55, 0x75, 0x69, 0x64, 0x73, 0x12, 0x1e, 0x0a, 0x0a, 0x61, 0x70, 0x70, 0x72, 0x6f, 0x76, 0x61,
|
||||||
|
0x6c, 0x49, 0x44, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x61, 0x70, 0x70, 0x72, 0x6f,
|
||||||
|
0x76, 0x61, 0x6c, 0x49, 0x44, 0x22, 0x2b, 0x0a, 0x0d, 0x57, 0x6f, 0x72, 0x6b, 0x44, 0x65, 0x74,
|
||||||
0x61, 0x69, 0x6c, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x77, 0x6f, 0x72, 0x6b, 0x55, 0x75,
|
0x61, 0x69, 0x6c, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x77, 0x6f, 0x72, 0x6b, 0x55, 0x75,
|
||||||
0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x77, 0x6f, 0x72, 0x6b, 0x55, 0x75,
|
0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x77, 0x6f, 0x72, 0x6b, 0x55, 0x75,
|
||||||
0x69, 0x64, 0x22, 0xfb, 0x01, 0x0a, 0x0b, 0x57, 0x6f, 0x72, 0x6b, 0x4c, 0x6f, 0x67, 0x49, 0x6e,
|
0x69, 0x64, 0x22, 0xfb, 0x01, 0x0a, 0x0b, 0x57, 0x6f, 0x72, 0x6b, 0x4c, 0x6f, 0x67, 0x49, 0x6e,
|
||||||
|
@ -3576,6 +3576,8 @@ func (m *WorkListResp_Info) validate(all bool) error {
|
|||||||
|
|
||||||
// no validation rules for StatusUpdateTime
|
// no validation rules for StatusUpdateTime
|
||||||
|
|
||||||
|
// no validation rules for ApprovalID
|
||||||
|
|
||||||
if len(errors) > 0 {
|
if len(errors) > 0 {
|
||||||
return WorkListResp_InfoMultiError(errors)
|
return WorkListResp_InfoMultiError(errors)
|
||||||
}
|
}
|
||||||
|
@ -131,6 +131,38 @@ func WorkList(ctx *gin.Context) {
|
|||||||
service.Error(ctx, err)
|
service.Error(ctx, err)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
var castS = new(CastService)
|
||||||
|
if len(resp.Data) > 0 {
|
||||||
|
var approvalIDs []int
|
||||||
|
var data map[int]int
|
||||||
|
var workUuidApprovalIDMap = make(map[int]string)
|
||||||
|
for _, v := range resp.Data {
|
||||||
|
if v.WorkStatus == 2 && v.ApprovalID != "" {
|
||||||
|
approvalID, _ := strconv.ParseUint(v.ApprovalID, 10, 64)
|
||||||
|
approvalIDs = append(approvalIDs, int(approvalID))
|
||||||
|
workUuidApprovalIDMap[int(approvalID)] = v.WorkUuid
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if len(approvalIDs) > 0 {
|
||||||
|
data, err = castS.ApprovalDetail(approvalIDs)
|
||||||
|
if len(data) > 0 {
|
||||||
|
for approvalId, approvalStatus := range data {
|
||||||
|
var workAction cast.WorkActionENUM
|
||||||
|
if approvalStatus == 2 {
|
||||||
|
workAction = cast.WorkActionENUM_APPROVAL_PASS
|
||||||
|
} else {
|
||||||
|
workAction = cast.WorkActionENUM_APPROVAL_REJECT
|
||||||
|
}
|
||||||
|
_, _ = service.CastProvider.UpdateStatus(context.Background(), &cast.UpdateStatusReq{
|
||||||
|
WorkAction: workAction,
|
||||||
|
WorkUuid: workUuidApprovalIDMap[approvalId],
|
||||||
|
ApprovalID: fmt.Sprint(approvalId),
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
service.Success(ctx, resp)
|
service.Success(ctx, resp)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user