Skip to content

Commit 17a0247

Browse files
Merge 'fix_lushuye' into 'master'
修复SDK See merge request: !23
2 parents abbc8ae + 289bcdd commit 17a0247

21 files changed

+845
-14
lines changed

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<groupId>com.larksuite.project</groupId>
88
<artifactId>oapi-sdk</artifactId>
9-
<version>1.0.23</version>
9+
<version>1.0.24</version>
1010
<build>
1111
<plugins>
1212
<plugin>

src/main/java/com/lark/project/service/common/model/Pagination.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,4 +53,4 @@ public void setTotal(Long total) {
5353
this.total = total;
5454
}
5555

56-
}
56+
}

src/main/java/com/lark/project/service/field/builder/CreateFieldReq.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import com.google.gson.annotations.SerializedName;
2020
import com.lark.project.core.annotation.Body;
2121
import com.lark.project.core.annotation.Path;
22+
import com.lark.project.service.field.model.TeamOption;
2223

2324
import java.util.List;
2425

@@ -160,6 +161,11 @@ public Builder format(Boolean format) {
160161
return this;
161162
}
162163

164+
public Builder teamOption(TeamOption teamOption) {
165+
this.body.setTeamOption(teamOption);
166+
return this;
167+
}
168+
163169
public CreateFieldReq build() {
164170
return new CreateFieldReq(this);
165171
}

src/main/java/com/lark/project/service/field/builder/CreateFieldReqBody.java

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
package com.lark.project.service.field.builder;
1818

1919
import com.google.gson.annotations.SerializedName;
20+
import com.lark.project.service.field.model.TeamOption;
2021

2122
import java.util.List;
2223

