fiee/micro-bundle
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updata：解决冲突

Browse Source
This commit is contained in:
jiaji.H 2026-02-02 16:45:45 +08:00
commit 5d9592b3e3
4 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
internal/dao/bundleMetrics.go
View File

@ -1775,7 +1775,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
@ -1791,9 +1791,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

2
pb/bundle.proto
View File

@ -1902,7 +1902,7 @@ message WorkCastInfo{
string submitTime = 8;
string waitingTime = 9;
string confirmTime = 10;
string confirmType = 11;
int64 confirmType = 11;
}
message ExportWorkCastInfoReq{

8
pb/bundle/bundle.pb.go
View File

@ -15959,7 +15959,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() {
@ -16064,11 +16064,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 {
@ -19653,7 +19653,7 @@ var file_pb_bundle_proto_rawDesc = []byte{
0x69, 0x74, 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,
0x6f, 0x6e, 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,

2
pb/bundle/bundle.validator.pb.go
View File

@ -7,8 +7,8 @@ import (
fmt "fmt"
math "math"
proto "github.com/golang/protobuf/proto"
_ "github.com/mwitkow/go-proto-validators"
_ "google.golang.org/protobuf/types/descriptorpb"
_ "github.com/mwitkow/go-proto-validators"
github_com_mwitkow_go_proto_validators "github.com/mwitkow/go-proto-validators"
)