|
@@ -62,7 +62,7 @@ func (*data) AcceptData(ctx context.Context, request http_model.AcceptDataReques
|
|
|
return nil, err
|
|
|
}
|
|
|
|
|
|
- // 记录任务日志
|
|
|
+ // 记录任务日志和达人消息
|
|
|
for _, taskId := range TaskIDList {
|
|
|
err = db.CreateTaskLog(ctx, taskId, "数据通过")
|
|
|
if err != nil {
|
|
@@ -76,36 +76,61 @@ func (*data) AcceptData(ctx context.Context, request http_model.AcceptDataReques
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- // 2. 更新YoungeeTaskInfo表,将任务结案
|
|
|
- fmt.Printf("acc request %+v", TaskIDList)
|
|
|
- err = db.SetTaskFinish(ctx, TaskIDList)
|
|
|
- if err != nil {
|
|
|
- logrus.WithContext(ctx).Errorf("[Data service] call SetTaskFinish error,err:%+v", err)
|
|
|
- return nil, err
|
|
|
- }
|
|
|
res := &http_model.AcceptDataData{
|
|
|
TaskIds: TaskIDList,
|
|
|
IsEnd: 0,
|
|
|
}
|
|
|
- err = db.SetTalentIncome(ctx, TaskIDList)
|
|
|
- if err != nil {
|
|
|
- logrus.WithContext(ctx).Errorf("[Data service] call SetTalentIncome error,err:%+v", err)
|
|
|
- return nil, err
|
|
|
- }
|
|
|
- // 3. 判断是否全部任务已结案,若已全部结案则触发项目结案
|
|
|
- // 查询task_stage<15的任务数量
|
|
|
- unFinishedTaskNumber, err1 := db.GetUnfinishedTaskNumber(ctx, request.ProjectId)
|
|
|
- if err1 != nil {
|
|
|
- logrus.WithContext(ctx).Errorf("[Data service] call GetUnfinishedTaskNumber error,err:%+v", err)
|
|
|
- return nil, err
|
|
|
- }
|
|
|
- if *unFinishedTaskNumber == 0 { // 若为0则触发项目结案
|
|
|
- err := db.SetProjectFinish(ctx, request.ProjectId)
|
|
|
+
|
|
|
+ if request.IsSpecial == 1 {
|
|
|
+ // 2. 更新YoungeeTaskInfo表,将任务结案
|
|
|
+ err = db.SetSpecialTaskFinish(ctx, TaskIDList)
|
|
|
+ if err != nil {
|
|
|
+ logrus.WithContext(ctx).Errorf("[Data service] call SetTaskFinish error,err:%+v", err)
|
|
|
+ return nil, err
|
|
|
+ }
|
|
|
+ // 3. 判断是否全部任务已结案,若已全部结案则触发项目结案
|
|
|
+ // 查询task_stage<15的任务数量
|
|
|
+ unFinishedTaskNumber, err1 := db.GetUnfinishedTaskNumber(ctx, request.ProjectId)
|
|
|
+ if err1 != nil {
|
|
|
+ logrus.WithContext(ctx).Errorf("[Data service] call GetUnfinishedTaskNumber error,err:%+v", err)
|
|
|
+ return nil, err
|
|
|
+ }
|
|
|
+ if *unFinishedTaskNumber == 0 { // 若为0则触发项目结案
|
|
|
+ err := db.SetSpecialProjectFinish(ctx, request.ProjectId)
|
|
|
+ if err1 != nil {
|
|
|
+ logrus.WithContext(ctx).Errorf("[Data service] call SetProjectFinish error,err:%+v", err)
|
|
|
+ return nil, err
|
|
|
+ }
|
|
|
+ res.IsEnd = 1
|
|
|
+ }
|
|
|
+ } else {
|
|
|
+ // 2. 更新YoungeeTaskInfo表,将任务结案
|
|
|
+ fmt.Printf("acc request %+v", TaskIDList)
|
|
|
+ err = db.SetTaskFinish(ctx, TaskIDList)
|
|
|
+ if err != nil {
|
|
|
+ logrus.WithContext(ctx).Errorf("[Data service] call SetTaskFinish error,err:%+v", err)
|
|
|
+ return nil, err
|
|
|
+ }
|
|
|
+ err = db.SetTalentIncome(ctx, TaskIDList)
|
|
|
+ if err != nil {
|
|
|
+ logrus.WithContext(ctx).Errorf("[Data service] call SetTalentIncome error,err:%+v", err)
|
|
|
+ return nil, err
|
|
|
+ }
|
|
|
+ // 3. 判断是否全部任务已结案,若已全部结案则触发项目结案
|
|
|
+ // 查询task_stage<15的任务数量
|
|
|
+ unFinishedTaskNumber, err1 := db.GetUnfinishedTaskNumber(ctx, request.ProjectId)
|
|
|
if err1 != nil {
|
|
|
- logrus.WithContext(ctx).Errorf("[Data service] call SetProjectFinish error,err:%+v", err)
|
|
|
+ logrus.WithContext(ctx).Errorf("[Data service] call GetUnfinishedTaskNumber error,err:%+v", err)
|
|
|
return nil, err
|
|
|
}
|
|
|
- res.IsEnd = 1
|
|
|
+ if *unFinishedTaskNumber == 0 { // 若为0则触发项目结案
|
|
|
+ err := db.SetProjectFinish(ctx, request.ProjectId)
|
|
|
+ if err1 != nil {
|
|
|
+ logrus.WithContext(ctx).Errorf("[Data service] call SetProjectFinish error,err:%+v", err)
|
|
|
+ return nil, err
|
|
|
+ }
|
|
|
+ res.IsEnd = 1
|
|
|
+ }
|
|
|
}
|
|
|
return res, nil
|
|
|
}
|