Skip to content

Commit 1f22605

Browse files
xz1220xz1220
committed
终于初步搞完了
1 parent 355c3f4 commit 1f22605

5 files changed

Lines changed: 465 additions & 62 deletions

File tree

‎.gitignore‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,5 +58,24 @@
5858
/server-golang/.vscode/settings.json
5959
/server-golang/.vscode/settings.json
6060

61+
# front-end-golang
62+
/front-end-golang/.DS_Store
63+
/front-end-golang/node_modules/
64+
/front-end-golang/dist/
65+
/front-end-golang/npm-debug.log*
66+
/front-end-golang/yarn-debug.log*
67+
/front-end-golang/yarn-error.log*
68+
/front-end-golang/test/unit/coverage/
69+
70+
# Editor directories and files
71+
/front-end-golang/.idea
72+
/front-end-golang/.vscode
73+
/front-end-golang/*.suo
74+
/front-end-golang/*.ntvs*
75+
/front-end-golang/*.njsproj
76+
/front-end-golang/*.sln
77+
78+
/front-end-golang/*.old
79+
6180

6281
_book/*

‎front-end-golang‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Subproject commit b1f8dc33d4a5dc82458825730afcb201588bcdd9

‎server-golang/controller/Reviewer.go‎

Lines changed: 87 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -155,12 +155,65 @@ func TaskListReviewer(ctx *gin.Context) {
155155
return
156156
}
157157

158+
// db := common.GetDB()
159+
// adminTaskRepositoryInstance := repository.AdminTaskRepositoryInstance(db)
160+
// taskIDs, err := adminTaskRepositoryInstance.GetTaskIDByReviewerID(ReviewerID)
161+
// log.Println("len(TaskIDs):", len(taskIDs))
162+
// tasks, err := adminTaskRepositoryInstance.TaskListByID(taskIDs)
163+
// log.Println("len(Tasks):", len(tasks))
164+
// if err != nil {
165+
// ErrorString := ctx.Request.URL.String() + "TaskList error!!!"
166+
// log.Println(ErrorString)
167+
// util.Fail(ctx, gin.H{}, ErrorString)
168+
// return
169+
// }
170+
171+
// var taskResponses []model.TaskResponse
172+
// for _, task := range tasks {
173+
// userIDs, err := adminTaskRepositoryInstance.GetUserIDsFromUserInfo(task.TaskID)
174+
// if err != nil {
175+
// ErrorString := ctx.Request.URL.String() + "SearchTask error!!!"
176+
// log.Println(ErrorString)
177+
// util.Fail(ctx, gin.H{}, ErrorString)
178+
// return
179+
// }
180+
181+
// // reviewersIDs, err := adminTaskRepositoryInstance.GetReviewerIDsFromReviewerInfo(task.TaskID)
182+
// // if err != nil {
183+
// // ErrorString := ctx.Request.URL.String() + "SearchTask error!!!"
184+
// // log.Println(ErrorString)
185+
// // util.Fail(ctx, gin.H{}, ErrorString)
186+
// // return
187+
// // }
188+
189+
// labelIDs, err := adminTaskRepositoryInstance.GetLabelIDsFromLabelInfo(task.TaskID)
190+
// if err != nil {
191+
// ErrorString := ctx.Request.URL.String() + "SearchTask error!!!"
192+
// log.Println(ErrorString)
193+
// util.Fail(ctx, gin.H{}, ErrorString)
194+
// return
195+
// }
196+
197+
// temp := model.TaskResponse{
198+
// TaskID: task.TaskID,
199+
// TaskType: task.TaskType,
200+
// TaskName: task.TaskName,
201+
// TaskDesc: task.TaskDesc,
202+
// ImageNumber: task.ImageNumber,
203+
// UserIDs: userIDs,
204+
// // ReviewerIDs: reviewersIDs,
205+
// LabelIDs: labelIDs,
206+
// Finish: task.Finish,
207+
// }
208+
209+
// taskResponses = append(taskResponses, temp)
210+
// }
211+
212+
// util.Success(ctx, taskResponses, "SUCCESS")
213+
158214
db := common.GetDB()
159215
adminTaskRepositoryInstance := repository.AdminTaskRepositoryInstance(db)
160-
taskIDs, err := adminTaskRepositoryInstance.GetTaskIDByReviewerID(ReviewerID)
161-
log.Println("len(TaskIDs):", len(taskIDs))
162-
tasks, err := adminTaskRepositoryInstance.TaskListByID(taskIDs)
163-
log.Println("len(Tasks):", len(tasks))
216+
tasks, err := adminTaskRepositoryInstance.TaskList()
164217
if err != nil {
165218
ErrorString := ctx.Request.URL.String() + "TaskList error!!!"
166219
log.Println(ErrorString)
@@ -178,13 +231,13 @@ func TaskListReviewer(ctx *gin.Context) {
178231
return
179232
}
180233

181-
// reviewersIDs, err := adminTaskRepositoryInstance.GetReviewerIDsFromReviewerInfo(task.TaskID)
182-
// if err != nil {
183-
// ErrorString := ctx.Request.URL.String() + "SearchTask error!!!"
184-
// log.Println(ErrorString)
185-
// util.Fail(ctx, gin.H{}, ErrorString)
186-
// return
187-
// }
234+
reviewersIDs, err := adminTaskRepositoryInstance.GetReviewerIDsFromReviewerInfo(task.TaskID)
235+
if err != nil {
236+
ErrorString := ctx.Request.URL.String() + "SearchTask error!!!"
237+
log.Println(ErrorString)
238+
util.Fail(ctx, gin.H{}, ErrorString)
239+
return
240+
}
188241

189242
labelIDs, err := adminTaskRepositoryInstance.GetLabelIDsFromLabelInfo(task.TaskID)
190243
if err != nil {
@@ -194,25 +247,37 @@ func TaskListReviewer(ctx *gin.Context) {
194247
return
195248
}
196249

197-
temp := model.TaskResponse{
198-
TaskID: task.TaskID,
199-
TaskType: task.TaskType,
200-
TaskName: task.TaskName,
201-
TaskDesc: task.TaskDesc,
202-
ImageNumber: task.ImageNumber,
203-
UserIDs: userIDs,
204-
// ReviewerIDs: reviewersIDs,
205-
LabelIDs: labelIDs,
206-
// Finish: task.Finish,
250+
if IfInSlice(ReviewerID, reviewersIDs) {
251+
temp := model.TaskResponse{
252+
TaskID: task.TaskID,
253+
TaskType: task.TaskType,
254+
TaskName: task.TaskName,
255+
TaskDesc: task.TaskDesc,
256+
ImageNumber: task.ImageNumber,
257+
UserIDs: userIDs,
258+
ReviewerIDs: reviewersIDs,
259+
LabelIDs: labelIDs,
260+
Finish: task.Finish,
261+
}
262+
263+
taskResponses = append(taskResponses, temp)
207264
}
208265

209-
taskResponses = append(taskResponses, temp)
210266
}
211267

212268
util.Success(ctx, taskResponses, "SUCCESS")
213269

214270
}
215271

272+
func IfInSlice(ID int64, list []int64) bool {
273+
for _, temp := range list {
274+
if ID == temp {
275+
return true
276+
}
277+
}
278+
return false
279+
}
280+
216281
func GetImgReviewer(ctx *gin.Context) {
217282
type data struct {
218283
ImageID string `json:"imageId"`

0 commit comments

Comments
 (0)