@@ -50,6 +51,8 @@ public class CreateFieldReqBody {
5051
private Boolean isMulti;
5152
@SerializedName("format")
5253
private Boolean format;
54+
@SerializedName("team_option")
55+
private TeamOption teamOption;
5356

5457
public String getFieldName() {
5558
return this.fieldName;
@@ -162,4 +165,12 @@ public Boolean getFormat() {
162165
public void setFormat(Boolean format) {
163166
this.format = format;
164167
}
168+
169+
public TeamOption getTeamOption() {
170+
return this.teamOption;
171+
}
172+
173+
public void setTeamOption(TeamOption teamOption) {
174+
this.teamOption = teamOption;
175+
}
165176
}

src/main/java/com/lark/project/service/field/model/Option.java

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,18 @@ public class Option {
3434
@SerializedName("work_item_type_key")
3535
private String workItemTypeKey;
3636

37+
@SerializedName("color")
38+
private String color;
39+
40+
@SerializedName("order")
41+
private Long order;
42+
43+
@SerializedName("is_disabled")
44+
private Integer isDisabled;
45+
46+
@SerializedName("is_visibility")
47+
private Long isVisibility;
48+
3749
public String getLabel() {
3850
return this.label;
3951
}
@@ -66,4 +78,36 @@ public void setWorkItemTypeKey(String workItemTypeKey) {
6678
this.workItemTypeKey = workItemTypeKey;
6779
}
6880

81+
public String getColor() {
82+
return this.color;
83+
}
84+
85+
public void setColor(String color) {
86+
this.color = color;
87+
}
88+
89+
public Long getOrder() {
90+
return this.order;
91+
}
92+
93+
public void setOrder(Long order) {
94+
this.order = order;
95+
}
96+
97+
public Integer getIsDisabled() {
98+
return this.isDisabled;
99+
}
100+
101+
public void setIsDisabled(Integer isDisabled) {
102+
this.isDisabled = isDisabled;
103+
}
104+
105+
public Long getIsVisibility() {
106+
return this.isVisibility;
107+
}
108+
109+
public void setIsVisibility(Long isVisibility) {
110+
this.isVisibility = isVisibility;
111+
}
112+
69113
}

src/main/java/com/lark/project/service/field/model/SimpleField.java

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,9 @@ public class SimpleField {
5252
@SerializedName("value_generate_mode")
5353
private String valueGenerateMode;
5454

55+
@SerializedName("relation_id")
56+
private String relationID;
57+
5558
public String getFieldKey() {
5659
return this.fieldKey;
5760
}
@@ -132,4 +135,12 @@ public void setValueGenerateMode(String valueGenerateMode) {
132135
this.valueGenerateMode = valueGenerateMode;
133136
}
134137

138+
public String getRelationID() {
139+
return this.relationID;
140+
}
141+
142+
public void setRelationID(String relationID) {
143+
this.relationID = relationID;
144+
}
145+
135146
}
Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
/*
2+
* Copyright (c) 2023 Lark Technologies Pte. Ltd.
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
17+
package com.lark.project.service.field.model;
18+
19+
import com.google.gson.annotations.SerializedName;
20+
21+
public class TeamDataScope {
22+
@SerializedName("team_id")
23+
private String teamID;
24+
@SerializedName("cascade")
25+
private Boolean cascade;
26+
27+
public String getTeamID() {
28+
return this.teamID;
29+
}
30+
31+
public void setTeamID(String teamID) {
32+
this.teamID = teamID;
33+
}
34+
35+
public Boolean getCascade() {
36+
return this.cascade;
37+
}
38+
39+
public void setCascade(Boolean cascade) {
40+
this.cascade = cascade;
41+
}
42+
}
Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
/*
2+
* Copyright (c) 2023 Lark Technologies Pte. Ltd.
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
17+
package com.lark.project.service.field.model;
18+
19+
import com.google.gson.annotations.SerializedName;
20+
21+
import java.util.List;
22+
23+
public class TeamOption {
24+
@SerializedName("team_data_scopes")
25+
private List<TeamDataScope> teamDataScopes;
26+
@SerializedName("team_mode")
27+
private String teamMode;
28+
29+
public List<TeamDataScope> getTeamDataScopes() {
30+
return this.teamDataScopes;
31+
}
32+
33+
public void setTeamDataScopes(List<TeamDataScope> teamDataScopes) {
34+
this.teamDataScopes = teamDataScopes;
35+
}
36+
37+
public String getTeamMode() {
38+
return this.teamMode;
39+
}
40+
41+
public void setTeamMode(String teamMode) {
42+
this.teamMode = teamMode;
43+
}
44+
}

src/main/java/com/lark/project/service/project/model/Business.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -108,14 +108,6 @@ public void setWatchers(List<String> watchers) {
108108
this.watchers = watchers;
109109
}
110110

111-
public Float getOrder() {
112-
return this.order;
113-
}
114-
115-
public void setOrder(Float order) {
116-
this.order = order;
117-
}
118-
119111
public List<String> getSuperMasters() {
120112
return this.superMasters;
121113
}
@@ -136,6 +128,14 @@ public Boolean getDisabled() {
136128
return this.disabled;
137129
}
138130

131+
public Float setOrder(Float order) {
132+
return this.order = order;
133+
}
134+
135+
public Float getOrder() {
136+
return this.order;
137+
}
138+
139139
public void setDisabled(Boolean disabled) {
140140
this.disabled = disabled;
141141
}

src/main/java/com/lark/project/service/workitem/WorkItemService.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,9 @@ public interface WorkItemService {
2727
// 获取指定的工作项列表(全文搜索)
2828
public CompositiveSearchResp compositiveSearch(CompositiveSearchReq req, RequestOptions reqOptions) throws Exception;
2929

30+
// 获取指定的工作项列表(全量搜索)
31+
public UniversalSearchResp universalSearch(UniversalSearchReq req, RequestOptions reqOptions) throws Exception;
32+
3033
// 创建工作项
3134
public CreateWorkItemResp createWorkItem(CreateWorkItemReq req, RequestOptions reqOptions) throws Exception;
3235

@@ -130,4 +133,4 @@ public interface WorkItemService {
130133
* <p>对应 OpenAPI:{@code GET /open_api/:project_key/work_item/:work_item_type_key/:work_item_id/task_result}</p>
131134
*/
132135
public GetTaskResultResp getTaskResult(GetTaskResultReq req, RequestOptions reqOptions) throws Exception;
133-
}
136+
}

0 commit comments

Comments
 (0)