Skip to content

Commit 6b4cf0d

Browse files
Merge pull request #31 from larksuite/feat/service_v2
feat: 冲突解决,当前文件的版本存在A -> B -> C -> A的问题,导致代码脏了,因此用正确的代码来进行覆盖
2 parents e4379e1 + 2111c61 commit 6b4cf0d

File tree

1 file changed

+8
-50
lines changed

1 file changed

+8
-50
lines changed

v2/service/workitem/model.go

Lines changed: 8 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -101,20 +101,20 @@ type CompInfo struct {
101101

102102
type Condition struct {
103103

104-
Field *string `json:"field,omitempty"`
105-
106-
FieldType *string `json:"field_type,omitempty"`
107-
108-
WorkItemTypeKey *string `json:"work_item_type_key,omitempty"`
104+
FieldItem *FieldItem `json:"field_item,omitempty"`
109105

110106
Operator *string `json:"operator,omitempty"`
111107

112-
ValueList []string `json:"value_list,omitempty"`
108+
OriginalValue *string `json:"original_value,omitempty"`
113109

114-
Params map[string]string `json:"params,omitempty"`
110+
Formula *string `json:"formula,omitempty"`
115111

116112
Version *string `json:"version,omitempty"`
117113

114+
PreOperator *string `json:"pre_operator,omitempty"`
115+
116+
ValueGroup *Filter `json:"value_group,omitempty"`
117+
118118
}
119119

120120
type ConfirmForm struct {
@@ -133,8 +133,6 @@ type Connection struct {
133133

134134
TransitionID *int64 `json:"transition_id,omitempty"`
135135

136-
Fields []FieldConf `json:"fields,omitempty"`
137-
138136
}
139137

140138
type CreateWorkItemRelationData struct {
@@ -255,12 +253,6 @@ type Expand struct {
255253

256254
NeedSubTaskParent *bool `json:"need_sub_task_parent,omitempty"`
257255

258-
NeedUnionDeliverable *bool `json:"need_union_deliverable,omitempty"`
259-
260-
NeedWbsRelationChainEntity *bool `json:"need_wbs_relation_chain_entity,omitempty"`
261-
262-
NeedWbsRelationChainPath *bool `json:"need_wbs_relation_chain_path,omitempty"`
263-
264256
}
265257

266258
type FieldConf struct {
@@ -367,8 +359,6 @@ type FieldValuePair struct {
367359

368360
HelpDescription *string `json:"help_description,omitempty"`
369361

370-
UpdateMode *int32 `json:"update_mode,omitempty"`
371-
372362
}
373363

374364
type Filter struct {
@@ -669,10 +659,6 @@ type NodesConnections struct {
669659

670660
UserDetails []UserDetail `json:"user_details,omitempty"`
671661

672-
TemplateID *int64 `json:"template_id,omitempty"`
673-
674-
Version *int64 `json:"version,omitempty"`
675-
676662
}
677663

678664
type NumberConfig struct {
@@ -1369,10 +1355,6 @@ type RoleOwner struct {
13691355

13701356
Owners []string `json:"owners,omitempty"`
13711357

1372-
Exist *bool `json:"exist,omitempty"`
1373-
1374-
IsMemberMulti *bool `json:"is_member_multi,omitempty"`
1375-
13761358
}
13771359

13781360
type Schedule struct {
@@ -1387,10 +1369,6 @@ type Schedule struct {
13871369

13881370
ActualWorkTime *float64 `json:"actual_work_time,omitempty"`
13891371

1390-
IsAuto *bool `json:"is_auto,omitempty"`
1391-
1392-
PlannedConstructionPeriod *int32 `json:"planned_construction_period,omitempty"`
1393-
13941372
}
13951373

13961374
type ScheduleReferenceValue struct {
@@ -1553,16 +1531,10 @@ type SimpleRoleConf struct {
15531531

15541532
type Sort struct {
15551533

1556-
FieldKey *string `json:"field_key,omitempty"`
1557-
1558-
FieldType *string `json:"field_type,omitempty"`
1559-
1560-
WorkItemTypeKey *string `json:"work_item_type_key,omitempty"`
1534+
FieldItem *FieldItem `json:"field_item,omitempty"`
15611535

15621536
Order *string `json:"order,omitempty"`
15631537

1564-
Params map[string]string `json:"params,omitempty"`
1565-
15661538
}
15671539

15681540
type StateFlowConfInfo struct {
@@ -1705,10 +1677,6 @@ type SubTask struct {
17051677

17061678
Deliverable []FieldValuePair `json:"deliverable,omitempty"`
17071679

1708-
OwnerRoles []string `json:"owner_roles,omitempty"`
1709-
1710-
OwnerUsageMode *int64 `json:"owner_usage_mode,omitempty"`
1711-
17121680
Fields []FieldValuePair `json:"fields,omitempty"`
17131681

17141682
}
@@ -2175,8 +2143,6 @@ type WorkItemInfo struct {
21752143

21762144
SubTaskParentInfo *SubTaskParentInfo `json:"sub_task_parent_info,omitempty"`
21772145

2178-
CompoundFieldExtra []FieldValuePair `json:"compound_field_extra,omitempty"`
2179-
21802146
}
21812147

21822148
type WorkItemKeyType struct {
@@ -2791,12 +2757,4 @@ type WorkflowNode struct {
27912757

27922758
Participants []string `json:"participants,omitempty"`
27932759

2794-
OwnerRoles []string `json:"owner_roles,omitempty"`
2795-
2796-
OwnerUsageMode *int64 `json:"owner_usage_mode,omitempty"`
2797-
2798-
NodeFields []NodeField `json:"node_fields,omitempty"`
2799-
2800-
FinishedInfos *FinishedInfo `json:"finished_infos,omitempty"`
2801-
28022760
}

0 commit comments

Comments
 (0)