From ae3d62ff247bbc70694fd491355060cd7dc20b60 Mon Sep 17 00:00:00 2001 From: "jiaji.H" Date: Wed, 10 Jun 2026 17:46:45 +0800 Subject: [PATCH] =?UTF-8?q?Update=EF=BC=9A=E4=BD=BF=E7=94=A8=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=E5=A2=9E=E5=8A=A0=E5=A5=97=E9=A4=90=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E8=BF=87=E6=BB=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- internal/dao/bundleExtend.go | 4 +++- pb/bundle.proto | 1 + pb/bundle/bundle.pb.go | 12 +++++++++++- 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/internal/dao/bundleExtend.go b/internal/dao/bundleExtend.go index 40ed889..a0e7fb4 100644 --- a/internal/dao/bundleExtend.go +++ b/internal/dao/bundleExtend.go @@ -580,7 +580,9 @@ func GetUsedRecord(req *bundle.GetUsedRecordListReq) (data []model.CostLogPo, to Table("cast_cost_log ccl"). Select("ccl.*,cwe.cost_type"). Joins("left join cast_work_extra cwe on cwe.work_uuid = ccl.work_uuid"). - Where("cwe.deleted_at = 0 and ccl.deleted_at = 0") + Joins("left join bundle_order_record bor on bor.uuid = ccl.order_uuid"). + Where("bor.order_type = ?", req.BundleType). + Where("cwe.deleted_at = 0 and ccl.deleted_at = 0 and bor.deleted_at is null") if req.WorkTitle != "" { session = session.Where("ccl.work_title like ?", "%"+req.WorkTitle+"%") } diff --git a/pb/bundle.proto b/pb/bundle.proto index 0c5a121..2e7bd72 100644 --- a/pb/bundle.proto +++ b/pb/bundle.proto @@ -1143,6 +1143,7 @@ message GetUsedRecordListReq{ int32 page = 9; int32 pageSize = 10; int32 costType = 11; + int32 bundleType = 12; } message GetUsedRecordListResp { diff --git a/pb/bundle/bundle.pb.go b/pb/bundle/bundle.pb.go index 6989e4d..990ba0f 100644 --- a/pb/bundle/bundle.pb.go +++ b/pb/bundle/bundle.pb.go @@ -8971,6 +8971,7 @@ type GetUsedRecordListReq struct { Page int32 `protobuf:"varint,9,opt,name=page,proto3" json:"page"` PageSize int32 `protobuf:"varint,10,opt,name=pageSize,proto3" json:"pageSize"` CostType int32 `protobuf:"varint,11,opt,name=costType,proto3" json:"costType"` + BundleType int32 `protobuf:"varint,12,opt,name=bundleType,proto3" json:"bundleType"` } func (x *GetUsedRecordListReq) Reset() { @@ -9082,6 +9083,13 @@ func (x *GetUsedRecordListReq) GetCostType() int32 { return 0 } +func (x *GetUsedRecordListReq) GetBundleType() int32 { + if x != nil { + return x.BundleType + } + return 0 +} + type GetUsedRecordListResp struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -23807,7 +23815,7 @@ var file_pb_bundle_proto_rawDesc = []byte{ 0x22, 0x32, 0x0a, 0x14, 0x41, 0x64, 0x64, 0x42, 0x75, 0x6e, 0x64, 0x6c, 0x65, 0x42, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1a, 0x0a, 0x08, 0x75, 0x73, 0x65, 0x64, 0x54, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x08, 0x75, 0x73, 0x65, 0x64, - 0x54, 0x79, 0x70, 0x65, 0x22, 0xca, 0x02, 0x0a, 0x14, 0x47, 0x65, 0x74, 0x55, 0x73, 0x65, 0x64, + 0x54, 0x79, 0x70, 0x65, 0x22, 0xea, 0x02, 0x0a, 0x14, 0x47, 0x65, 0x74, 0x55, 0x73, 0x65, 0x64, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x12, 0x12, 0x0a, 0x04, 0x75, 0x73, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x75, 0x73, 0x65, 0x72, 0x12, 0x1a, 0x0a, 0x08, 0x6f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x18, 0x02, 0x20, @@ -23828,6 +23836,8 @@ var file_pb_bundle_proto_rawDesc = []byte{ 0x65, 0x53, 0x69, 0x7a, 0x65, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x70, 0x61, 0x67, 0x65, 0x53, 0x69, 0x7a, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x63, 0x6f, 0x73, 0x74, 0x54, 0x79, 0x70, 0x65, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x63, 0x6f, 0x73, 0x74, 0x54, 0x79, 0x70, + 0x65, 0x12, 0x1e, 0x0a, 0x0a, 0x62, 0x75, 0x6e, 0x64, 0x6c, 0x65, 0x54, 0x79, 0x70, 0x65, 0x18, + 0x0c, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x62, 0x75, 0x6e, 0x64, 0x6c, 0x65, 0x54, 0x79, 0x70, 0x65, 0x22, 0x57, 0x0a, 0x15, 0x47, 0x65, 0x74, 0x55, 0x73, 0x65, 0x64, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x14, 0x0a, 0x05, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x74, 0x6f, 0x74, 0x61, 0x6c,