Skip to content

feat: 冲突解决，当前文件的版本存在A -> B -> C -> A的问题，导致代码脏了，因此用正确的代码来进行覆盖 #31

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 17, 2025
Merged

feat: 冲突解决，当前文件的版本存在A -> B -> C -> A的问题，导致代码脏了，因此用正确的代码来进行覆盖 #31

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
58 changes: 8 additions & 50 deletions v2/service/workitem/model.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,20 +101,20 @@ type CompInfo struct {

type Condition struct {

Field *string `json:"field,omitempty"`

FieldType *string `json:"field_type,omitempty"`

WorkItemTypeKey *string `json:"work_item_type_key,omitempty"`
FieldItem *FieldItem `json:"field_item,omitempty"`

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

ValueList []string `json:"value_list,omitempty"`
OriginalValue *string `json:"original_value,omitempty"`

Params map[string]string `json:"params,omitempty"`
Formula *string `json:"formula,omitempty"`

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

PreOperator *string `json:"pre_operator,omitempty"`

ValueGroup *Filter `json:"value_group,omitempty"`

}

type ConfirmForm struct {
Expand All @@ -133,8 +133,6 @@ type Connection struct {

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

Fields []FieldConf `json:"fields,omitempty"`

}

type CreateWorkItemRelationData struct {
Expand Down Expand Up @@ -255,12 +253,6 @@ type Expand struct {

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

NeedUnionDeliverable *bool `json:"need_union_deliverable,omitempty"`

NeedWbsRelationChainEntity *bool `json:"need_wbs_relation_chain_entity,omitempty"`

NeedWbsRelationChainPath *bool `json:"need_wbs_relation_chain_path,omitempty"`

}

type FieldConf struct {
Expand Down Expand Up @@ -367,8 +359,6 @@ type FieldValuePair struct {

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

UpdateMode *int32 `json:"update_mode,omitempty"`

}

type Filter struct {
Expand Down Expand Up @@ -669,10 +659,6 @@ type NodesConnections struct {

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

TemplateID *int64 `json:"template_id,omitempty"`

Version *int64 `json:"version,omitempty"`

}

type NumberConfig struct {
Expand Down Expand Up @@ -1369,10 +1355,6 @@ type RoleOwner struct {

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

Exist *bool `json:"exist,omitempty"`

IsMemberMulti *bool `json:"is_member_multi,omitempty"`

}

type Schedule struct {
Expand All @@ -1387,10 +1369,6 @@ type Schedule struct {

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

IsAuto *bool `json:"is_auto,omitempty"`

PlannedConstructionPeriod *int32 `json:"planned_construction_period,omitempty"`

}

type ScheduleReferenceValue struct {
Expand Down Expand Up @@ -1553,16 +1531,10 @@ type SimpleRoleConf struct {

type Sort struct {

FieldKey *string `json:"field_key,omitempty"`

FieldType *string `json:"field_type,omitempty"`

WorkItemTypeKey *string `json:"work_item_type_key,omitempty"`
FieldItem *FieldItem `json:"field_item,omitempty"`

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

Params map[string]string `json:"params,omitempty"`

}

type StateFlowConfInfo struct {
Expand Down Expand Up @@ -1705,10 +1677,6 @@ type SubTask struct {

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

OwnerRoles []string `json:"owner_roles,omitempty"`

OwnerUsageMode *int64 `json:"owner_usage_mode,omitempty"`

Fields []FieldValuePair `json:"fields,omitempty"`

}
Expand Down Expand Up @@ -2175,8 +2143,6 @@ type WorkItemInfo struct {

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

CompoundFieldExtra []FieldValuePair `json:"compound_field_extra,omitempty"`

}

type WorkItemKeyType struct {
Expand Down Expand Up @@ -2791,12 +2757,4 @@ type WorkflowNode struct {

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

OwnerRoles []string `json:"owner_roles,omitempty"`

OwnerUsageMode *int64 `json:"owner_usage_mode,omitempty"`

NodeFields []NodeField `json:"node_fields,omitempty"`

FinishedInfos *FinishedInfo `json:"finished_infos,omitempty"`

}