From 01cb67feda485b50ec5f86b602251d7ab50aafa1 Mon Sep 17 00:00:00 2001 From: "jiaji.H" Date: Mon, 2 Feb 2026 16:36:59 +0800 Subject: [PATCH] =?UTF-8?q?Updata=EF=BC=9A=E6=9B=B4=E6=96=B0=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- internal/dao/bundleMetrics.go | 5 +---- pb/bundle.proto | 2 +- pb/bundle/bundle.pb.go | 8 ++++---- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/internal/dao/bundleMetrics.go b/internal/dao/bundleMetrics.go index abc994f..fa25de8 100644 --- a/internal/dao/bundleMetrics.go +++ b/internal/dao/bundleMetrics.go @@ -1560,7 +1560,7 @@ func ExportWorkCastInfo(req *bundle.ExportWorkCastInfoReq) (*bundle.ExportWorkCa cw.submit_time, cwl_wating.update_time AS waiting_time, cwl_confirm.update_time AS confirm_time, - ccl.operator_name AS confirm_type + cwe.confirm_type AS confirm_type FROM bundle_balance bb LEFT JOIN bundle_order_records bor ON bor.uuid = bb.order_uuid AND bor.deleted_at IS NULL @@ -1576,9 +1576,6 @@ func ExportWorkCastInfo(req *bundle.ExportWorkCastInfoReq) (*bundle.ExportWorkCa ON cwl_wating.work_uuid = cw.uuid AND cwl_wating.work_status = 4 AND cwl_wating.deleted_at = 0 - LEFT JOIN cast_cost_log ccl - on ccl.work_uuid = cw.uuid - and ccl.deleted_at = 0 WHERE bb.deleted_at IS NULL AND bb.month = '2026-01' AND bor.deleted_at IS NULL diff --git a/pb/bundle.proto b/pb/bundle.proto index 2340746..ceb4690 100644 --- a/pb/bundle.proto +++ b/pb/bundle.proto @@ -1835,7 +1835,7 @@ message WorkCastInfo{ string submitTime = 8; string waitingTime = 9; string confirmTime = 10; - string confirmType = 11; + int64 confirmType = 11; } message ExportWorkCastInfoReq{ diff --git a/pb/bundle/bundle.pb.go b/pb/bundle/bundle.pb.go index 13b1918..aa86fb6 100644 --- a/pb/bundle/bundle.pb.go +++ b/pb/bundle/bundle.pb.go @@ -15466,7 +15466,7 @@ type WorkCastInfo struct { SubmitTime string `protobuf:"bytes,8,opt,name=submitTime,proto3" json:"submitTime"` WaitingTime string `protobuf:"bytes,9,opt,name=waitingTime,proto3" json:"waitingTime"` ConfirmTime string `protobuf:"bytes,10,opt,name=confirmTime,proto3" json:"confirmTime"` - ConfirmType string `protobuf:"bytes,11,opt,name=confirmType,proto3" json:"confirmType"` + ConfirmType int64 `protobuf:"varint,11,opt,name=confirmType,proto3" json:"confirmType"` } func (x *WorkCastInfo) Reset() { @@ -15571,11 +15571,11 @@ func (x *WorkCastInfo) GetConfirmTime() string { return "" } -func (x *WorkCastInfo) GetConfirmType() string { +func (x *WorkCastInfo) GetConfirmType() int64 { if x != nil { return x.ConfirmType } - return "" + return 0 } type ExportWorkCastInfoReq struct { @@ -18872,7 +18872,7 @@ var file_pb_bundle_proto_rawDesc = []byte{ 0x69, 0x6e, 0x67, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x20, 0x0a, 0x0b, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x72, 0x6d, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x72, 0x6d, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x20, 0x0a, 0x0b, 0x63, 0x6f, 0x6e, - 0x66, 0x69, 0x72, 0x6d, 0x54, 0x79, 0x70, 0x65, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, + 0x66, 0x69, 0x72, 0x6d, 0x54, 0x79, 0x70, 0x65, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0b, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x72, 0x6d, 0x54, 0x79, 0x70, 0x65, 0x22, 0x4f, 0x0a, 0x15, 0x45, 0x78, 0x70, 0x6f, 0x72, 0x74, 0x57, 0x6f, 0x72, 0x6b, 0x43, 0x61, 0x73, 0x74, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x71, 0x12, 0x1c, 0x0a, 0x09, 0x73, 0x74, 0x61, 0x72, 0x74, 0x54, 0x69, 0x6d,